Merge pull request #351 from Tria-plc/freight_feature/contrat

Freight feature/contrat

apps/edr-freight-api/src/migrations/1810000000004-AddPostPaymentCompletedColumn.ts

@@ -1,7 +1,7 @@
 import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
 
-export class AddPostPaymentCompletedColumn1719667261000 implements MigrationInterface {
-  name = 'AddPostPaymentCompletedColumn1719667261000';
+export class AddPostPaymentCompletedColumn1810000000004 implements MigrationInterface {
+  name = 'AddPostPaymentCompletedColumn1810000000004';
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     const firstMileTable = await queryRunner.hasTable('freight.first_mile_deliveries');

apps/edr-freight-api/src/modules/payment/payment.service.ts

@@ -462,16 +462,29 @@ export class PaymentService {
         failureCode?: string;
         failureMessage?: string;
     }): Promise<{ processed: boolean; alreadyFinalized?: boolean; reason?: string }> {
+        console.log(`Received payment event: ${JSON.stringify(event)}`);
         if (event.eventType === "payment.succeeded") {
             const intent = await this.paymentRepo.findOneBy({ refId: event.referenceId });
             if (!intent) {
                 return { processed: false, reason: `No local intent for reference ${event.referenceId}` };
             }
+            console.log(`Processing payment succeeded event for intent: }`,intent);
             const { alreadyFinalized } = await this.markIntentSucceeded(intent.id, {
                 providerTxnId: event.providerTxnId,
                 paidAt: event.paidAt ? new Date(event.paidAt) : undefined,
                 notify: true,
             });
+            console.log(`Payment finalized for intent ${intent.id}, alreadyFinalized: ${alreadyFinalized}`);
+
+            // When the intent references a booking, flip the booking itself paid.
+            // refId holds the booking id (the domain reference the intent opened with).
+            if (intent.referenceType === PaymentReferenceType.BOOKING) {
+                await this.datasource.manager.update(
+                    Booking,
+                    { id: intent.refId },
+                    { status: "PAID", paymentStatus: "PAID" },
+                );
+            }
             // console.log(`Payment finalized for booking ${event.referenceId}, intent ${intent.id}, alreadyFinalized: ${alreadyFinalized}`);
             return { processed: true, alreadyFinalized };
         }