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

Merge branch 'master' into RED-6720

Browse Source
This commit is contained in:
Viktor Seifert 2023-05-05 14:49:42 +02:00
commit 6165a5eea1
8 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java
View File

@ -15,6 +15,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.HorizontalTextAlignment;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.VerticalTextAlignment;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.WatermarkOrientation;
import lombok.AllArgsConstructor;
@ -58,6 +60,12 @@ public class WatermarkEntity {
@Column
@Enumerated(EnumType.STRING)
private WatermarkOrientation orientation;
@Column
@Enumerated(EnumType.STRING)
private HorizontalTextAlignment horizontalTextAlignment;
@Column
@Enumerated(EnumType.STRING)
private VerticalTextAlignment verticalTextAlignment;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "dossier_template_id")

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

@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
import com.iqser.red.keycloak.commons.KeycloakSecurity;
import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
@ -69,7 +70,7 @@ public class AccessControlService {
var isMember = dossier.getMemberIds().contains(userId);
var isApprover = dossier.getApproverIds().contains(userId);
if (!isMember && !isApprover) {
throw new NotAllowedException("User must be dossier member or approver.");
throw new BadRequestException("User must be dossier member or approver.");
}
}

2
persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml
View File

@ -129,3 +129,5 @@ databaseChangeLog:
file: db/changelog/tenant/sql/203-acl-duplicate-cleanup.sql
- include:
file: db/changelog/tenant/sql/203-spring-acl-constraints.changelog.sql
- include:
file: db/changelog/tenant/48-add-watermark-text-alignment.yaml

14
persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/48-add-watermark-text-alignment.yaml Normal file
View File

@ -0,0 +1,14 @@
databaseChangeLog:
- changeSet:
id: add-watermark-text-alignment
author: corinaolariu
changes:
- addColumn:
columns:
- column:
name: vertical_text_alignment
type: VARCHAR(20)
- column:
name: horizontal_text_alignment
type: VARCHAR(20)
tableName: watermark_configuration

2
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java
View File

@ -548,7 +548,7 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
assertThat(actualMessage).contains(expectedMessage);
exception = Assertions.assertThrows(FeignException.Forbidden.class, () -> {
exception = Assertions.assertThrows(FeignException.BadRequest.class, () -> {
fileClient.setStatusUnderReview(dossier.getId(), file.getId(), user2);
});

6
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/WatermarkModel.java
View File

@ -2,6 +2,8 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model;
import java.time.OffsetDateTime;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.HorizontalTextAlignment;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.VerticalTextAlignment;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.WatermarkOrientation;
import io.swagger.v3.oas.annotations.media.Schema;
@ -43,5 +45,9 @@ public class WatermarkModel {
private OffsetDateTime dateAdded;
@Schema(description = "The date when this watermark was last modified. Set by System on create.")
private OffsetDateTime dateModified;
@Schema(description = "The watermark horizontal text alignment")
private HorizontalTextAlignment horizontalTextAlignment;
@Schema(description = "The watermark vertical text alignment")
private VerticalTextAlignment verticalTextAlignment;
}

7
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/HorizontalTextAlignment.java Normal file
View File

@ -0,0 +1,7 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration;
public enum HorizontalTextAlignment {
LEFT,
CENTER,
RIGHT
}

7
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/VerticalTextAlignment.java Normal file
View File

@ -0,0 +1,7 @@
package com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration;
public enum VerticalTextAlignment {
TOP,
CENTER,
BOTTOM
}