Commit 25ffd0b8 authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Siiri Tann

See merge request teis/common-api-gateway!261
parents e4ba6d32 40d3205e
# Changelog
## [1.27.0] - 2021-09-27
* TEIS-2242: added API endpoint for updating drivers violation justification
* TEIS-2422: change date format for RiskAssessmentTaskPdfDto; updated riskAssessment pdf date format
* TEIS-2405: added methods to get linked classifier items
* TEIS-2241: added API endpoint for updating drivers inspection status
* TEIS-2394: implemented changes to RiskAssessmentTaskPdfDto from testing
* TEIS-2265: new endpoint for getting accident occurrence
* TEIS-2426: updated AccidentEmployeeLightDto and AccidentOccurrenceLightDto
* TEIS-2218: new endpoint for getting accident employer
* TEIS-2211: new endpoint for getting accident employee
* TEIS-2378: updated getRiskFactors method to include optional parameter businessTypeId
* TEIS-2293: return drivers infringement status as classifier instead of string
* TEIS-2234: replaced key value mapping identificator with = instead of colon due to file format migration from yaml to
properties
* TEIS-2264: updated AccidentPermissionTestController endpoint
* TEIS-2226: refactored drivers inspections' permissions TEST controller output
* TEIS-2264: new GetAccidentCaseResponseDto. Removed AccidentCaseLightDto
* TEIS-2226: refactored permission related objects to use sets instead of lists
* TEIS-2293: minor code quality improvements
* TEIS-2220: new Dtos for accidents
* TEIS-2416: added new field addresseeType to CreateMessageDto
* TEIS-2416: data migration script to fix messages with wrong addresseeType
* TEIS-2212: new endpoint for testing accidents permissions.
* TEIS-2412: new endpoint, request and response objects for testing getting parameters by code.
* TEIS-2380: added basic methods to get riskassessment pdf file and test controller; added tasks request; added risk
indicator values; added risk assessment tasks to pdf; updated risk assessment pdf generation to include riskindicator
name; corrected risk assessment pdf download url; corrected date format for RiskAssessmentPdfDto
* TEIS-2191: added API endpoint for requesting all distinct drivers' names and card numbers for drivers inspection
* TEIS-2408: updated AccidentCaseDto
* TEIS-2193: added API endpoint for requesting drivers violation with related data by id; relocated drivers violation
type, violation sub type and infringement type DTOs from office gw to common gw
* Technical debt: replaced swagger.yaml configuration format with .properties
## [1.26.1] - 2021-08-18
* TEIS-2399: add new endpoint GET /public/parameters
## [1.26.0] - 2021-06-14
* TEIS-2109: improved integration tests. removed unnecessary isSingle from PatchTaskDto. refactored PersonProcessingService.
* TEIS-2109: improved integration tests. removed unnecessary isSingle from PatchTaskDto. refactored
PersonProcessingService.
## [1.25.0] - 2021-05-31
......
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.commongateway.official.OfficialUserInSequencePublicDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AccidentCaseDto {
private UUID id;
private ClassifierItemLightDto accidentStatus;
private OfficialUserInSequencePublicDto administrator;
private UUID proceedingId;
private ClassifierItemLightDto criminalCase;
private String accidentNumber;
private Long seqNo;
private ClassifierItemLightDto accidentType;
private Integer daysOfIncapacityForWork;
private String eServiceConclusionStatus;
private LocalDateTime submittedAt;
private String submittedBy;
private LocalDateTime confirmedAt;
private String confirmedBy;
private String modifiedByName;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.commongateway.permissions.dto.AbstractPermissionsDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.*;
import java.time.LocalDate;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class AccidentEmployeeDto extends AbstractPermissionsDto {
private UUID id;
private UUID accidentCaseId;
private String idCode;
private LocalDate dateOfBirth;
private String firstName;
private String lastName;
private ClassifierItemLightDto gender;
private Integer age;
private ClassifierItemLightDto ageGroup;
private ClassifierItemLightDto nationality;
private String email;
private String phone;
private ClassifierItemLightDto employmentStatus;
private Integer durationOfEmployment;
private Boolean missionEmployee;
private ClassifierItemLightDto employmentCode;
private String modifiedByName;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Past;
import javax.validation.constraints.Size;
import java.time.LocalDate;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AccidentEmployeeLightDto {
@Size(max = 25)
private String idCode;
@Past
private LocalDate dateOfBirth;
@NotBlank
@Size(min = 1, max = 500)
private String firstName;
@NotBlank
@Size(min = 1, max = 500)
private String lastName;
private ClassifierItemLightDto gender;
private ClassifierItemLightDto nationality;
@NotNull
private Boolean missionEmployee;
private String email;
private String phone;
private Boolean employmentStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.commongateway.permissions.dto.AbstractPermissionsDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.*;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class AccidentEmployerDto extends AbstractPermissionsDto {
private UUID id;
private UUID accidentCaseId;
private UUID employerId;
private String regCode;
private String employerName;
private String emtakCode;
private String emtakName;
private Long numberOfEmployees;
private ClassifierItemLightDto numberOfEmployeesGroup;
private Long employeesStructuralUnit;
private String modifiedByName;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AccidentEmployerLightDto {
private UUID employerId;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.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 AccidentEncodingsDto {
private UUID id;
private UUID accidentCaseId;
private ClassifierItemLightDto injuryType;
private ClassifierItemLightDto injuredBodyPart;
private ClassifierItemLightDto typeOfInjury;
private ClassifierItemLightDto factorOfInjury;
private ClassifierItemLightDto placeOfWork;
private ClassifierItemLightDto accidentWorkingEnvironment;
private ClassifierItemLightDto accidentWorkProcess;
private ClassifierItemLightDto physicalActivity;
private ClassifierItemLightDto factorOfPhysicalActivity;
private ClassifierItemLightDto variation;
private ClassifierItemLightDto factorOfVariation;
private String modifiedByName;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import ee.sm.ti.teis.commongateway.permissions.dto.AbstractPermissionsDto;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.*;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class AccidentOccurrenceDto extends AbstractPermissionsDto {
private UUID id;
private UUID accidentCaseId;
private LocalDate occurrenceDate;
private LocalTime occurrenceTime;
private ClassifierItemLightDto country;
private ClassifierItemLightDto county;
private ClassifierItemLightDto cityOrParish;
private String description;
private String circumstances;
private ClassifierItemLightDto severity;
private Boolean trafficAccident;
private UUID businessTypeId;
private String businessTypeName;
private Integer hoursWorked;
private String justification;
private String otherCauses;
private Boolean riskAssessment;
private Boolean riskFactorsEstimated;
private String modifiedByName;
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Past;
import java.time.LocalDate;
import java.time.LocalTime;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AccidentOccurrenceLightDto {
@NotNull
@Past
private LocalDate occurrenceDate;
private LocalTime occurrenceTime;
@NotNull
private ClassifierItemLightDto country;
private ClassifierItemLightDto county;
private ClassifierItemLightDto cityOrParish;
private String description;
private String circumstances;
private ClassifierItemLightDto severity;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import lombok.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class CreateAccidentCaseRequestDto {
@NotNull
@Valid
private AccidentEmployeeLightDto accidentEmployee;
@Valid
private AccidentEmployerLightDto accidentEmployer;
@NotNull
@Valid
private AccidentOccurrenceLightDto accidentOccurrence;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.permissions.dto.AbstractPermissionsDto;
import lombok.*;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class CreateAccidentCaseResponseDto extends AbstractPermissionsDto {
private AccidentCaseDto accidentCase;
private AccidentEmployeeDto accidentEmployee;
private AccidentEmployerDto accidentEmployer;
private AccidentOccurrenceDto accidentOccurrence;
private AccidentEncodingsDto accidentEncodings;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.dto;
import ee.sm.ti.teis.commongateway.permissions.dto.AbstractPermissionsDto;
import lombok.*;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class GetAccidentCaseResponseDto extends AbstractPermissionsDto {
private AccidentCaseDto accidentCase;
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.accidents.accidentcase.dto.CreateAccidentCaseRequestDto;
public class CreateAccidentCaseRequest extends AbstractDTO<CreateAccidentCaseRequestDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.CreateAccidentCaseRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class GetAccidentCaseRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentCaseRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class GetAccidentEmployeeRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentEmployeeRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class GetAccidentEmployerRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentEmployerRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class GetAccidentOccurrenceRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentOccurrenceRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.request;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import java.util.UUID;
public class GetAccidentPermissionsTestRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentPermissionsTestRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.accidents.accidentcase.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.accidents.accidentcase.dto.CreateAccidentCaseResponseDto;
public class CreateAccidentCaseResponse extends AbstractDTO<CreateAccidentCaseResponseDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.CreateAccidentCaseResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
\ No newline at end of file
package ee.sm.ti.teis.commongateway.accidents.accidentcase.response;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.commongateway.accidents.accidentcase.dto.GetAccidentCaseResponseDto;
public class GetAccidentCaseResponse extends AbstractDTO<GetAccidentCaseResponseDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.GetAccidentCaseResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
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