RED-5784 - As the admin I want to configure the applied redaction color
- add new color to the colors list (applied redaction color) - send the color to the message queue for download package
This commit is contained in:
parent
08f4c51eab
commit
51db508448
@ -29,4 +29,6 @@ public class Colors {
|
|||||||
private String ignoredHintColor;
|
private String ignoredHintColor;
|
||||||
private String skippedColor;
|
private String skippedColor;
|
||||||
|
|
||||||
|
private String appliedRedactionColor;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,5 +44,7 @@ public class ColorsEntity {
|
|||||||
private String ignoredHintColor;
|
private String ignoredHintColor;
|
||||||
@Column
|
@Column
|
||||||
private String skippedColor;
|
private String skippedColor;
|
||||||
|
@Column
|
||||||
|
private String appliedRedactionColor;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,6 +39,7 @@ public class ColorsService {
|
|||||||
entity.setRedactionColor(defaultColor);
|
entity.setRedactionColor(defaultColor);
|
||||||
entity.setIgnoredHintColor(defaultColor);
|
entity.setIgnoredHintColor(defaultColor);
|
||||||
entity.setSkippedColor(defaultColor);
|
entity.setSkippedColor(defaultColor);
|
||||||
|
entity.setAppliedRedactionColor("#000000");
|
||||||
return colorsRepository.save(entity);
|
return colorsRepository.save(entity);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,6 +83,7 @@ public class DownloadPreparationService {
|
|||||||
} else {
|
} else {
|
||||||
previewColor = storedPreviewColor;
|
previewColor = storedPreviewColor;
|
||||||
}
|
}
|
||||||
|
String appliedRedactionColor = colorsService.getColors(dossier.getDossierTemplateId()).getAppliedRedactionColor();
|
||||||
|
|
||||||
RedactionMessage message = RedactionMessage.builder()
|
RedactionMessage message = RedactionMessage.builder()
|
||||||
.dossierId(dossier.getId())
|
.dossierId(dossier.getId())
|
||||||
@ -95,6 +96,7 @@ public class DownloadPreparationService {
|
|||||||
.map(FileEntity::getId)
|
.map(FileEntity::getId)
|
||||||
.collect(Collectors.toSet()))
|
.collect(Collectors.toSet()))
|
||||||
.redactionPreviewColor(previewColor)
|
.redactionPreviewColor(previewColor)
|
||||||
|
.appliedRedactionColor(appliedRedactionColor)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
log.info("Sending redaction request for downloadId:{} to pdftron-redaction-queue", message.getDownloadId());
|
log.info("Sending redaction request for downloadId:{} to pdftron-redaction-queue", message.getDownloadId());
|
||||||
|
|||||||
@ -109,3 +109,5 @@ databaseChangeLog:
|
|||||||
file: db/changelog/tenant/43-add-reports-information-column.changelog.yaml
|
file: db/changelog/tenant/43-add-reports-information-column.changelog.yaml
|
||||||
- include:
|
- include:
|
||||||
file: db/changelog/tenant/44-add-redaction-preview-color-column.changelog.yaml
|
file: db/changelog/tenant/44-add-redaction-preview-color-column.changelog.yaml
|
||||||
|
- include:
|
||||||
|
file: db/changelog/tenant/sql/43-add-applied-redaction-color.sql
|
||||||
|
|||||||
@ -0,0 +1,5 @@
|
|||||||
|
-- add new column
|
||||||
|
alter table color_configuration add column applied_redaction_color VARCHAR(255);
|
||||||
|
|
||||||
|
update color_configuration set applied_redaction_color = "#000000"; -- default is black
|
||||||
|
|
||||||
@ -108,6 +108,8 @@ public class TypeTest extends AbstractPersistenceServerServiceTest {
|
|||||||
colors.setSkippedColor("#dddddd");
|
colors.setSkippedColor("#dddddd");
|
||||||
colors.setIgnoredHintColor("#dddddd");
|
colors.setIgnoredHintColor("#dddddd");
|
||||||
|
|
||||||
|
colors.setAnalysisColor("#dddddd");
|
||||||
|
|
||||||
colors.setDossierTemplateId(dossierTemplate.getId());
|
colors.setDossierTemplateId(dossierTemplate.getId());
|
||||||
|
|
||||||
dictionaryClient.setColors(dossierTemplate.getId(), colors);
|
dictionaryClient.setColors(dossierTemplate.getId(), colors);
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<redaction-service.version>3.206.0</redaction-service.version>
|
<redaction-service.version>3.206.0</redaction-service.version>
|
||||||
<search-service.version>2.39.0</search-service.version>
|
<search-service.version>2.39.0</search-service.version>
|
||||||
<pdftron-redaction-service.version>3.150.0</pdftron-redaction-service.version>
|
<pdftron-redaction-service.version>3.157.0</pdftron-redaction-service.version>
|
||||||
<redaction-report-service.version>3.63.0</redaction-report-service.version>
|
<redaction-report-service.version>3.63.0</redaction-report-service.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user