From 1b3621db97f3ab6279edba72ce88375ab59a15d5 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 20 Jun 2022 21:11:20 +0300 Subject: [PATCH] RED-4249 - multiple watermarks per dossier template --- .../service/v1/api/resources/WatermarkResource.java | 2 +- .../management/v1/processor/service/WatermarkService.java | 2 +- .../service/persistence/repository/WatermarkRepository.java | 2 +- .../peristence/v1/server/controller/WatermarkController.java | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java index 9ddb539b6..1123b95bd 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java @@ -24,7 +24,7 @@ public interface WatermarkResource { Watermark getWatermark(@PathVariable(WATERMARK_ID_PARAMETER_NAME) long watermarkId); @GetMapping(value = WATERMARK_PATH, produces = MediaType.APPLICATION_JSON_VALUE) - List getWatermarksForDossierTemplateId(@RequestParam(DOSSIER_TEMPLATE_ID_PARAMETER_NAME) long dossierTemplateId); + List getWatermarksForDossierTemplateId(@RequestParam(DOSSIER_TEMPLATE_ID_PARAMETER_NAME) String dossierTemplateId); @ResponseStatus(HttpStatus.NO_CONTENT) @DeleteMapping(value = WATERMARK_PATH + WATERMARK_ID_PATH_VARIABLE) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java index f1c3ee01d..96000dc49 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java @@ -84,7 +84,7 @@ public class WatermarkService { } - public List getWatermarksForDossierTemplateId(long dossierTemplateId) { + public List getWatermarksForDossierTemplateId(String dossierTemplateId) { return watermarkRepository.findByDossierTemplateId(dossierTemplateId); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java index f9e3f9837..af0f0c7ec 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java @@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface WatermarkRepository extends JpaRepository { - List findByDossierTemplateId(long dossierTemplateId); + List findByDossierTemplateId(String dossierTemplateId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java index f4239008d..7e229cca6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java @@ -1,6 +1,5 @@ package com.iqser.red.service.peristence.v1.server.controller; -import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity; import com.iqser.red.service.persistence.management.v1.processor.service.WatermarkService; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark; import com.iqser.red.service.persistence.service.v1.api.resources.WatermarkResource; @@ -31,7 +30,7 @@ public class WatermarkController implements WatermarkResource { } @Override - public List getWatermarksForDossierTemplateId(@RequestParam(value = DOSSIER_TEMPLATE_ID_PARAMETER_NAME)long dossierTemplateId) { + public List getWatermarksForDossierTemplateId(@RequestParam(value = DOSSIER_TEMPLATE_ID_PARAMETER_NAME) String dossierTemplateId) { return convert(watermarkService.getWatermarksForDossierTemplateId(dossierTemplateId), Watermark.class); }