Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2

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

@@ -282,6 +282,7 @@ export class CompaniesService {
   async findCompanyById(id: string): Promise<Company> {
     const company = await this.companiesRepo.findById(id);
     if (!company) throw new NotFoundException(`Company ${id} not found`);
+    company.companyProfiles = await this.companyProfilesRepo.findByCompanyId(id);
     return company;
   }
 

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

@@ -2152,6 +2152,7 @@ export class TrainSchedulingService {
           weightTons: roundTons(Number(sb.booking?.cargoTotalWeightVgm ?? 0)),
           status: sb.booking?.status ?? null,
           schedulingStatus: sb.booking?.schedulingStatus ?? null,
+          freightType: sb.booking?.freightType ?? null,
         })) ?? [],
     };
   }