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

Merge branch 'mergeErrorHotfix' into 'master'

Browse Source 
hotfix: fix merge errors

See merge request redactmanager/persistence-service!800
This commit is contained in:
Kilian Schüttler 2024-10-25 12:52:46 +02:00
commit ca75ee9607
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4051,7 +4051,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.section("section")
.value("Luke Skywalker")
.build());
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests, true);
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests);
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
assertEquals(allManualRedactions.getRecategorizations().size(), 1);
@ -4080,7 +4080,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
assertNotNull(recats.get(0).getSoftDeletedTime());
// Step 4: Do the same recategorizations again
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests, true);
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), recategorizationRequests);
allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
recats = recategorizationPersistenceService.findEntriesByFileIdAndOptions(file.getId(),