Commit c0a755bc authored by Jürgen Hannus's avatar Jürgen Hannus
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Jürgen Hannus

See merge request teis/common-api-gateway!171
parents 51563694 2545145c
# Changelog
## [1.18.0] - 2021-01-22
* added new parameters publishedDate and archivedDate into RiskAssessmentPublicDto
* added REST endpoint to update task action plan status
* risk-factor-detail-assessments/{id}/assessment endpoint no longer requires assessment parameter to be provided
* added new parameter taskDefaultDescription into RiskStatementPublicDTO
* added new parameter RiskFactorAssessmentsOutputType to risk factor assessments request when fetching risk assessment
by ID
* added new parameter RiskFactorAssessmentsOutputType to risk factor assessments request when fetching risk factor
assessment by ID
* added new DTO to contain RequestIdAuditedEntity extra fields
* added new functionality for fetching task action plan references & responsible persons
* added new parameter riskFactorDetailsNotAssessedCount to risk assessment conclusion output
## [1.16.0] - 2020-12-14
* added title field into CopyRiskAssessmentDto class
......
package ee.sm.ti.teis.commongateway.file;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.types.enums.FileScanStatusType;
import ee.sm.ti.teis.types.enums.FileStatusType;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.Map;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FileReferenceFullDto {
private UUID id;
@NotNull
private UUID fileId;
@NotNull
private UUID objectId;
@NotNull
private ClassifierItemLightDto objectType;
private ClassifierItemLightDto contextType;
private Map<String, Object> context;
private ClassifierItemLightDto creatorType;
private String fileName;
private FileStatusType fileStatus;
private FileScanStatusType scanStatus;
private ObjectStatus objectStatus;
private LocalDateTime createdAt;
private String createdBy;
private String modifiedId;
private LocalDateTime modifiedAt;
private String modifiedBy;
private String deletedId;
private LocalDateTime deletedAt;
}
package ee.sm.ti.teis.commongateway.riskassessments.riskassessment.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RiskAssessmentActionPlanConclusionDto {
private long riskStatementNotApplied;
private long riskStatementActionPlanned;
private long riskStatementActionRejected;
private long riskStatementActionNull;
}
......@@ -16,6 +16,7 @@ public class RiskAssessmentConclusionDto {
private List<AssessedBusinessTypePublicDto> assessedBusinessTypes;
private long riskFactorNotAssessedCount;
private long riskFactorDetailsNotAssessedCount;
private long riskStatementNotAssessedCount;
private long riskExistsCount;
private long riskDoesNotExistCount;
......
......@@ -27,6 +27,8 @@ public class RiskAssessmentPublicDto {
private boolean external;
private ClassifierItemLightDto status;
private LocalDate lastChangeDate;
private LocalDate publishedDate;
private LocalDate archivedDate;
private ObjectStatus objectStatus;
private List<AssessedBusinessTypePublicDto> assessedBusinessTypes;
private List<RiskFactorAssessmentPublicDto> riskFactorAssessments;
......
package ee.sm.ti.teis.commongateway.riskassessments.riskassessment.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class RiskAssessmentActionPlanConclusionPublicRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.RiskAssessmentActionPlanConclusionPublicRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
......@@ -2,10 +2,15 @@ package ee.sm.ti.teis.commongateway.riskassessments.riskassessment.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.types.enums.RiskFactorAssessmentsOutputType;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
public class RiskAssessmentRiskFactorAssessmentPublicRequest extends AbstractDTO<UUID, ErrorDTO> {
public class RiskAssessmentRiskFactorAssessmentPublicRequest extends AbstractDTO<RiskAssessmentRiskFactorAssessmentPublicRequest.Parameters, ErrorDTO> {
public static final String ROUTING_KEY = "api.RiskAssessmentRiskFactorAssessmentPublicRequest";
@Override
......@@ -13,4 +18,12 @@ public class RiskAssessmentRiskFactorAssessmentPublicRequest extends AbstractDTO
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private UUID id;
private RiskFactorAssessmentsOutputType outputType;
}
}
package ee.sm.ti.teis.commongateway.riskassessments.riskassessment.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.riskassessments.riskassessment.dto.RiskAssessmentActionPlanConclusionDto;
public class RiskAssessmentActionPlanConclusionPublicResponse extends AbstractDTO<RiskAssessmentActionPlanConclusionDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.RiskAssessmentActionPlanConclusionPublicResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
......@@ -2,14 +2,28 @@ package ee.sm.ti.teis.commongateway.riskassessments.riskfactorassessment.request
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.types.enums.RiskFactorAssessmentsOutputType;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
public class RiskFactorAssessmentPublicRequest extends AbstractDTO<UUID, ErrorDTO> {
public class RiskFactorAssessmentPublicRequest extends AbstractDTO<RiskFactorAssessmentPublicRequest.Parameters, ErrorDTO> {
public static final String ROUTING_KEY = "api.RiskFactorAssessmentPublicRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private UUID id;
private RiskFactorAssessmentsOutputType outputType;
}
}
......@@ -16,6 +16,5 @@ public class AssessRiskFactorDetailAssessmentPublicDto {
@NotNull
private UUID id;
@NotNull
private Boolean assessment;
}
......@@ -19,6 +19,7 @@ public class RiskStatementPublicDto {
private UUID riskFactorId;
private String briefDescription;
private String detailedDescription;
private String taskDefaultDescription;
private Long seqNo;
private ClassifierItemLightDto status;
private ObjectStatus objectStatus;
......
package ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.dto;
import ee.sm.ti.teis.commongateway.tasks.task.dto.TaskDto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class RiskStatementAssessmentActionPublicDto extends RiskStatementAssessmentPublicDto {
private TaskDto task;
}
......@@ -27,7 +27,7 @@ public class RiskStatementAssessmentPublicDto {
private String description;
private Boolean assessment;
private Boolean action;
private String comment;
private String noActionReason;
private List<FileReferenceDto> files;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UpdateRiskStatementAssessmentActionPublicDto {
@NotNull
private UUID id;
private Boolean action;
private String taskDescription;
private LocalDate taskDeadline;
private String taskResponsiblePerson;
private Boolean taskHighPriority;
private String noActionReason;
}
package ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.dto.UpdateRiskStatementAssessmentActionPublicDto;
public class UpdateRiskStatementAssessmentActionPublicRequest extends AbstractDTO<UpdateRiskStatementAssessmentActionPublicDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateRiskStatementAssessmentDescriptionPublicRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.riskassessments.riskstatementassessment.dto.RiskStatementAssessmentActionPublicDto;
public class UpdateRiskStatementAssessmentActionPublicResponse extends AbstractDTO<RiskStatementAssessmentActionPublicDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateRiskStatementAssessmentDescriptionPublicResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.tasks.task.actionplan.dto;
import ee.sm.ti.teis.paging.AbstractPagingDto;
import ee.sm.ti.teis.types.enums.TaskStatusType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetTaskActionPlansDto extends AbstractPagingDto {
private LocalDateTime deadlineFrom;
private LocalDateTime deadlineUntil;
private TaskStatusType status;
private String description;
private String responsiblePerson;
private LocalDateTime completedAtFrom;
private LocalDateTime completedAtUntil;
}
package ee.sm.ti.teis.commongateway.tasks.task.actionplan.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class TaskReferencesDto {
private List<String> references;
}
package ee.sm.ti.teis.commongateway.tasks.task.actionplan.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class TaskResponsiblePersonsDto {
private List<String> responsiblePersons;
}
package ee.sm.ti.teis.commongateway.tasks.task.actionplan.dto;
import ee.sm.ti.teis.types.enums.TaskStatusType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UpdateTaskActionPlanStatusDto {
@NotNull
private UUID id;
@NotNull
private TaskStatusType status;
}
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