Commit a02ea427 authored by Kristel Meikas's avatar Kristel Meikas
Browse files

Merge branch 'TEIS-1486' into 'develop'

TEIS-1486: added more details to risk factor assessment output, refactored...

Closes TEIS-1486

See merge request teis/common-api-gateway!132
parents 7aa971e3 0e882249
package ee.sm.ti.teis.commongateway.riskassessments.riskfactorassessment.dto;
import ee.sm.ti.teis.commongateway.riskassessments.riskfactor.dto.RiskFactorPublicDto;
import ee.sm.ti.teis.commongateway.riskassessments.riskfactordetailsassessment.dto.RiskFactorDetailsAssessmentPublicDto;
import ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.dto.RiskStatementAssessmentPublicDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import ee.sm.ti.teis.types.enums.RiskFactorAssessmentStatus;
......@@ -23,6 +24,7 @@ public class RiskFactorAssessmentPublicDto {
private RiskFactorPublicDto riskFactor;
private List<RiskStatementAssessmentPublicDto> riskStatementAssessments;
private RiskFactorAssessmentStatus riskFactorAssessmentStatus;
private List<RiskFactorDetailsAssessmentPublicDto> riskFactorDetailsAssessments;
private String name;
private String description;
private Boolean riskExists;
......
package ee.sm.ti.teis.commongateway.riskassessments.riskfactordetailsassessment.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RiskFactorDetailsAssessmentPublicDto {
private UUID id;
private UUID riskFactorAssessmentId;
private RiskFactorDetailsPublicLightDto riskFactorDetails;
private Boolean assessment;
}
package ee.sm.ti.teis.commongateway.riskassessments.riskfactordetailsassessment.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RiskFactorDetailsPublicLightDto {
private UUID id;
private UUID riskFactorId;
private String description;
private UUID relatedRiskFactorId;
private ClassifierItemLightDto status;
private ObjectStatus objectStatus;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment