finalize gl flow for import

apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts

@@ -2,6 +2,7 @@ import { BadRequestException, ConflictException, Injectable } from '@nestjs/comm
 import {
   ContractDocPhase,
   type ClearanceFinalInvoiceSummary,
+  type ClearanceSecondDuty,
   type ClearanceT1State,
   type ClearanceTrainState,
 } from '@edr/types';
@@ -94,6 +95,12 @@ export interface ContractClearanceView {
   offloaded?: boolean;
   /** GL Djibouti post-offload final invoice (export). */
   finalInvoice?: ClearanceFinalInvoiceSummary | null;
+  /** Customs risk level assigned by GL ET (import; visible to the customer). */
+  riskLevel?: string | null;
+  riskAssignedAt?: string | null;
+  /** Post-arrival additional duty/tax round (import). */
+  secondDuty?: ClearanceSecondDuty | null;
+  importReleaseGranted?: boolean;
 }
 
 @Injectable()
@@ -226,8 +233,9 @@ export class ContractClearanceService {
       files,
       contract.tradeDirection ?? 'IMPORT',
     );
+    let bookingFiles: Awaited<ReturnType<FilesService['findByResource']>> = [];
     if (cycle?.bookingId) {
-      const bookingFiles = await this.filesService.findByResource(
+      bookingFiles = await this.filesService.findByResource(
         cycle.bookingId,
         'bookings',
       );
@@ -269,6 +277,11 @@ export class ContractClearanceService {
       bookingMilestones.find((m) => m.milestoneCode === code);
     const gatepassMilestone = bookingMilestone('GATEPASS_GRANTED');
     const t1ClosedMilestone = bookingMilestone('T1_CLOSED');
+    const riskMilestone = bookingMilestone('RISK_ASSIGNED');
+    const secondDuty = this.glOperationsService.secondDutyState(
+      bookingMilestones,
+      bookingFiles,
+    );
 
     let nextAction = this.workflowService.computeNextAction(contract, cycle, milestones);
     if (cycle?.bookingId && contract.tradeDirection === 'EXPORT') {
@@ -332,6 +345,17 @@ export class ContractClearanceService {
           : null,
       offloaded: bookingMilestone('OFFLOADED')?.status === 'COMPLETED',
       finalInvoice,
+      riskLevel:
+        riskMilestone?.status === 'COMPLETED'
+          ? ((riskMilestone.metadata?.riskLevel as string | undefined) ?? null)
+          : null,
+      riskAssignedAt:
+        riskMilestone?.status === 'COMPLETED' && riskMilestone.triggeredAt
+          ? riskMilestone.triggeredAt.toISOString()
+          : null,
+      secondDuty,
+      importReleaseGranted:
+        bookingMilestone('IMPORT_RELEASE_GRANTED')?.status === 'COMPLETED',
     };
   }
 
@@ -1091,6 +1115,7 @@ export class ContractClearanceService {
     contractId: string,
     file: Express.Multer.File,
     userId?: string,
+    vesselDepartureDate?: string,
   ): Promise<Contract> {
     const contract = await this.contractsService.findById(contractId);
     this.assertPhasedCustoms(contract);
@@ -1111,6 +1136,11 @@ export class ContractClearanceService {
     });
 
     const cycle = await this.contractsRepository.currentCycle(contractId);
+    if (cycle && vesselDepartureDate?.trim()) {
+      await this.contractsRepository.updateCycle(cycle.id, {
+        vesselDepartureDate: vesselDepartureDate.trim(),
+      });
+    }
     if (cycle?.preClearanceFinalizedAt) {
       await this.workflowService.completeMilestone(contractId, 'DO_COLLECTED', userId);
       await this.workflowService.markReadyForBooking(contractId);