Skip to content

Commit 85f4e29

Browse files
author
Benaissa BENARBIA
committed
Story #15622: originating agency reassignment for object groups
1 parent d719a16 commit 85f4e29

File tree

4 files changed

+52
-27
lines changed

4 files changed

+52
-27
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

‎ui/ui-frontend/projects/vitamui-library/src/assets/shared-i18n/en.json‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3693,25 +3693,30 @@
36933693
"ORIGINATING_AGENCY_REASSIGNMENT_CHECK_DISTRIBUTION_THRESHOLD.KO": "Originating agency reassignment distribution thresholds check failed",
36943694
"ORIGINATING_AGENCY_REASSIGNMENT_CHECK_DISTRIBUTION_THRESHOLD.FATAL": "Technical error during originating agency reassignment distribution thresholds check",
36953695
"ORIGINATING_AGENCY_REASSIGNMENT_CHECK_DISTRIBUTION_THRESHOLD.WARNING": "Warning during originating agency reassignment distribution thresholds check",
3696-
"ORIGINATING_AGENCY_REASSIGNMENT_PREPARATION": "Originating agency reassignment preparation process",
3697-
"ORIGINATING_AGENCY_REASSIGNMENT_PREPARATION.OK": "Originating agency reassignment preparation process succeeded",
3698-
"ORIGINATING_AGENCY_REASSIGNMENT_PREPARATION.KO": "Originating agency reassignment preparation process failed",
3699-
"ORIGINATING_AGENCY_REASSIGNMENT_PREPARATION.FATAL": "Technical error during originating agency reassignment preparation process",
3700-
"ORIGINATING_AGENCY_REASSIGNMENT_PREPARATION.WARNING": "Warning during originating agency reassignment preparation process",
3701-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE": "Archive units originating agency reassignment process",
3702-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.STARTED": "Archive units originating agency reassignment process started",
3703-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.STARTED.OK": "Archive units originating agency reassignment process start succeeded",
3704-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.OK": "Archive units originating agency reassignment process succeeded",
3705-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.KO": "Archive units originating agency reassignment process failed",
3706-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.WARNING": "Warning during archive units originating agency reassignment process",
3707-
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.FATAL": "Technical error during archive units originating agency reassignment process",
3708-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE": "Archive units originating agency reassignment process",
3709-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.STARTED": "Archive units originating agency reassignment process started",
3710-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.STARTED.OK": "Archive units originating agency reassignment process start succeeded",
3711-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.OK": "Archive units originating agency reassignment process succeeded",
3712-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.KO": "Archive units originating agency reassignment process failed",
3713-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.WARNING": "Warning during archive units originating agency reassignment process",
3714-
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_UPDATE.FATAL": "Technical error during archive units originating agency reassignment process",
3696+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_PREPARATION": "Originating agency units reassignment preparation process",
3697+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_PREPARATION.OK": "Originating agency units reassignment preparation process succeeded",
3698+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_PREPARATION.KO": "Originating agency units reassignment preparation process failed",
3699+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_PREPARATION.FATAL": "Technical error during originating agency units reassignment preparation process",
3700+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_PREPARATION.WARNING": "Warning during originating agency reassignment units preparation process",
3701+
"ORIGINATING_AGENCY_REASSIGNMENT_OBJECT_GROUP_PREPARATION": "Originating agency reassignment object groups preparation process",
3702+
"ORIGINATING_AGENCY_REASSIGNMENT_OBJECT_GROUP_PREPARATION.OK": "Originating agency reassignment object groups preparation process succeeded",
3703+
"ORIGINATING_AGENCY_REASSIGNMENT_OBJECT_GROUP_PREPARATION.KO": "Originating agency reassignment object groups preparation process failed",
3704+
"ORIGINATING_AGENCY_REASSIGNMENT_OBJECT_GROUP_PREPARATION.FATAL": "Technical error during originating agency reassignment object groups preparation process",
3705+
"ORIGINATING_AGENCY_REASSIGNMENT_OBJECT_GROUP_PREPARATION.WARNING": "Warning during originating agency reassignment object groups preparation process",
3706+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE": "Archive units originating agency reassignment process",
3707+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.STARTED": "Archive units originating agency reassignment process started",
3708+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.STARTED.OK": "Archive units originating agency reassignment process start succeeded",
3709+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.OK": "Archive units originating agency reassignment process succeeded",
3710+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.KO": "Archive units originating agency reassignment process failed",
3711+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.WARNING": "Warning during archive units originating agency reassignment process",
3712+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.FATAL": "Technical error during archive units originating agency reassignment process",
3713+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE": "Archive units originating agency reassignment process",
3714+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.STARTED": "Archive units originating agency reassignment process started",
3715+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.STARTED.OK": "Archive units originating agency reassignment process start succeeded",
3716+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.OK": "Archive units originating agency reassignment process succeeded",
3717+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.KO": "Archive units originating agency reassignment process failed",
3718+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.WARNING": "Warning during archive units originating agency reassignment process",
3719+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_AGENCIES_UPDATE.FATAL": "Technical error during archive units originating agency reassignment process",
37153720
"STP_ORIGINATION_AGENCY_REASSIGNMENT_FINALIZATION": "Archive units originating agencies reassignment finalization process",
37163721
"STP_ORIGINATION_AGENCY_REASSIGNMENT_FINALIZATION.STARTED": "Archive units originating agencies reassignment finalization process started",
37173722
"STP_ORIGINATION_AGENCY_REASSIGNMENT_FINALIZATION.STARTED.OK": "Archive units originating agencies reassignment finalization process start succeeded",
@@ -3733,13 +3738,27 @@
37333738
"LFC.ORIGINATION_AGENCY_REASSIGNMENT_AGENCIES_UPDATE.KO": "Inherited archive units originating agencies reassignment process failed",
37343739
"LFC.ORIGINATION_AGENCY_REASSIGNMENT_AGENCIES_UPDATE.WARNING": "Warning during inherited archive units originating agencies reassignment process",
37353740
"LFC.ORIGINATION_AGENCY_REASSIGNMENT_AGENCIES_UPDATE.FATAL": "Technical error during inherited archive units originating agencies reassignment process",
3741+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION": "Inherited archive units originating agencies reassignment preparation process",
3742+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.STARTED": "Inherited archive units originating agencies reassignment preparation process started",
3743+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.STARTED.OK": "Inherited archive units originating agencies reassignment preparation process start succeeded",
3744+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.OK": "Inherited archive units originating agencies reassignment preparation process succeeded",
3745+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.KO": "Inherited archive units originating agencies reassignment preparation process failed",
3746+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.WARNING": "Warning during inherited archive units originating agencies reassignment preparation process",
3747+
"STP_ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.FATAL": "Technical error during inherited archive units originating agencies reassignment preparation process",
37363748
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION": "Inherited archive units originating agencies reassignment preparation process",
37373749
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.STARTED": "Inherited archive units originating agencies reassignment preparation process started",
37383750
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.STARTED.OK": "Inherited archive units originating agencies reassignment preparation process start succeeded",
37393751
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.OK": "Inherited archive units originating agencies reassignment preparation process succeeded",
37403752
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.KO": "Inherited archive units originating agencies reassignment preparation process failed",
37413753
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.WARNING": "Warning during inherited archive units originating agencies reassignment preparation process",
37423754
"STP_ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.FATAL": "Technical error during inherited archive units originating agencies reassignment preparation process",
3755+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION": "Archive units originating agency reassignment preparation process",
3756+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.STARTED": "Archive units originating agency reassignment preparation process started",
3757+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.STARTED.OK": "Archive units originating agency reassignment preparation process start succeeded",
3758+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.OK": "Archive units originating agency reassignment preparation process succeeded",
3759+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.KO": "Archive units originating agency reassignment preparation process failed",
3760+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.WARNING": "Warning during archive units originating agency reassignment preparation process",
3761+
"ORIGINATING_AGENCY_REASSIGNMENT_UNITS_CHILDREN_PREPARATION.FATAL": "Technical error during archive units originating agency reassignment preparation process",
37433762
"ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION": "Archive units originating agency reassignment preparation process",
37443763
"ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.STARTED": "Archive units originating agency reassignment preparation process started",
37453764
"ORIGINATING_AGENCY_REASSIGNMENT_CHILDREN_UNITS_UPDATE_PREPARATION.STARTED.OK": "Archive units originating agency reassignment preparation process start succeeded",

0 commit comments

Comments
 (0)