Commit ef1261f5 authored by Enriko Käsper's avatar Enriko Käsper
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/common-api-gateway!182
parents c0a755bc b538efc6
# Changelog # Changelog
## [1.19.0] - 2021-02-05
* added REST endpoint for task action plan references & responsible persons.
* added PATCH risk-statement-assessments/{id}/task-status method.
* updated GET parameters functionality.
* refactored Rabbit requests processing service layer classes.
## [1.18.0] - 2021-01-22 ## [1.18.0] - 2021-01-22
* added new parameters publishedDate and archivedDate into RiskAssessmentPublicDto * added new parameters publishedDate and archivedDate into RiskAssessmentPublicDto
......
package ee.sm.ti.teis.commongateway.auditlog; package ee.sm.ti.teis.commongateway.auditlog.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import ee.sm.ti.teis.types.enums.ActivityType; import ee.sm.ti.teis.types.enums.ActivityType;
import ee.sm.ti.teis.types.enums.ActorType; import ee.sm.ti.teis.types.enums.ActorType;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -16,15 +15,16 @@ import java.util.UUID; ...@@ -16,15 +15,16 @@ import java.util.UUID;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class AuditLogItemDto { public class AuditLogItemDto {
private UUID id; private UUID id;
private ActorType actorType; private ActorType actorType;
private UUID personId; private UUID personId;
private UUID officialUserId; private UUID officialUserId;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime activityTime; private LocalDateTime activityTime;
private ActivityType activityType; private ActivityType activityType;
private String activityDescription; private String activityDescription;
private String dataObjectType; private String dataObjectType;
private String parentDataObjectId; private String parentDataObjectId;
private String dataObjectId; private String dataObjectId;
private UUID employerId;
} }
package ee.sm.ti.teis.commongateway.auditlog.dto;
import ee.sm.ti.teis.types.enums.ActivityType;
import ee.sm.ti.teis.types.enums.DataObjectType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AuditLogItemExistsDto {
@NotNull
private ActivityType activityType;
@NotNull
private DataObjectType dataObjectType;
@NotNull
private String dataObjectId;
@NotNull
private Integer interval;
}
package ee.sm.ti.teis.commongateway.auditlog.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AuditLogItemExistsResponseDto {
private Boolean auditLogItemExists;
}
package ee.sm.ti.teis.commongateway.auditlog.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.auditlog.dto.AuditLogItemExistsDto;
public class AuditLogItemExistsRequest extends AbstractDTO<AuditLogItemExistsDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.AuditLogItemExistsRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.auditlog; package ee.sm.ti.teis.commongateway.auditlog.request;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
......
package ee.sm.ti.teis.commongateway.auditlog; package ee.sm.ti.teis.commongateway.auditlog.request;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor; import ee.sm.ti.teis.commongateway.auditlog.dto.AuditLogItemDto;
import lombok.Data;
import lombok.NoArgsConstructor;
public class CreateAuditLogItemRequest extends AbstractDTO<CreateAuditLogItemRequest.Parameters, ErrorDTO> { public class CreateAuditLogItemRequest extends AbstractDTO<AuditLogItemDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.CreateAuditLogItemRequest"; public static final String ROUTING_KEY = "api.CreateAuditLogItemRequest";
@Override @Override
public String routingKey() { public String routingKey() {
return ROUTING_KEY; return ROUTING_KEY;
} }
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private AuditLogItemDto item;
}
} }
package ee.sm.ti.teis.commongateway.auditlog.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.auditlog.dto.AuditLogItemExistsResponseDto;
public class AuditLogItemExistsResponse extends AbstractDTO<AuditLogItemExistsResponseDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.AuditLogItemExistsResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.auditlog; package ee.sm.ti.teis.commongateway.auditlog.response;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.auditlog.dto.AuditLogItemDto;
import java.util.List; import java.util.List;
......
package ee.sm.ti.teis.commongateway.auditlog; package ee.sm.ti.teis.commongateway.auditlog.response;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.auditlog.dto.AuditLogItemDto;
public class CreateAuditLogItemResponse extends AbstractDTO<AuditLogItemDto, ErrorDTO> { public class CreateAuditLogItemResponse extends AbstractDTO<AuditLogItemDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.CreateAuditLogItemResponse"; public static final String ROUTING_KEY = "api.CreateAuditLogItemResponse";
......
package ee.sm.ti.teis.commongateway.parameter.dto;
import ee.sm.ti.teis.types.enums.DataType;
import ee.sm.ti.teis.types.enums.ScopeType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Set;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AdminParameterDto {
private String code;
private String name;
private String value;
private Boolean mandatory;
private DataType dataType;
private Boolean frequentlyChanged;
private Set<ScopeType> scopes;
}
package ee.sm.ti.teis.commongateway.parameter; package ee.sm.ti.teis.commongateway.parameter.dto;
import ee.sm.ti.teis.types.enums.ScopeType; import ee.sm.ti.teis.types.enums.ScopeType;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
package ee.sm.ti.teis.commongateway.parameter.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UpdateParameterValueDto {
@NotBlank
private String code;
private String value;
}
package ee.sm.ti.teis.commongateway.parameter.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
public class AdminParametersRequest extends AbstractDTO<Void, ErrorDTO> {
public static final String ROUTING_KEY = "api.AdminParametersRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
\ No newline at end of file
package ee.sm.ti.teis.commongateway.parameter; package ee.sm.ti.teis.commongateway.parameter.request;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
......
package ee.sm.ti.teis.commongateway.parameter.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.parameter.dto.UpdateParameterValueDto;
public class UpdateParameterValueRequest extends AbstractDTO<UpdateParameterValueDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateParameterValueRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
\ No newline at end of file
package ee.sm.ti.teis.commongateway.parameter.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.parameter.dto.AdminParameterDto;
import java.util.Set;
public class AdminParametersResponse extends AbstractDTO<Set<AdminParameterDto>, ErrorDTO> {
public static final String ROUTING_KEY = "api.AdminParametersResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.parameter; package ee.sm.ti.teis.commongateway.parameter.response;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.parameter.dto.ParameterDto;
import java.util.Set; import java.util.Set;
......
package ee.sm.ti.teis.commongateway.parameter.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.parameter.dto.AdminParameterDto;
public class UpdateParameterValueResponse extends AbstractDTO<AdminParameterDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateParameterValueResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
...@@ -2,11 +2,10 @@ package ee.sm.ti.teis.commongateway.proceedings.violationact; ...@@ -2,11 +2,10 @@ package ee.sm.ti.teis.commongateway.proceedings.violationact;
import ee.sm.ti.teis.AbstractDTO; import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO; import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class ViolationActPublicRequest extends AbstractDTO<ViolationActPublicRequest.Parameters, ErrorDTO> { import java.util.UUID;
public class ViolationActPublicRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.ViolationActPublicRequest"; public static final String ROUTING_KEY = "api.ViolationActPublicRequest";
@Override @Override
...@@ -14,11 +13,4 @@ public class ViolationActPublicRequest extends AbstractDTO<ViolationActPublicReq ...@@ -14,11 +13,4 @@ public class ViolationActPublicRequest extends AbstractDTO<ViolationActPublicReq
return ROUTING_KEY; return ROUTING_KEY;
} }
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String violationActId;
}
} }
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