Skip to content
Snippets Groups Projects
Commit f60a281a authored by Kristel Meikas's avatar Kristel Meikas
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Kristel Meikas

See merge request teis/riskassessments-odata-service!13
parents ac687098 5ae5fd55
No related branches found
Tags 2.3.0
No related merge requests found
# Changelog
## [2.3.0] - 2024-01-22
* TEIS-4129: added risk_assessment_activity entity, added risk assessment activity id field to versionable entities
## [2.2.0] - 2023-10-16
* TEIS-4322: added software bill of materials (SBOM) build step support
......
theGroup=ee.sm.ti.teis
theVersion=2.2.0
pluginVersion=2.8.1
commonsVersion=2.37.0
theVersion=2.3.0
pluginVersion=2.8.2
commonsVersion=2.45.0
......@@ -21,6 +21,13 @@ public class AssessedBusinessTypeODataEntity extends RequestIdAuditedEntity {
@Type(type = "uuid-char")
private UUID businessTypeId;
private Boolean isPrimary;
@Type(type = "uuid-char")
private UUID riskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID revokingRiskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID primaryId;
private String dataStatus;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.odata.riskassessments.riskassessment;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.Getter;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.time.LocalDateTime;
import java.util.UUID;
@Entity
@Getter
@Table(name = "risk_assessment_activity")
public class RiskAssessmentActivityODataEntity {
@Id
@Type(type = "uuid-char")
private UUID id;
@Type(type = "uuid-char")
private UUID riskAssessmentId;
private String type;
private String status;
private Long seqNo;
private LocalDateTime committedAt;
private String committedByName;
@Type(type = "uuid-char")
private UUID committedById;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -25,6 +25,13 @@ public class RiskFactorAssessmentODataEntity extends RequestIdAuditedEntity {
private String description;
private Boolean riskExists;
private Boolean additional;
@Type(type = "uuid-char")
private UUID riskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID revokingRiskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID primaryId;
private String dataStatus;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -21,6 +21,13 @@ public class RiskFactorDetailsAssessmentODataEntity extends RequestIdAuditedEnti
@Type(type = "uuid-char")
private UUID riskFactorDetailsId;
private Boolean assessment;
@Type(type = "uuid-char")
private UUID riskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID revokingRiskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID primaryId;
private String dataStatus;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -24,6 +24,13 @@ public class RiskIndicatorValueODataEntity extends RequestIdAuditedEntity {
@Column(name = "value_")
private BigDecimal value;
private String comment;
@Type(type = "uuid-char")
private UUID riskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID revokingRiskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID primaryId;
private String dataStatus;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -26,6 +26,13 @@ public class RiskStatementAssessmentODataEntity extends RequestIdAuditedEntity {
private Boolean action;
@Column(length = Integer.MAX_VALUE)
private String noActionReason;
@Type(type = "uuid-char")
private UUID riskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID revokingRiskAssessmentActivityId;
@Type(type = "uuid-char")
private UUID primaryId;
private String dataStatus;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment