Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #449: RED-4249 - multiple watermarks per dossier template

Browse Source 
Merge in RED/persistence-service from RED-4249-fix2 to master

* commit '1b3621db97f3ab6279edba72ce88375ab59a15d5':
  RED-4249 - multiple watermarks per dossier template
This commit is contained in:
Timo Bejan 2022-06-20 20:14:55 +02:00
commit 237667e9c8
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java
View File

@ -24,7 +24,7 @@ public interface WatermarkResource {
Watermark getWatermark(@PathVariable(WATERMARK_ID_PARAMETER_NAME) long watermarkId); Watermark getWatermark(@PathVariable(WATERMARK_ID_PARAMETER_NAME) long watermarkId);
@GetMapping(value = WATERMARK_PATH, produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = WATERMARK_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
List<Watermark> getWatermarksForDossierTemplateId(@RequestParam(DOSSIER_TEMPLATE_ID_PARAMETER_NAME) long dossierTemplateId); List<Watermark> getWatermarksForDossierTemplateId(@RequestParam(DOSSIER_TEMPLATE_ID_PARAMETER_NAME) String dossierTemplateId);
@ResponseStatus(HttpStatus.NO_CONTENT) @ResponseStatus(HttpStatus.NO_CONTENT)
@DeleteMapping(value = WATERMARK_PATH + WATERMARK_ID_PATH_VARIABLE) @DeleteMapping(value = WATERMARK_PATH + WATERMARK_ID_PATH_VARIABLE)

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
View File

@ -84,7 +84,7 @@ public class WatermarkService {
} }
public List<WatermarkEntity> getWatermarksForDossierTemplateId(long dossierTemplateId) { public List<WatermarkEntity> getWatermarksForDossierTemplateId(String dossierTemplateId) {
return watermarkRepository.findByDossierTemplateId(dossierTemplateId); return watermarkRepository.findByDossierTemplateId(dossierTemplateId);
} }

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java
View File

@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List; import java.util.List;
public interface WatermarkRepository extends JpaRepository<WatermarkEntity, Long> { public interface WatermarkRepository extends JpaRepository<WatermarkEntity, Long> {
List<WatermarkEntity> findByDossierTemplateId(long dossierTemplateId); List<WatermarkEntity> findByDossierTemplateId(String dossierTemplateId);
} }

3
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java
View File

@ -1,6 +1,5 @@
package com.iqser.red.service.peristence.v1.server.controller; 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.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.model.dossiertemplate.configuration.Watermark;
import com.iqser.red.service.persistence.service.v1.api.resources.WatermarkResource; import com.iqser.red.service.persistence.service.v1.api.resources.WatermarkResource;
@ -31,7 +30,7 @@ public class WatermarkController implements WatermarkResource {
} }
@Override @Override
public List<Watermark> getWatermarksForDossierTemplateId(@RequestParam(value = DOSSIER_TEMPLATE_ID_PARAMETER_NAME)long dossierTemplateId) { public List<Watermark> getWatermarksForDossierTemplateId(@RequestParam(value = DOSSIER_TEMPLATE_ID_PARAMETER_NAME) String dossierTemplateId) {
return convert(watermarkService.getWatermarksForDossierTemplateId(dossierTemplateId), Watermark.class); return convert(watermarkService.getWatermarksForDossierTemplateId(dossierTemplateId), Watermark.class);
} }