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

Merge branch 'TEIS-2064' into 'develop'

TEIS-2064: added new fields to procedural act data object

Closes TEIS-2064

See merge request teis/office-api-gateway!182
parents 264ce017 6cb82c7e
...@@ -49,6 +49,8 @@ public class ProceduralActDto { ...@@ -49,6 +49,8 @@ public class ProceduralActDto {
@Builder.Default @Builder.Default
private List<ProceduralActLocationDto> proceduralActLocations = new ArrayList<>(); private List<ProceduralActLocationDto> proceduralActLocations = new ArrayList<>();
private Boolean advanceNotice; private Boolean advanceNotice;
private Boolean conductedAct;
private String reasonOfNotConductedAct;
private ObjectStatus objectStatus; private ObjectStatus objectStatus;
} }
...@@ -29,7 +29,8 @@ public class ProceduralActController extends TeisBaseController { ...@@ -29,7 +29,8 @@ public class ProceduralActController extends TeisBaseController {
@ApiOperation(value = "${teis.api.messages.proceeding.get-procedural-acts}", response = ProceduralActDto.class) @ApiOperation(value = "${teis.api.messages.proceeding.get-procedural-acts}", response = ProceduralActDto.class)
@GetMapping @GetMapping
public List<ProceduralActDto> getProceduralActs(@RequestParam(value = "proceedingId") UUID id, RequestMetaDTO requestMetaDTO) { public List<ProceduralActDto> getProceduralActs(@RequestParam(value = "proceedingId") UUID id,
RequestMetaDTO requestMetaDTO) {
ProceduralActsRequest request = new ProceduralActsRequest(); ProceduralActsRequest request = new ProceduralActsRequest();
request.setPayload(id, requestMetaDTO); request.setPayload(id, requestMetaDTO);
...@@ -56,7 +57,8 @@ public class ProceduralActController extends TeisBaseController { ...@@ -56,7 +57,8 @@ public class ProceduralActController extends TeisBaseController {
@ApiOperation(value = "${teis.api.messages.proceeding.post-procedural-act}", response = ProceduralActDto.class) @ApiOperation(value = "${teis.api.messages.proceeding.post-procedural-act}", response = ProceduralActDto.class)
@PutMapping("{id}") @PutMapping("{id}")
public ProceduralActDto update(@PathVariable UUID id, @RequestBody ProceduralActDto dto, RequestMetaDTO requestMetaDTO) { public ProceduralActDto update(@PathVariable UUID id, @RequestBody ProceduralActDto dto,
RequestMetaDTO requestMetaDTO) {
UpdateProceduralActRequest request = new UpdateProceduralActRequest(); UpdateProceduralActRequest request = new UpdateProceduralActRequest();
dto.setId(id); dto.setId(id);
request.setPayload(dto, requestMetaDTO); request.setPayload(dto, requestMetaDTO);
...@@ -66,7 +68,8 @@ public class ProceduralActController extends TeisBaseController { ...@@ -66,7 +68,8 @@ public class ProceduralActController extends TeisBaseController {
@ApiOperation(value = "${teis.api.messages.proceeding.patch-procedural-act}", response = ProceduralActDto.class) @ApiOperation(value = "${teis.api.messages.proceeding.patch-procedural-act}", response = ProceduralActDto.class)
@PatchMapping("{id}/status") @PatchMapping("{id}/status")
public ProceduralActDto updateStatus(@PathVariable UUID id, @RequestBody StatusDto statusDto, RequestMetaDTO requestMetaDTO) { public ProceduralActDto updateStatus(@PathVariable UUID id, @RequestBody StatusDto statusDto,
RequestMetaDTO requestMetaDTO) {
UpdateProceduralActStatusRequest request = new UpdateProceduralActStatusRequest(); UpdateProceduralActStatusRequest request = new UpdateProceduralActStatusRequest();
statusDto.setId(id); statusDto.setId(id);
request.setPayload(statusDto, requestMetaDTO); request.setPayload(statusDto, requestMetaDTO);
...@@ -85,7 +88,8 @@ public class ProceduralActController extends TeisBaseController { ...@@ -85,7 +88,8 @@ public class ProceduralActController extends TeisBaseController {
@ApiOperation(value = "${teis.api.messages.proceeding.get-procedural-act-inspection-topics}", response = ProceduralActInspectionTopicDto.class) @ApiOperation(value = "${teis.api.messages.proceeding.get-procedural-act-inspection-topics}", response = ProceduralActInspectionTopicDto.class)
@GetMapping(value = "{id}/inspection-topics") @GetMapping(value = "{id}/inspection-topics")
public List<ProceduralActInspectionTopicDto> getProceduralActInspectionTopics(@PathVariable UUID id, RequestMetaDTO requestMetaDTO) { public List<ProceduralActInspectionTopicDto> getProceduralActInspectionTopics(@PathVariable UUID id,
RequestMetaDTO requestMetaDTO) {
ProceduralActInspectionTopicsRequest request = new ProceduralActInspectionTopicsRequest(); ProceduralActInspectionTopicsRequest request = new ProceduralActInspectionTopicsRequest();
request.setPayload(id, requestMetaDTO); request.setPayload(id, requestMetaDTO);
...@@ -127,8 +131,7 @@ public class ProceduralActController extends TeisBaseController { ...@@ -127,8 +131,7 @@ public class ProceduralActController extends TeisBaseController {
@GetMapping(value = "feedback-addressees") @GetMapping(value = "feedback-addressees")
public void getFeedbackCSV(@RequestParam(required = false) LocalDate endDatePeriodStart, public void getFeedbackCSV(@RequestParam(required = false) LocalDate endDatePeriodStart,
@RequestParam(required = false) LocalDate endDatePeriodEnd, @RequestParam(required = false) LocalDate endDatePeriodEnd,
RequestMetaDTO requestMetaDTO, RequestMetaDTO requestMetaDTO, HttpServletResponse response) {
HttpServletResponse response) {
ProceduralActFeedbackCSVRequest request = new ProceduralActFeedbackCSVRequest(); ProceduralActFeedbackCSVRequest request = new ProceduralActFeedbackCSVRequest();
ProceduralActFeedbackCSVRequest.Parameters payload = new ProceduralActFeedbackCSVRequest.Parameters(); ProceduralActFeedbackCSVRequest.Parameters payload = new ProceduralActFeedbackCSVRequest.Parameters();
payload.setEndDatePeriodEnd(endDatePeriodEnd); payload.setEndDatePeriodEnd(endDatePeriodEnd);
......
theGroup=ee.sm.ti.teis theGroup=ee.sm.ti.teis
theVersion=1.25.0-SNAPSHOT theVersion=1.25.0-SNAPSHOT
commonsVersion=1.24.0 commonsVersion=1.24.0
commonApiGatewayVersion=1.24.0 commonApiGatewayVersion=1.25.0-SNAPSHOT
pluginVersion=1.3.0 pluginVersion=1.3.0
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