Commit d1100c62 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!105
parents 81c840b6 cc1a7eb1
package ee.sm.ti.teis.commongateway.admin;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FeatureFlagDto {
private String id;
private String name;
private boolean enabled;
}
package ee.sm.ti.teis.commongateway.admin;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
public class FeatureFlagRequest extends AbstractDTO<String, ErrorDTO> {
public static final String ROUTING_KEY = "api.FeatureFlagRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
package ee.sm.ti.teis.commongateway.admin;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
public class FeatureFlagResponse extends AbstractDTO<FeatureFlagDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.FeatureFlagResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
......@@ -6,14 +6,17 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.UUID;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PersonalDataUsageDto {
@NotBlank
private String personId;
@NotNull
private UUID personId;
@NotBlank
private String actionName;
@NotBlank
......@@ -30,5 +33,5 @@ public class PersonalDataUsageDto {
private String restrictions = "A";
private String xRoadRequestId;
private String xRoadService;
private String officialUserId;
private UUID officialUserId;
}
......@@ -2,11 +2,10 @@ package ee.sm.ti.teis.commongateway.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class CreateLocationsRequest extends AbstractDTO<CreateLocationsRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class CreateLocationsRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.CreateLocationsRequest";
......@@ -15,11 +14,4 @@ public class CreateLocationsRequest extends AbstractDTO<CreateLocationsRequest.P
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String employerId;
}
}
......@@ -2,11 +2,10 @@ package ee.sm.ti.teis.commongateway.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class DeleteLocationRequest extends AbstractDTO<DeleteLocationRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class DeleteLocationRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.DeleteLocationRequest";
......@@ -15,11 +14,4 @@ public class DeleteLocationRequest extends AbstractDTO<DeleteLocationRequest.Par
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String id;
}
}
......@@ -2,22 +2,14 @@ package ee.sm.ti.teis.commongateway.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class LocationRequest extends AbstractDTO<LocationRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class LocationRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.LocationRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String id;
}
}
......@@ -2,11 +2,10 @@ package ee.sm.ti.teis.commongateway.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class LocationsRequest extends AbstractDTO<LocationsRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class LocationsRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.LocationsRequest";
@Override
......@@ -14,10 +13,4 @@ public class LocationsRequest extends AbstractDTO<LocationsRequest.Parameters, E
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String employerId;
}
}
......@@ -42,7 +42,7 @@ public class ClaimDto {
@NotNull
private PersonDto employer;
private List<ReconciliationPublicDto> reconciliations;
private EnforcementDto enforcement;
private EnforcementPublicDto enforcement;
@NotNull
@Valid
......
......@@ -16,6 +16,7 @@ public class ClaimSearchFilterDto extends AbstractPagingDto {
private Boolean all;
private LocalDate deadlineUntil;
private UUID employerId;
private String employerName;
private String reference;
private UUID dataObjectId;
......
......@@ -13,7 +13,7 @@ import java.util.UUID;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EnforcementDto {
public class EnforcementPublicDto {
private UUID id;
private UUID claimId;
......
......@@ -2,22 +2,14 @@ package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class CheckRepresentativeRequest extends AbstractDTO<CheckRepresentativeRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class CheckRepresentativeRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.CheckRepresentativeRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String id;
}
}
......@@ -2,24 +2,14 @@ package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
public class DeleteRepresentativeRequest extends AbstractDTO<DeleteRepresentativeRequest.Parameters, ErrorDTO> {
public class DeleteRepresentativeRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.DeleteRepresentativeRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private UUID id;
}
}
......@@ -3,7 +3,7 @@ package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
public class DeleteRepresentativeResponse extends AbstractDTO<RepresentativeDto, ErrorDTO> {
public class DeleteRepresentativeResponse extends AbstractDTO<Void, ErrorDTO> {
public static final String ROUTING_KEY = "api.DeleteRepresentativeResponse";
@Override
......
......@@ -2,22 +2,14 @@ package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
public class RepresentativeRequest extends AbstractDTO<RepresentativeRequest.Parameters, ErrorDTO> {
import java.util.UUID;
public class RepresentativeRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.RepresentativeRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private String id;
}
}
package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
import static ee.sm.ti.teis.commongateway.representative.UpdateRepresentativeContactsRequest.Parameters;
public class UpdateRepresentativeContactsRequest extends AbstractDTO<Parameters, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateRepresentativeContactsRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private UUID representativeId;
private String email;
private String phone;
}
}
package ee.sm.ti.teis.commongateway.representative;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
public class UpdateRepresentativeContactsResponse extends AbstractDTO<RepresentativeDto, ErrorDTO> {
public static final String ROUTING_KEY = "api.UpdateRepresentativeContactsResponse";
@Override
public String routingKey() {
return ROUTING_KEY;
}
}
......@@ -2,24 +2,14 @@ package ee.sm.ti.teis.commongateway.representative.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.UUID;
public class DeleteRepresentativeLocationRequest extends AbstractDTO<DeleteRepresentativeLocationRequest.Parameters, ErrorDTO> {
public class DeleteRepresentativeLocationRequest extends AbstractDTO<UUID, ErrorDTO> {
public static final String ROUTING_KEY = "api.DeleteRepresentativeLocationRequest";
@Override
public String routingKey() {
return ROUTING_KEY;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class Parameters {
private UUID id;
}
}
......@@ -2,9 +2,8 @@ package ee.sm.ti.teis.commongateway.representative.location;
import ee.sm.ti.teis.AbstractDTO;
import ee.sm.ti.teis.ErrorDTO;
import ee.sm.ti.teis.wrappers.StringValueResultWrapper;
public class DeleteRepresentativeLocationResponse extends AbstractDTO<StringValueResultWrapper, ErrorDTO> {
public class DeleteRepresentativeLocationResponse extends AbstractDTO<Void, ErrorDTO> {
public static final String ROUTING_KEY = "api.DeleteRepresentativeLocationResponse";
@Override
......
......@@ -22,4 +22,5 @@ public class RepresentativeSearchFilterDto {
private Validity validity;
@Builder.Default
private boolean withLocations = true;
private boolean fillCache;
}
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