api

apps/edr-freight-api/src/modules/warehouses/dto/invoice.dto.ts

@@ -1,5 +1,5 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { IsBoolean, IsNumber, IsOptional, IsString, Min } from 'class-validator';
+import { IsBoolean, IsIn, IsNumber, IsOptional, IsString, Min } from 'class-validator';
 
 export class GenerateInvoiceDto {
   @ApiPropertyOptional({ description: 'Create even when the calculated amount is zero.' })
@@ -11,6 +11,11 @@ export class GenerateInvoiceDto {
   @IsOptional()
   @IsString()
   performedBy?: string;
+
+  @ApiPropertyOptional({ enum: ['ETB', 'USD'], description: 'Currency to bill the generated invoice in.' })
+  @IsOptional()
+  @IsIn(['ETB', 'USD'])
+  billingCurrency?: 'ETB' | 'USD';
 }
 
 export class PayInvoiceBodyDto {

apps/edr-freight-api/src/modules/warehouses/warehouse-fee.service.ts

@@ -1,4 +1,5 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
+import { ExchangeService } from '@edr/api-common';
 import { DataSource } from 'typeorm';
 
 import { CreateFeeRuleDto, UpdateFeeRuleDto } from './dto/fee-rule.dto';
@@ -28,6 +29,8 @@ export interface FeePreview {
   freeDays: number;
   ratePerDay: number;
   currency: string;
+  ruleCurrency: string | null;
+  billingCurrency: string;
   startDate: string | null;
   endDate: string;
   endIsOpen: boolean; // true when still accruing (no release/gate-clear yet)
@@ -45,6 +48,7 @@ export class WarehouseFeeService {
   constructor(
     private readonly dataSource: DataSource,
     private readonly feeRuleRepository: WarehouseFeeRuleRepository,
+    private readonly exchangeService: ExchangeService,
   ) {}
 
   // ── Rule CRUD ──────────────────────────────────────────────────────────────
@@ -137,12 +141,32 @@ export class WarehouseFeeService {
     return best;
   }
 
-  private compute(ruleType: FeeRuleType, rule: WarehouseFeeRule | null, item: ItemAttributes, now: Date): FeePreview {
+  private normalizeCurrency(currency?: string | null): 'ETB' | 'USD' {
+    return currency === 'ETB' ? 'ETB' : 'USD';
+  }
+
+  private async convertAmount(amount: number, fromCurrency: string, toCurrency: string): Promise<number> {
+    const from = this.normalizeCurrency(fromCurrency);
+    const to = this.normalizeCurrency(toCurrency);
+    if (from === to) return Math.round(amount * 100) / 100;
+    const rate = await this.exchangeService.getRate(from, to);
+    return Math.round(amount * rate * 100) / 100;
+  }
+
+  private async compute(
+    ruleType: FeeRuleType,
+    rule: WarehouseFeeRule | null,
+    item: ItemAttributes,
+    now: Date,
+    billingCurrency: string,
+  ): Promise<FeePreview> {
     const start = item.arrivedAt ? new Date(item.arrivedAt) : null;
     const endDate = item.gateClearedAt ?? item.releaseDate ?? now;
     const endIsOpen = !item.gateClearedAt && !item.releaseDate;
     const freeDays = rule?.freeDays ?? 0;
     const ratePerDay = Number(rule?.ratePerDay ?? 0);
+    const ruleCurrency = rule ? this.normalizeCurrency(rule.currency) : null;
+    const targetCurrency = this.normalizeCurrency(billingCurrency);
     const isContainer = (item.freightType ?? '').toUpperCase() === 'CONTAINER';
     const inventoryQuantity = Math.max(1, Math.round(Number(item.inventoryQuantity) || 1));
     const containerCount = isContainer
@@ -154,15 +178,21 @@ export class WarehouseFeeService {
       : 0;
     const chargeableDays = Math.max(0, elapsedDays - freeDays);
     const billableUnits = chargeableDays * containerCount;
-    const amount = Math.round(billableUnits * ratePerDay * 100) / 100;
+    const sourceAmount = Math.round(billableUnits * ratePerDay * 100) / 100;
+    const amount = ruleCurrency ? await this.convertAmount(sourceAmount, ruleCurrency, targetCurrency) : 0;
+    const convertedRatePerDay = ruleCurrency
+      ? await this.convertAmount(ratePerDay, ruleCurrency, targetCurrency)
+      : 0;
 
     return {
       ruleType,
       ruleId: rule?.id ?? null,
       ruleName: rule?.name ?? null,
       freeDays,
-      ratePerDay,
-      currency: rule?.currency ?? 'USD',
+      ratePerDay: convertedRatePerDay,
+      currency: targetCurrency,
+      ruleCurrency,
+      billingCurrency: targetCurrency,
       startDate: start ? start.toISOString() : null,
       endDate: new Date(endDate).toISOString(),
       endIsOpen,
@@ -175,14 +205,22 @@ export class WarehouseFeeService {
   }
 
   /** Preview demurrage + storage fees for an inventory item using the most specific active rules. */
-  async previewForInventory(inventoryId: string): Promise<FeePreview[]> {
+  async previewForInventory(inventoryId: string, billingCurrency = 'USD'): Promise<FeePreview[]> {
     const item = await this.loadItem(inventoryId);
     const rules = await this.feeRuleRepository.findAll({ where: { isActive: true } });
     const now = new Date();
 
     const byType: FeeRuleType[] = ['DEMURRAGE_FEE', 'STORAGE_FEE'];
-    return byType.map((type) =>
-      this.compute(type, this.bestRule(rules.filter((r) => r.ruleType === type), item), item, now),
+    return Promise.all(
+      byType.map((type) =>
+        this.compute(
+          type,
+          this.bestRule(rules.filter((r) => r.ruleType === type), item),
+          item,
+          now,
+          billingCurrency,
+        ),
+      ),
     );
   }
 }

apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.service.ts

@@ -2,6 +2,7 @@ import { Injectable, NotFoundException } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
 import { FilesService } from '../files/files.service';
+import { LastMileService } from '../last-mile/last-mile.service';
 import { CreateInspectionReportDto } from './dto/create-inspection-report.dto';
 import { UpdateInspectionReportDto } from './dto/update-inspection-report.dto';
 import { WarehouseInspectionReport } from './entities/warehouse-inspection-report.entity';
@@ -16,6 +17,7 @@ export class WarehouseInspectionService {
     private readonly dataSource: DataSource,
     private readonly inspectionRepository: WarehouseInspectionRepository,
     private readonly filesService: FilesService,
+    private readonly lastMileService: LastMileService,
   ) {}
 
   /** Create or update the inspection report for an inventory item and sync its inspectionStatus. */
@@ -70,9 +72,37 @@ export class WarehouseInspectionService {
       inspectedAt,
     });
 
+    if (dto.inspectionStatus === 'PASSED') {
+      await this.markImportPickupReadyAndAcceptLastMile(inventoryId);
+    }
+
     return report;
   }
 
+  private async markImportPickupReadyAndAcceptLastMile(inventoryId: string): Promise<void> {
+    const [row] = await this.dataSource.query(
+      `SELECT inv.booking_id AS "bookingId",
+              b.reference AS "bookingReference",
+              b.trade_direction AS "tradeDirection",
+              b.last_mile_delivery_address AS "lastMileDeliveryAddress"
+         FROM freight.warehouse_inventory inv
+         LEFT JOIN freight.bookings b ON b.id = inv.booking_id
+        WHERE inv.id = $1 AND inv.deleted_at IS NULL
+        LIMIT 1`,
+      [inventoryId],
+    );
+    if ((row?.tradeDirection ?? '').toUpperCase() !== 'IMPORT') return;
+
+    await this.dataSource.getRepository(WarehouseInventory).update(inventoryId, {
+      status: 'READY_FOR_PICKUP',
+      readyForPickupAt: new Date(),
+    });
+
+    if (row.bookingReference && row.lastMileDeliveryAddress) {
+      await this.lastMileService.acceptBooking(row.bookingReference);
+    }
+  }
+
   async findByInventory(inventoryId: string): Promise<WarehouseInspectionReport[]> {
     return this.inspectionRepository.findAll({
       where: { inventoryId },
@@ -113,6 +143,9 @@ export class WarehouseInspectionService {
       await this.dataSource
         .getRepository(WarehouseInventory)
         .update(report.inventoryId, { inspectionStatus: dto.inspectionStatus });
+      if (dto.inspectionStatus === 'PASSED') {
+        await this.markImportPickupReadyAndAcceptLastMile(report.inventoryId);
+      }
     }
 
     return this.findById(id);

apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts

@@ -3,6 +3,9 @@ import { Between, DataSource, EntityManager, FindManyOptions, ILike, LessThanOrE
 
 import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
 import { Cargo } from '../cargoes/entities/cargoes.entity';
+import { InterchangeDocumentsService } from '../interchange-documents/interchange-documents.service';
+import type { InterchangeDocument } from '../interchange-documents/entities/interchange-document.entity';
+import { LastMileService } from '../last-mile/last-mile.service';
 import { ContractPdfService } from '../../contracts/contract-pdf.service';
 import { BulkInspectDto } from './dto/bulk-inspect.dto';
 import { BulkReceiveDto } from './dto/bulk-receive.dto';
@@ -239,6 +242,7 @@ export interface AutoUnloadExportDjiboutiResult {
   unloadedCount: number;
   skippedCount: number;
   failedCount: number;
+  interchangeDocument?: Pick<InterchangeDocument, 'id' | 'documentNo' | 'status'>;
   results: Array<{
     bookingId: string;
     itemType: 'CONTAINER' | 'CARGO';
@@ -280,6 +284,8 @@ export class WarehouseInventoryService {
     private readonly invoices: WarehouseInvoiceService,
     private readonly inspectionService: WarehouseInspectionService,
     private readonly pdfService: ContractPdfService,
+    private readonly interchangeDocuments: InterchangeDocumentsService,
+    private readonly lastMileService: LastMileService,
   ) {}
 
   /**
@@ -1256,6 +1262,24 @@ export class WarehouseInventoryService {
       }
     });
 
+    if (result.unloadedCount > 0) {
+      const document = await this.interchangeDocuments.generateFromSchedule({
+        scheduleId,
+        direction: 'EXPORT',
+        handoverLocation: schedule.destinationName ?? 'Djibouti Port',
+        handoverFrom: 'EDR',
+        handoverTo: 'Djibouti Port Operator',
+        portOperatorName: 'Doraleh Multipurpose Port',
+        generatedBy: performedBy,
+        remarks: 'Generated after export unloading at Djibouti Port',
+      });
+      result.interchangeDocument = {
+        id: document.id,
+        documentNo: document.documentNo,
+        status: document.status,
+      };
+    }
+
     return result;
   }
 
@@ -1327,6 +1351,7 @@ export class WarehouseInventoryService {
             manager,
           );
         });
+        await this.acceptLastMileIfRequested(item.bookingId);
         result.results.push({ inventoryId, status: 'READY_FOR_PICKUP' });
       } else {
         result.results.push({ inventoryId, status: 'INSPECTED' });
@@ -1339,6 +1364,20 @@ export class WarehouseInventoryService {
 
   // ── Receive ──────────────────────────────────────────────────────────────
 
+  private async acceptLastMileIfRequested(bookingId?: string | null): Promise<void> {
+    if (!bookingId) return;
+    const [booking] = await this.dataSource.query(
+      `SELECT reference,
+              last_mile_delivery_address AS "lastMileDeliveryAddress"
+         FROM freight.bookings
+        WHERE id = $1 AND deleted_at IS NULL
+        LIMIT 1`,
+      [bookingId],
+    );
+    if (!booking?.reference || !booking.lastMileDeliveryAddress) return;
+    await this.lastMileService.acceptBooking(booking.reference);
+  }
+
   async receive(dto: ReceiveWarehouseInventoryDto): Promise<WarehouseInventory> {
     const weight = Number(dto.weight) || 0;
     const volume = Number(dto.volume) || 0;

apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.service.ts

@@ -14,6 +14,7 @@ import { WarehouseFeeService } from './warehouse-fee.service';
 interface GenerateOptions {
   confirmZero?: boolean;
   performedBy?: string;
+  billingCurrency?: 'ETB' | 'USD';
 }
 
 export interface PayInvoiceDto {
@@ -58,7 +59,8 @@ export class WarehouseInvoiceService {
       );
     }
 
-    const previews = await this.feeService.previewForInventory(inventoryId);
+    const billingCurrency = opts.billingCurrency === 'ETB' ? 'ETB' : 'USD';
+    const previews = await this.feeService.previewForInventory(inventoryId, billingCurrency);
     const isContainer = (item.freightType ?? '').toUpperCase() === 'CONTAINER';
 
     const items = previews
@@ -98,7 +100,7 @@ export class WarehouseInvoiceService {
     const invoiceType: WarehouseInvoiceType =
       hasDemurrage && hasStorage ? 'MIXED_WAREHOUSE_FEES' : hasStorage ? 'STORAGE_FEE' : 'DEMURRAGE';
 
-    const currency = items[0]?.currency ?? 'USD';
+    const currency = billingCurrency;
     const now = new Date();
     const periodEnd = previews[0] ? new Date(previews[0].endDate) : now;
 

apps/edr-freight-api/src/modules/warehouses/warehouse-rules.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, HttpCode, Param, ParseUUIDPipe, Patch, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, Param, ParseUUIDPipe, Patch, Post, Query } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
 import {
@@ -79,7 +79,10 @@ export class WarehouseRulesController {
 
   @Get('warehouse-inventory/:id/fee-preview')
   @ApiOperation({ summary: 'Preview demurrage + storage fees for an inventory item' })
-  feePreview(@Param('id', ParseUUIDPipe) id: string) {
-    return this.feeService.previewForInventory(id);
+  feePreview(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Query('billingCurrency') billingCurrency?: string,
+  ) {
+    return this.feeService.previewForInventory(id, billingCurrency);
   }
 }

apps/edr-freight-api/src/modules/warehouses/warehouses.module.ts

@@ -1,8 +1,12 @@
 import { Module } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { ExchangeModule, ExchangeOptions } from '@edr/api-common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { ContractPdfService } from '../../contracts/contract-pdf.service';
 import { FilesModule } from '../files/files.module';
+import { InterchangeDocumentsModule } from '../interchange-documents/interchange-documents.module';
+import { LastMileModule } from '../last-mile/last-mile.module';
 import { WarehouseActivityLog } from './entities/warehouse-activity-log.entity';
 import { WarehouseAllocationRule } from './entities/warehouse-allocation-rule.entity';
 import { WarehouseFeeInvoice } from './entities/warehouse-fee-invoice.entity';
@@ -65,6 +69,13 @@ import { WarehousesService } from './warehouses.service';
       WarehouseFeeInvoiceItem,
     ]),
     FilesModule,
+    InterchangeDocumentsModule,
+    LastMileModule,
+    ExchangeModule.forRootAsync({
+      inject: [ConfigService],
+      useFactory: (config: ConfigService): ExchangeOptions =>
+        config.get<ExchangeOptions>('app.cbeExchange') ?? {},
+    }),
   ],
   controllers: [
     WarehousesController,