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

Merge branch 'RED-7185' into 'master'

Browse Source 
RED-7185 - RM-46 - Error message when adjusting the Justification

Closes RED-7185

See merge request redactmanager/persistence-service!123
This commit is contained in:
Andrei Isvoran 2023-09-15 09:35:57 +02:00
commit 80d707a374
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/LegalBasisChangePersistenceService.java
View File

@ -5,12 +5,14 @@ import java.time.temporal.ChronoUnit;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualLegalBasisChangeEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.LegalBasisChangeRepository;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
@ -24,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
public class LegalBasisChangePersistenceService {
private final int SECTION_MAX_LENGTH = 1024;
private final LegalBasisChangeRepository legalBasisChangeRepository;
@ -31,6 +34,7 @@ public class LegalBasisChangePersistenceService {
ManualLegalBasisChangeEntity manualLegalBasisChange = new ManualLegalBasisChangeEntity();
manualLegalBasisChange.setId(new AnnotationEntityId(legalBasisChangeRequest.getAnnotationId(), fileId));
checkSection(legalBasisChangeRequest.getSection());
BeanUtils.copyProperties(legalBasisChangeRequest, manualLegalBasisChange);
manualLegalBasisChange.setRequestDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
@ -42,6 +46,13 @@ public class LegalBasisChangePersistenceService {
}
private void checkSection(String section) {
if (!StringUtils.isEmpty(section) && section.length() > SECTION_MAX_LENGTH) {
throw new BadRequestException(String.format("The section is too long (%s), max length %s", section.length(), SECTION_MAX_LENGTH));
}
}
@Transactional
public void hardDelete(String fileId, String annotationId) {

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

@ -162,4 +162,6 @@ databaseChangeLog:
- include:
file: db/changelog/tenant/110-add-rules-file-type.yaml
- include:
file: db/changelog/tenant/111-make-rule-values-non-nullable.yaml
file: db/changelog/tenant/111-make-rule-values-non-nullable.yaml
- include:
file: db/changelog/tenant/112-modify-section-length.yaml

9
persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/112-modify-section-length.yaml Normal file
View File

@ -0,0 +1,9 @@
databaseChangeLog:
- changeSet:
id: modify-section-length
author: aisvoran
changes:
- modifyDataType:
columnName: section
newDataType: VARCHAR(1024)
tableName: manual_legal_basis_change