auto allocation and batch managemnt, tracking the train

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

@@ -1,4 +1,4 @@
-import { Module } from "@nestjs/common";
+import { Module, forwardRef } from "@nestjs/common";
 import { PaymentService } from "./payment.service";
 import { HttpModule } from "@nestjs/axios";
 import { PaymentController } from "./payment.controller";
@@ -7,11 +7,12 @@ import { PaymentRepository } from "./payment.repository";
 import { WebhookController } from "./webhooks/webhook.controller";
 import { TelebirrWebhookService } from "./webhooks/providers/telebirr.service";
 import { TelebirrProvider } from "@edr/payment-providers";
+import { TrainSchedulingModule } from "../train-scheduling/train-scheduling.module";
 
 @Module({
-    imports: [HttpModule, ConfigModule],
+    imports: [HttpModule, ConfigModule, forwardRef(() => TrainSchedulingModule)],
     providers: [PaymentRepository, PaymentService, TelebirrWebhookService, TelebirrProvider],
     controllers: [PaymentController, WebhookController],
     exports: [PaymentService]
 })
-export class PaymentModule { }
+export class PaymentModule { }

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

@@ -1,5 +1,7 @@
 import {
     BadRequestException,
+    forwardRef,
+    Inject,
     Injectable,
     InternalServerErrorException,
     NotFoundException,
@@ -23,6 +25,7 @@ import {
 } from "@edr/payment-providers";
 import { ProviderInitiationInput } from "@edr/types"
 import { InitiateResponseDto, PaymentPlatformDto } from "./payments.dto";
+import { BookingBatchService } from "../train-scheduling/booking-batch.service";
 
 const DEFAULT_CURRENCY = "ETB";
 
@@ -33,6 +36,8 @@ export class PaymentService {
         private readonly datasource: DataSource,
         private readonly paymentRepo: PaymentRepository,
         private readonly telebirrProvider: TelebirrProvider,
+        @Inject(forwardRef(() => BookingBatchService))
+        private readonly bookingBatchService: BookingBatchService,
     ) { }
 
     async initBookingTelebirr(
@@ -125,15 +130,12 @@ export class PaymentService {
 
         if (result.status === ProviderPaymentStatus.SUCCEEDED) {
             await this.datasource.transaction(async (mg) => {
-                const booking = await mg.findOne(Booking, { where: { id: resp.refId } })
-                if (booking?.status === "AWAITING_PAYMENT") {
-                    // Batch flow: mark paid but keep the reservation — the batch settle job allocates it.
-                    await mg.update(Booking, { id: resp.refId }, { paymentStatus: "PAID" })
-                } else {
-                    await mg.update(Booking, { id: resp.refId }, { status: "PAID" })
-                }
                 await mg.update(PaymentEntity, { id: resp.id }, { status: "success" })
+                await mg.update(Booking, { id: resp.refId }, { paymentStatus: "PAID" })
             })
+            if (resp.type === "booking") {
+                await this.bookingBatchService.ensurePaidBookingAllocated(resp.refId)
+            }
         }
         return {
             status: result.status

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

@@ -1,9 +1,10 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import { TelebirrDto } from '../dto/telebirr.dto';
 import { PaymentRepository } from '../../payment.repository';
 import { DataSource } from 'typeorm';
 import { Booking } from '../../../bookings/entities/booking.entity';
 import { TelebirrProvider, ProviderPaymentStatus } from '@edr/payment-providers';
+import { BookingBatchService } from '../../../train-scheduling/booking-batch.service';
 
 @Injectable()
 export class TelebirrWebhookService {
@@ -13,6 +14,8 @@ export class TelebirrWebhookService {
         private readonly datasource: DataSource,
         private readonly paymentRepo: PaymentRepository,
         private readonly telebirrProvider: TelebirrProvider,
+        @Inject(forwardRef(() => BookingBatchService))
+        private readonly bookingBatchService: BookingBatchService,
     ) { }
 
     verifyTelebirrNotification(payload: TelebirrDto) {
@@ -40,6 +43,7 @@ export class TelebirrWebhookService {
                         { id: payment.refId },
                         { paymentStatus: "PAID" },
                     );
+                    await this.bookingBatchService.ensurePaidBookingAllocated(payment.refId);
                 }
                 break;
             case ProviderPaymentStatus.FAILED:
@@ -50,4 +54,4 @@ export class TelebirrWebhookService {
                 break;
         }
     }
-}
+}