resolve conflict

apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts

@@ -82,17 +82,6 @@ export class TrainSchedulingService {
   async getEligibleContainerBookings(query: GetEligibleContainerBookingsDto) {
     const bookingRepository = this.dataSource.getRepository(Booking);
     const queryBuilder = bookingRepository
-<<<<<<< HEAD
-      .createQueryBuilder('booking')
-      .leftJoinAndSelect('booking.company', 'company')
-      .leftJoinAndSelect('booking.originYard', 'originYard')
-      .leftJoinAndSelect('booking.destinationYard', 'destinationYard')
-      .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
-      .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
-      .leftJoin(TrainScheduleBooking, 'scheduleBooking', 'scheduleBooking.booking_id = booking.id')
-      .where('booking.freightType = :freightType', { freightType: 'CONTAINER' })
-      .andWhere('scheduleBooking.id IS NULL');
-=======
       .createQueryBuilder("booking")
       .leftJoinAndSelect("booking.customer", "customer")
       .leftJoinAndSelect("booking.originYard", "originYard")
@@ -106,7 +95,6 @@ export class TrainSchedulingService {
       )
       .where("booking.freightType = :freightType", { freightType: "CONTAINER" })
       .andWhere("scheduleBooking.id IS NULL");
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
 
     if (query.originStationId) {
       queryBuilder.andWhere("booking.originYardId = :originStationId", {
@@ -144,13 +132,6 @@ export class TrainSchedulingService {
     const items: EligibleBookingItem[] = bookings.map((booking) => ({
       id: booking.id,
       reference: booking.reference,
-<<<<<<< HEAD
-      customer: booking.company?.name ?? booking.company?.email ?? 'Unknown customer',
-      containerType: booking.bookingContainers
-        ?.map((container) => container.containerType?.label ?? container.containerType?.code ?? 'Container')
-        .join(', ') ?? 'Container',
-      quantity: booking.bookingContainers?.reduce((sum, container) => sum + Number(container.quantity ?? 0), 0) ?? 0,
-=======
       customer:
         booking.company?.name ?? booking.company?.email ?? "Unknown customer",
       containerType:
@@ -167,7 +148,6 @@ export class TrainSchedulingService {
           (sum, container) => sum + Number(container.quantity ?? 0),
           0,
         ) ?? 0,
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
       weightTons: this.roundTons(booking.cargoTotalWeightVgm),
       origin:
         booking.originYard?.label ??
@@ -674,17 +654,6 @@ export class TrainSchedulingService {
   }
 
   async getContainerTrainScheduleById(id: string) {
-<<<<<<< HEAD
-    const schedule = await this.dataSource.getRepository(TrainSchedule).findOne({
-      where: { id },
-      relations: {
-        trainSet: { locomotive: true, wagons: { wagonType: true, allocations: { booking: true } } },
-        originStation: true,
-        destinationStation: true,
-        scheduleBookings: { booking: { company: true, originYard: true, destinationYard: true } },
-      },
-    });
-=======
     const schedule = await this.dataSource
       .getRepository(TrainSchedule)
       .findOne({
@@ -701,7 +670,6 @@ export class TrainSchedulingService {
           },
         },
       });
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
 
     if (!schedule) {
       throw new NotFoundException(`Train schedule ${id} not found`);

apps/edr-freight-api/src/seed/demo-bookings.seeder.ts

@@ -2,16 +2,6 @@ import { Injectable, Logger } from "@nestjs/common";
 import { randomUUID } from "crypto";
 import { DataSource } from "typeorm";
 
-<<<<<<< HEAD
-import { BookingContainer } from '../modules/bookings/entities/booking-container.entity';
-import { Booking } from '../modules/bookings/entities/booking.entity';
-import { Company } from '../modules/companies/entities/company.entity';
-import { Locomotive } from '../modules/locomotives/entities/locomotive.entity';
-import { ServiceType } from '../modules/rule-engine/entities/service-type.entity';
-import { Yard } from '../modules/rule-engine/entities/yard.entity';
-import { WagonType } from '../modules/wagon-types/entities/wagon-type.entity';
-import { ContainerType } from '../modules/rule-engine/entities/container-type.entity';
-=======
 import { BookingContainer } from "../modules/bookings/entities/booking-container.entity";
 import { Booking } from "../modules/bookings/entities/booking.entity";
 import { Customer } from "../modules/customers/entities/customer.entity";
@@ -20,7 +10,6 @@ import { ServiceType } from "../modules/rule-engine/entities/service-type.entity
 import { Yard } from "../modules/rule-engine/entities/yard.entity";
 import { WagonType } from "../modules/wagon-types/entities/wagon-type.entity";
 import { ContainerType } from "../modules/rule-engine/entities/container-type.entity";
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
 
 const SEED_FLAG = "SEED_DEMO_BOOKINGS";
 
@@ -220,11 +209,6 @@ export class DemoBookingsSeeder {
         { conflictPaths: { email: true } },
       );
 
-<<<<<<< HEAD
-      const [serviceType, company, yards, containerTypes] = await Promise.all([
-        manager.getRepository(ServiceType).findOneByOrFail({ code: SERVICE_TYPE_CODE }),
-        manager.getRepository(Customer).findOneByOrFail({ email: CUSTOMER_EMAIL }),
-=======
       const [serviceType, customer, yards, containerTypes] = await Promise.all([
         manager
           .getRepository(ServiceType)
@@ -232,7 +216,6 @@ export class DemoBookingsSeeder {
         manager
           .getRepository(Customer)
           .findOneByOrFail({ email: CUSTOMER_EMAIL }),
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
         manager.getRepository(Yard).find(),
         manager.getRepository(ContainerType).find(),
       ]);
@@ -264,13 +247,8 @@ export class DemoBookingsSeeder {
         await manager.getRepository(Booking).upsert(
           {
             reference: demoBooking.reference,
-<<<<<<< HEAD
-            companyId: company.id,
-            status: 'APPROVED',
-=======
             companyId: customer.id,
             status: "APPROVED",
->>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
             scheduledDate: new Date(demoBooking.scheduledDate),
             totalAmount: 0,
             paymentStatus: "PENDING",