Skip to content

Commit 3879221

Browse files
author
Benaissa BENARBIA
committed
Story #15622: originating agencies reassignment including object groups
1 parent 1f1b12f commit 3879221

File tree

5 files changed

+188
-140
lines changed

5 files changed

+188
-140
lines changed

api/api-archive-search/archive-search/src/main/java/fr/gouv/vitamui/archives/search/server/service/ArchiveSearchService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ public String reassignOriginatingAgency(ReassignRequestDto reassignRequestDto) t
548548
vitamContext,
549549
reassignmentDsl,
550550
reassignRequestDto.getSourceOriginatingAgency(),
551-
reassignRequestDto.getTargetOriginatingAgency()
551+
reassignRequestDto.getTargetOriginatingAgency(),
552+
reassignRequestDto.isPropagateToObjectGroups()
552553
);
553554
return jsonNodeRequestResponse.toJsonNode().findValue(OPERATION_IDENTIFIER).textValue();
554555
}

api/api-archive-search/archive-search/src/test/java/fr/gouv/vitamui/archives/search/server/service/ArchiveSearchServiceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
import static org.assertj.core.api.Assertions.assertThatCode;
7878
import static org.assertj.core.api.Assertions.assertThatThrownBy;
7979
import static org.mockito.ArgumentMatchers.any;
80+
import static org.mockito.ArgumentMatchers.anyBoolean;
8081
import static org.mockito.ArgumentMatchers.anyString;
8182
import static org.mockito.ArgumentMatchers.eq;
8283
import static org.mockito.Mockito.doReturn;
@@ -477,7 +478,7 @@ void findObjectsByPersistentIdentifier_whith_client_error_should_throw() throws
477478
@Test
478479
void shouldReturnOperationIdWhenReassignmentIsSuccessful() throws Exception {
479480
// Given
480-
when(unitCommonService.reassignment(any(), any(), anyString(), anyString())).thenReturn(
481+
when(unitCommonService.reassignment(any(), any(), anyString(), anyString(), anyBoolean())).thenReturn(
481482
responseFromFile(REASSIGN_UNITS_RESPONSE)
482483
);
483484

commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/access/UnitCommonService.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,18 @@ public RequestResponse<JsonNode> reclassification(final VitamContext vitamContex
393393
public RequestResponse<JsonNode> reassignment(
394394
final VitamContext vitamContext,
395395
final JsonNode dslQuery,
396-
final String source,
397-
final String target
396+
final String sourceOriginatingAgency,
397+
final String targetOriginatingAgency,
398+
final boolean propagateToObjectGroups
398399
) throws VitamClientException {
399400
OriginatingAgencyReassignmentRequest originatingAgencyReassignmentRequest =
400-
new OriginatingAgencyReassignmentRequest();
401-
originatingAgencyReassignmentRequest.setSourceOriginatingAgency(source);
402-
originatingAgencyReassignmentRequest.setTargetOriginatingAgency(target);
403-
originatingAgencyReassignmentRequest.setDslRequest(dslQuery);
401+
new OriginatingAgencyReassignmentRequest(
402+
dslQuery,
403+
sourceOriginatingAgency,
404+
targetOriginatingAgency,
405+
propagateToObjectGroups
406+
);
407+
404408
final RequestResponse<JsonNode> jsonResponse = accessExternalClient.launchOriginatingAgencyReassignment(
405409
vitamContext,
406410
originatingAgencyReassignmentRequest

0 commit comments

Comments
 (0)