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

RED-6289 - Validate watermark color

Browse Source 
- move up the validation of colors and opacity
This commit is contained in:
devplant 2023-04-26 09:33:30 +03:00
parent afb4075fdc
commit 5c83d67e4d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,14 +56,14 @@ public class WatermarkService {
@Transactional @Transactional
public WatermarkEntity createOrUpdateWatermark(WatermarkModel watermark) { public WatermarkEntity createOrUpdateWatermark(WatermarkModel watermark) {
validateWatermark(watermark); validateWatermarkNameIsPresent(watermark);
validateHexColorAndSetDefaultIfNeeded(watermark);
validateOpacityAndSetDefaultIfNeeded(watermark);
if (watermark.getId() != null) { // update if (watermark.getId() != null) { // update
Optional<WatermarkEntity> loadedWatermark = watermarkRepository.findById(watermark.getId()); Optional<WatermarkEntity> loadedWatermark = watermarkRepository.findById(watermark.getId());
if (loadedWatermark.isPresent()) { if (loadedWatermark.isPresent()) {
validateDossierTemplateId(watermark.getDossierTemplateId(), loadedWatermark.get().getDossierTemplateId()); validateDossierTemplateId(watermark.getDossierTemplateId(), loadedWatermark.get().getDossierTemplateId());
validateWatermarkNameIsUnique(watermark.getName(), loadedWatermark.get().getDossierTemplateId(), loadedWatermark.get().getId()); validateWatermarkNameIsUnique(watermark.getName(), loadedWatermark.get().getDossierTemplateId(), loadedWatermark.get().getId());
validateHexColorAndSetDefaultIfNeeded(watermark);
validateOpacityAndSetDefaultIfNeeded(watermark);
BeanUtils.copyProperties(watermark, loadedWatermark.get(), "dossierTemplateId", "createdBy", "dateAdded", "dateModified"); BeanUtils.copyProperties(watermark, loadedWatermark.get(), "dossierTemplateId", "createdBy", "dateAdded", "dateModified");
loadedWatermark.get().setDateModified(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); loadedWatermark.get().setDateModified(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(loadedWatermark.get().getDossierTemplateId()); var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(loadedWatermark.get().getDossierTemplateId());
@ -72,8 +72,6 @@ public class WatermarkService {
} else { // if not found by id -> add it as a new watermark } else { // if not found by id -> add it as a new watermark
validateDossierTemplateId(watermark.getDossierTemplateId(), null); validateDossierTemplateId(watermark.getDossierTemplateId(), null);
validateWatermarkNameIsUnique(watermark.getName(), watermark.getDossierTemplateId(), 0); validateWatermarkNameIsUnique(watermark.getName(), watermark.getDossierTemplateId(), 0);
validateHexColorAndSetDefaultIfNeeded(watermark);
validateOpacityAndSetDefaultIfNeeded(watermark);
WatermarkEntity watermarkEntity = new WatermarkEntity(); WatermarkEntity watermarkEntity = new WatermarkEntity();
BeanUtils.copyProperties(watermark, watermarkEntity, "id", "dateAdded", "dateModified"); BeanUtils.copyProperties(watermark, watermarkEntity, "id", "dateAdded", "dateModified");
watermarkEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); watermarkEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
@ -84,8 +82,6 @@ public class WatermarkService {
} else { } else {
validateDossierTemplateId(watermark.getDossierTemplateId(), null); validateDossierTemplateId(watermark.getDossierTemplateId(), null);
validateWatermarkNameIsUnique(watermark.getName(), watermark.getDossierTemplateId(), 0); validateWatermarkNameIsUnique(watermark.getName(), watermark.getDossierTemplateId(), 0);
validateHexColorAndSetDefaultIfNeeded(watermark);
validateOpacityAndSetDefaultIfNeeded(watermark);
WatermarkEntity watermarkEntity = new WatermarkEntity(); WatermarkEntity watermarkEntity = new WatermarkEntity();
BeanUtils.copyProperties(watermark, watermarkEntity, "id", "dateAdded", "dateModified"); BeanUtils.copyProperties(watermark, watermarkEntity, "id", "dateAdded", "dateModified");
watermarkEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); watermarkEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
@ -110,7 +106,7 @@ public class WatermarkService {
ColorUtils.validateColor(watermark.getHexColor()); ColorUtils.validateColor(watermark.getHexColor());
} }
private void validateWatermark(WatermarkModel watermark) { private void validateWatermarkNameIsPresent(WatermarkModel watermark) {
if (StringUtils.isBlank(watermark.getName())) { if (StringUtils.isBlank(watermark.getName())) {
throw new BadRequestException("The watermark name must not be empty"); throw new BadRequestException("The watermark name must not be empty");