Merge branch 'TEIS-2086' into 'develop'

TEIS-2086: relocated GeneratedDocumentDto to common-api-gateway

Closes TEIS-2086

See merge request teis/office-api-gateway!171

api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/docgen/dto/GeneratedDocumentDto.java

-package ee.sm.ti.teis.officegateway.docgen.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class GeneratedDocumentDto {
-    private String templateId;
-    private String docName;
-    private String contentType;
-    private byte[] content;
-}

api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/docgen/response/PreviewDocumentResponse.java

@@ -2,7 +2,7 @@ package ee.sm.ti.teis.officegateway.docgen.response;
 
 import ee.sm.ti.teis.AbstractDTO;
 import ee.sm.ti.teis.ErrorDTO;
-import ee.sm.ti.teis.officegateway.docgen.dto.GeneratedDocumentDto;
+import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
 
 public class PreviewDocumentResponse extends AbstractDTO<GeneratedDocumentDto, ErrorDTO> {
 

api-gateway/src/main/java/ee/sm/ti/teis/officegateway/docgen/DocGenProcessingService.java

 package ee.sm.ti.teis.officegateway.docgen;
 
+import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.exceptions.TeisResourceNotFoundException;
 import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException;
-import ee.sm.ti.teis.officegateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.officegateway.docgen.request.PreviewDocumentRequest;
 import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse;
 import lombok.RequiredArgsConstructor;

api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceduralact/service/ProceduralActProcessingService.java

 package ee.sm.ti.teis.officegateway.proceedings.proceduralact.service;
 
+import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.exceptions.TeisResourceNotFoundException;
 import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException;
-import ee.sm.ti.teis.officegateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse;
 import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActConductingTimeDto;
 import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActDto;

api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/ProceedingController.java

@@ -149,8 +149,8 @@ public class ProceedingController extends TeisBaseController {
 
     @ApiOperation(value = "${teis.api.docgen.preview}")
     @GetMapping("{proceedingId}/notice-preview")
-    public void preview(@PathVariable String proceedingId,
-            RequestMetaDTO requestMetaDTO,
+    // TODO: refactor to use UUID instead of String
+    public void preview(@PathVariable String proceedingId, RequestMetaDTO requestMetaDTO,
             HttpServletResponse response) {
         ProceedingNoticePreviewRequest request = new ProceedingNoticePreviewRequest();
         request.setPayload(new ProceedingNoticePreviewRequest.Parameters(UUID.fromString(proceedingId)), requestMetaDTO);

api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/ProceedingProcessingService.java

 package ee.sm.ti.teis.officegateway.proceedings.proceeding;
 
+import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.exceptions.TeisResourceNotFoundException;
 import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException;
-import ee.sm.ti.teis.officegateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse;
 import ee.sm.ti.teis.officegateway.proceedings.proceeding.request.ProceedingNoticePreviewRequest;
 import lombok.RequiredArgsConstructor;

api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/violationact/ViolationActProcessingService.java

 package ee.sm.ti.teis.officegateway.proceedings.violationact;
 
+import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.exceptions.TeisResourceNotFoundException;
 import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException;
-import ee.sm.ti.teis.officegateway.docgen.dto.GeneratedDocumentDto;
 import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse;
 import ee.sm.ti.teis.officegateway.proceedings.violationact.request.PreviewViolationActDocumentRequest;
 import lombok.RequiredArgsConstructor;

gradle.properties

 theGroup=ee.sm.ti.teis
 theVersion=1.23.0-SNAPSHOT
-commonsVersion=1.22.0
-commonApiGatewayVersion=1.22.0
+commonsVersion=1.23.0-SNAPSHOT
+commonApiGatewayVersion=1.23.0-SNAPSHOT
 pluginVersion=1.3.0