Commit 7e22cb50 authored by Kristel Meikas's avatar Kristel Meikas
Browse files

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
parents e6442ced f94f51f3
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;
}
...@@ -2,7 +2,7 @@ package ee.sm.ti.teis.officegateway.docgen.response; ...@@ -2,7 +2,7 @@ package ee.sm.ti.teis.officegateway.docgen.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.officegateway.docgen.dto.GeneratedDocumentDto; import ee.sm.ti.teis.commongateway.docgen.dto.GeneratedDocumentDto;
public class PreviewDocumentResponse extends AbstractDTO<GeneratedDocumentDto, ErrorDTO> { public class PreviewDocumentResponse extends AbstractDTO<GeneratedDocumentDto, ErrorDTO> {
......
package ee.sm.ti.teis.officegateway.docgen; 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.exceptions.TeisResourceNotFoundException;
import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException; 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.request.PreviewDocumentRequest;
import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse; import ee.sm.ti.teis.officegateway.docgen.response.PreviewDocumentResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
package ee.sm.ti.teis.officegateway.proceedings.proceduralact.service; 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.exceptions.TeisResourceNotFoundException;
import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException; 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.docgen.response.PreviewDocumentResponse;
import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActConductingTimeDto; import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActConductingTimeDto;
import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActDto; import ee.sm.ti.teis.officegateway.proceedings.proceduralact.dto.ProceduralActDto;
......
...@@ -149,8 +149,8 @@ public class ProceedingController extends TeisBaseController { ...@@ -149,8 +149,8 @@ public class ProceedingController extends TeisBaseController {
@ApiOperation(value = "${teis.api.docgen.preview}") @ApiOperation(value = "${teis.api.docgen.preview}")
@GetMapping("{proceedingId}/notice-preview") @GetMapping("{proceedingId}/notice-preview")
public void preview(@PathVariable String proceedingId, // TODO: refactor to use UUID instead of String
RequestMetaDTO requestMetaDTO, public void preview(@PathVariable String proceedingId, RequestMetaDTO requestMetaDTO,
HttpServletResponse response) { HttpServletResponse response) {
ProceedingNoticePreviewRequest request = new ProceedingNoticePreviewRequest(); ProceedingNoticePreviewRequest request = new ProceedingNoticePreviewRequest();
request.setPayload(new ProceedingNoticePreviewRequest.Parameters(UUID.fromString(proceedingId)), requestMetaDTO); request.setPayload(new ProceedingNoticePreviewRequest.Parameters(UUID.fromString(proceedingId)), requestMetaDTO);
......
package ee.sm.ti.teis.officegateway.proceedings.proceeding; 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.exceptions.TeisResourceNotFoundException;
import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException; 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.docgen.response.PreviewDocumentResponse;
import ee.sm.ti.teis.officegateway.proceedings.proceeding.request.ProceedingNoticePreviewRequest; import ee.sm.ti.teis.officegateway.proceedings.proceeding.request.ProceedingNoticePreviewRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
package ee.sm.ti.teis.officegateway.proceedings.violationact; 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.exceptions.TeisResourceNotFoundException;
import ee.sm.ti.teis.gatewaycommon.error.NoResponseFromRabbitException; 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.docgen.response.PreviewDocumentResponse;
import ee.sm.ti.teis.officegateway.proceedings.violationact.request.PreviewViolationActDocumentRequest; import ee.sm.ti.teis.officegateway.proceedings.violationact.request.PreviewViolationActDocumentRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
theGroup=ee.sm.ti.teis theGroup=ee.sm.ti.teis
theVersion=1.23.0-SNAPSHOT theVersion=1.23.0-SNAPSHOT
commonsVersion=1.22.0 commonsVersion=1.23.0-SNAPSHOT
commonApiGatewayVersion=1.22.0 commonApiGatewayVersion=1.23.0-SNAPSHOT
pluginVersion=1.3.0 pluginVersion=1.3.0
Supports Markdown
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