Merge pull request #3435 from ProgrammeVitam/Story_15526

Salimdev · web-flow · commit 04e43cbd3218 · 2026-01-05T15:32:29.000+01:00
Story #15526 - [Collect] Adding archives via SIP and ZIP in a transaction.
diff --git a/api/api-collect/collect/src/main/java/fr/gouv/vitamui/collect/server/rest/ProjectController.java b/api/api-collect/collect/src/main/java/fr/gouv/vitamui/collect/server/rest/ProjectController.java
@@ -26,7 +26,9 @@
  */
 package fr.gouv.vitamui.collect.server.rest;
 
+import fr.gouv.vitam.collect.common.dto.UploadSipResult;
 import fr.gouv.vitam.common.exception.VitamClientException;
+import fr.gouv.vitam.common.model.RequestResponseOK;
 import fr.gouv.vitamui.collect.common.dto.CollectProjectAttachmentsDto;
 import fr.gouv.vitamui.collect.common.dto.CollectProjectConfigurationDto;
 import fr.gouv.vitamui.collect.common.dto.CollectProjectContextDto;
@@ -208,18 +210,23 @@ public void streamingUpload(
     @Secured(ServicesData.ROLE_CREATE_PROJECTS)
     @Operation(summary = "Upload and stream SIP")
     @PostMapping(value = "/uploadSip", consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-    public void streamingUploadSip(
+    public String streamingUploadSip(
         InputStream inputStream,
         @RequestHeader(value = CommonConstants.X_TRANSACTION_ID_HEADER) final String transactionId
-    ) throws PreconditionFailedException {
+    ) throws PreconditionFailedException, VitamClientException {
         ParameterChecker.checkParameter("The transaction ID is a mandatory parameter: ", transactionId);
         SanityChecker.checkSecureParameter(transactionId);
         LOGGER.debug("[External] upload SIP");
-        projectService.streamingUploadSip(
+        var requestResponse = projectService.streamingUploadSip(
             inputStream,
             transactionId,
             externalParametersService.buildVitamContextFromExternalParam()
         );
+        if (!requestResponse.isOk()) {
+            throw new VitamClientException("Error occurs when uploading SIP to: " + transactionId);
+        }
+        var response = (UploadSipResult) ((RequestResponseOK<?>) requestResponse).getFirstResult();
+        return response.requestId();
     }
 
     @Secured(ServicesData.ROLE_UPDATE_PROJECTS_DESCRIPTION)
diff --git a/api/api-collect/collect/src/main/java/fr/gouv/vitamui/collect/server/service/ProjectService.java b/api/api-collect/collect/src/main/java/fr/gouv/vitamui/collect/server/service/ProjectService.java
@@ -36,6 +36,7 @@
 import fr.gouv.vitam.collect.common.dto.CriteriaProjectDto;
 import fr.gouv.vitam.collect.common.dto.ProjectDto;
 import fr.gouv.vitam.collect.common.dto.TransactionDto;
+import fr.gouv.vitam.collect.common.dto.UploadSipResult;
 import fr.gouv.vitam.collect.external.external.exception.CollectExternalClientInvalidRequestException;
 import fr.gouv.vitam.common.client.VitamContext;
 import fr.gouv.vitam.common.exception.InvalidParseOperationException;
@@ -234,10 +235,14 @@ public void streamingUpload(
         }
     }
 
-    public void streamingUploadSip(InputStream inputStream, String transactionId, VitamContext vitamContext) {
+    public RequestResponse<UploadSipResult> streamingUploadSip(
+        InputStream inputStream,
+        String transactionId,
+        VitamContext vitamContext
+    ) {
         LOGGER.debug("TransactionId: {}", transactionId);
         try {
-            collectService.uploadSipToTransaction(vitamContext, transactionId, inputStream);
+            return collectService.uploadSipToTransaction(vitamContext, transactionId, inputStream);
         } catch (VitamClientException e) {
             LOGGER.debug(UNABLE_TO_UPLOAD_SIP_TO_TRANSACTION, e);
             throw new BadRequestException(UNABLE_TO_UPLOAD_SIP_TO_TRANSACTION, e);
diff --git a/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/collect/CollectService.java b/commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/collect/CollectService.java
@@ -33,6 +33,7 @@
 import fr.gouv.vitam.collect.common.dto.CriteriaProjectDto;
 import fr.gouv.vitam.collect.common.dto.ProjectDto;
 import fr.gouv.vitam.collect.common.dto.TransactionDto;
+import fr.gouv.vitam.collect.common.dto.UploadSipResult;
 import fr.gouv.vitam.collect.external.client.CollectExternalClient;
 import fr.gouv.vitam.collect.external.external.exception.CollectExternalClientException;
 import fr.gouv.vitam.common.CharsetUtils;
@@ -263,7 +264,7 @@ public RequestResponse uploadProjectZip(
      * @return
      * @throws VitamClientException
      */
-    public RequestResponse uploadSipToTransaction(
+    public RequestResponse<UploadSipResult> uploadSipToTransaction(
         final VitamContext vitamContext,
         final String transactionId,
         final InputStream inputStream
diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.html b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.html
@@ -17,13 +17,37 @@
           <mat-spinner class="vitamui-spinner large"></mat-spinner>
         </div>
       } @else {
-        <vitamui-file-selector
-          [directoryMode]="true"
-          [maxSizeInBytes]="uploadMaxSizeInBytes"
-          [multiple]="true"
-          [formControl]="filesToUploadControl"
-        >
-        </vitamui-file-selector>
+        <div class="main-content">
+          <div class="gap-6">
+            <vitamui-select
+              class="w-100"
+              [placeholder]="'COLLECT.MODAL.IMPORT_TYPE_PLACEHOLDER' | translate"
+              [formControl]="importTypeControl"
+              [options]="[
+                { key: 'DIRECTORIES_FILES', label: 'COLLECT.MODAL.IMPORT_TYPE_DIRECTORIES_FILES_V0' | translate },
+                { key: 'COMPRESSED', label: 'COLLECT.MODAL.IMPORT_TYPE_COMPRESSED' | translate },
+                { key: 'SIP', label: 'COLLECT.MODAL.IMPORT_SIP_ARCHIVES_PACKAGE' | translate },
+              ]"
+              [enableSearch]="false"
+              (change)="resetFilesToImportList()"
+              required
+            >
+            </vitamui-select>
+            @if (importType === ImportType.DIRECTORIES_FILES) {
+              <vitamui-file-selector
+                class="w-100"
+                [directoryMode]="true"
+                [maxSizeInBytes]="uploadMaxSizeInBytes"
+                [multiple]="true"
+                [formControl]="filesToUploadControl"
+              >
+              </vitamui-file-selector>
+            }
+            @if (importType === ImportType.COMPRESSED || importType === ImportType.SIP) {
+              <vitamui-file-selector class="w-100" [extensions]="['.zip']" [formControl]="filesToUploadControl"> </vitamui-file-selector>
+            }
+          </div>
+        </div>
       }
     </mat-dialog-content>
 
@@ -40,9 +64,13 @@
     <mat-dialog-content>
       <div class="main-content">
         <div class="form-group">
-          @if (projectUnits) {
+          @if (projectUnits && importType === ImportType.DIRECTORIES_FILES) {
             <vitamui-library-filing-plan [mode]="FilingPlanMode.SOLO" [formControl]="linkParentIdControl" [dataSource]="projectUnits">
             </vitamui-library-filing-plan>
+          } @else if (importType === ImportType.COMPRESSED || importType === ImportType.SIP) {
+            <span class="text meduim">
+              {{ 'COLLECT.MODAL.ARCHIVE_POSITION_MSG_FOR_SIP' | translate }}
+            </span>
           }
         </div>
       </div>
diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.spec.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.spec.ts
@@ -46,6 +46,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { DecimalPipe } from '@angular/common';
 import { ArchiveCollectService } from '../archive-collect.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { ActivatedRoute } from '@angular/router';
 
 const translations: any = { TEST: 'Mock translate test' };
 
@@ -86,6 +87,15 @@ describe('AddUnitsComponent', () => {
         totalResults: 0,
       }),
   };
+
+  const activatedRouteMock = {
+    snapshot: {
+      params: {
+        tenantIdentifier: '15',
+      },
+    },
+  };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [AddUnitsComponent],
@@ -104,6 +114,7 @@ describe('AddUnitsComponent', () => {
         { provide: MAT_DIALOG_DATA, useValue: { tenantIdentifier: '15', selectedTransaction } },
         { provide: WINDOW_LOCATION, useValue: window.location },
         { provide: ArchiveCollectService, useValue: archiveCollectServiceMock },
+        { provide: ActivatedRoute, useValue: activatedRouteMock },
         DecimalPipe,
         BytesPipe,
         provideHttpClient(withInterceptorsFromDi()),
diff --git a/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/archive-search-collect/add-units/add-units.component.ts
@@ -37,7 +37,7 @@
 
 import { Component, Inject, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { finalize, from, Observable, switchMap } from 'rxjs';
+import { finalize, from, Observable, of, switchMap } from 'rxjs';
 import {
   CriteriaDataType,
   CriteriaOperator,
@@ -50,11 +50,20 @@ import {
   Unit,
   ZipFile,
   ZipFileStatus,
+  ApplicationId,
+  SnackBarService,
 } from 'vitamui-library';
 import { ArchiveCollectService } from '../archive-collect.service';
 import { FormControl, Validators } from '@angular/forms';
 import { last, tap } from 'rxjs/operators';
 import { HttpEventType } from '@angular/common/http';
+import { ActivatedRoute } from '@angular/router';
+
+export enum ImportType {
+  DIRECTORIES_FILES = 'DIRECTORIES_FILES',
+  COMPRESSED = 'COMPRESSED',
+  SIP = 'SIP',
+}
 
 @Component({
   selector: 'app-add-units',
@@ -66,9 +75,11 @@ export class AddUnitsComponent implements OnInit {
   protected readonly FilingPlanMode = FilingPlanMode;
   protected readonly uploadMaxSizeInBytes = Math.pow(1024, 3); // 1 Gb
 
+  uploadedOperationId: string;
   isLoading = false;
   stepIndex = 0;
 
+  importTypeControl: FormControl<string | null> = new FormControl(null);
   filesToUploadControl: FormControl<File[]> = new FormControl([], [Validators.required]);
   zipFileStatus$: Observable<ZipFileStatus>;
   linkParentIdControl = new FormControl({ included: [], excluded: [] });
@@ -82,6 +93,8 @@ export class AddUnitsComponent implements OnInit {
     public data: {
       transaction: Transaction;
     },
+    private route: ActivatedRoute,
+    private snackBarService: SnackBarService,
     private dialog: MatDialog,
     private addUnitsDialogRef: MatDialogRef<AddUnitsComponent>,
     private archiveCollectService: ArchiveCollectService,
@@ -128,6 +141,9 @@ export class AddUnitsComponent implements OnInit {
   }
 
   close(filesUploaded: boolean) {
+    if (filesUploaded && this.importType === ImportType.SIP && this.uploadedOperationId) {
+      this.handleUploadSIPSuccess(this.uploadedOperationId);
+    }
     this.confirmCancelDialog?.close(true);
     this.addUnitsDialogRef.close(filesUploaded);
   }
@@ -137,13 +153,33 @@ export class AddUnitsComponent implements OnInit {
     this.stepIndex++;
     const zipFile = new ZipFile(this.data.transaction.id);
     this.zipFileStatus$ = zipFile.zipFileStatus$;
-    from(zipFile.addFiles(this.filesToUploadControl.value).generateZip())
+
+    // For COMPRESSED and SIP types, use the file directly without zipping it
+    let compressedZip: Blob;
+    if ([ImportType.COMPRESSED, ImportType.SIP].includes(this.importType as ImportType)) {
+      compressedZip = new Blob(this.filesToUploadControl.value, { type: 'application/zip' });
+      zipFile.zipFileStatus.size = compressedZip.size;
+      zipFile.zipFileStatus.currentFileUploadedSize = 100;
+    }
+
+    from(
+      this.importType === ImportType.DIRECTORIES_FILES
+        ? zipFile.addFiles(this.filesToUploadControl.value).generateZip()
+        : of(compressedZip).toPromise(),
+    )
       .pipe(
         switchMap((content) =>
-          this.archiveCollectService.uploadZip(content, this.data.transaction.id, this.linkParentIdControl.value.included[0]),
+          this.importType === ImportType.SIP
+            ? this.archiveCollectService.uploadSip(content, this.data.transaction.id)
+            : this.archiveCollectService.uploadZip(content, this.data.transaction.id, this.linkParentIdControl.value.included[0]),
         ),
         tap((httpEvent) => zipFile.updateUploadingZipFileStatus(httpEvent)),
         last((httpEvent) => httpEvent.type === HttpEventType.Response),
+        tap((httpEvent) => {
+          if (this.importType === ImportType.SIP && httpEvent.type === HttpEventType.Response) {
+            this.uploadedOperationId = httpEvent.body;
+          }
+        }),
         finalize(() => (this.isLoading = false)),
       )
       .subscribe({
@@ -152,4 +188,29 @@ export class AddUnitsComponent implements OnInit {
         },
       });
   }
+
+  resetFilesToImportList() {
+    this.filesToUploadControl.setValue([]);
+  }
+
+  private handleUploadSIPSuccess(operationId: string): void {
+    const tenantId = this.route.snapshot.params.tenantIdentifier;
+    this.snackBarService.open({
+      message: 'COLLECT.MODAL.IMPORT_SIP_ARCHIVES_PACKAGE_WITH_SUCCESS',
+      buttons: [
+        {
+          appId: ApplicationId.LOGBOOK_OPERATION_APP,
+          path: `/tenant/${tenantId}?guid=${operationId}`,
+          label: 'SNACK_BAR.TO_OPERATION_APP',
+        },
+      ],
+      duration: 100_000,
+    });
+  }
+
+  get importType(): string | null {
+    return this.importTypeControl.value;
+  }
+
+  protected ImportType = ImportType;
 }
diff --git a/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts b/ui/ui-frontend/projects/collect/src/app/collect/projects/create-project/create-project.component.ts
@@ -564,7 +564,7 @@ export class CreateProjectComponent implements OnInit, AfterViewChecked {
   }
 
   resetFilesToImportList() {
-    this.filesToUploadControl.reset();
+    this.filesToUploadControl.setValue([]);
   }
 
   private setDefaultArchivingSystemValue() {
diff --git a/ui/ui-frontend/projects/collect/src/assets/i18n/en.json b/ui/ui-frontend/projects/collect/src/assets/i18n/en.json
@@ -124,13 +124,16 @@
       "PROJECT_CREATION_ERROR": "Error while creating attachment project",
       "UPLOAD_SUB_TITLE": "Loading data to be poured",
       "ARCHIVE_POSITION_SUB_TITLE": "Define fixed attachment position",
+      "ARCHIVE_POSITION_MSG_FOR_SIP": "For this import, reclassification within the transfer hierarchy will have to be carried out at a later stage, directly via the “Reclassify archival units” button.",
       "AUTO_INGEST": "Automatic transaction management:",
       "AUTO_INGEST_TRUE": "Yes",
       "AUTO_INGEST_FALSE": "No",
       "IMPORT_TYPE_PLACEHOLDER": "Select import type",
+      "IMPORT_TYPE_DIRECTORIES_FILES_V0": "Directories and files import",
       "IMPORT_TYPE_DIRECTORIES_FILES": "Directories and files import (attached or not with metadata file)",
       "IMPORT_TYPE_COMPRESSED": "Compressed directory import (.zip)",
       "IMPORT_SIP_ARCHIVES_PACKAGE": "SIP archives package import (bêta)",
+      "IMPORT_SIP_ARCHIVES_PACKAGE_WITH_SUCCESS": "The archive addition has been successfully launched",
       "DRAG_AND_DROP": "Drag and drop",
       "OR": "or",
       "BROWSE": "browse",
diff --git a/ui/ui-frontend/projects/collect/src/assets/i18n/fr.json b/ui/ui-frontend/projects/collect/src/assets/i18n/fr.json
@@ -124,13 +124,16 @@
       "PROJECT_CREATION_ERROR": "Erreur lors de la création du projet de versement",
       "UPLOAD_SUB_TITLE": "Chargement des données à verser",
       "ARCHIVE_POSITION_SUB_TITLE": "Définir la position fixe de rattachement",
+      "ARCHIVE_POSITION_MSG_FOR_SIP": "Pour cet import, le reclassement au sein de l'arborescence du versement devra être réalisé dans un second temps, directement via le bouton \"Reclasser des unités archivistiques\".",
       "AUTO_INGEST": "Gestion automatique des transactions :",
       "AUTO_INGEST_TRUE": "Oui",
       "AUTO_INGEST_FALSE": "Non",
       "IMPORT_TYPE_PLACEHOLDER": "Sélectionner le type d'import",
+      "IMPORT_TYPE_DIRECTORIES_FILES_V0": "Import de dossiers et fichiers",
       "IMPORT_TYPE_DIRECTORIES_FILES": "Import de dossiers et fichiers (accompagné ou non d'un fichier metadata)",
       "IMPORT_TYPE_COMPRESSED": "Import d'un dossier compressé (.zip)",
-      "IMPORT_SIP_ARCHIVES_PACKAGE": "Importer le paquet d'archives d'un SIP (bêta)",
+      "IMPORT_SIP_ARCHIVES_PACKAGE": "Import du paquet d'archives d'un SIP (bêta)",
+      "IMPORT_SIP_ARCHIVES_PACKAGE_WITH_SUCCESS": "L'ajout d'archives a bien été lancé",
       "DRAG_AND_DROP": "Glisser-déposer",
       "OR": "ou",
       "BROWSE": "parcourir",

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ export class CreateProjectComponent implements OnInit, AfterViewChecked {`
`564`	`564`	`}`
`565`	`565`
`566`	`566`	`resetFilesToImportList() {`
`567`		`- this.filesToUploadControl.reset();`
	`567`	`+ this.filesToUploadControl.setValue([]);`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`private setDefaultArchivingSystemValue() {`