Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 19:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307 from Tria-plc/Release_order

Browse Source 
Release order
This commit is contained in:
Hagernesh Tadesse
2026-06-26 23:53:32 +03:00
committed by GitHub
parent 0b013e91ef ee9f3fa394
commit 2f06817e48
8 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
View File

@@ -1,5 +1,10 @@
<<<<<<< HEAD
import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
import { DataSource, FindOptionsWhere } from 'typeorm';
=======
import { Injectable, Logger, NotFoundException } from '@nestjs/common';
import { FindOptionsWhere } from 'typeorm';
>>>>>>> 73de29f7c5977827a68865b9cb492a5a2cf1cead
import { BookingsRepository } from '../bookings/bookings.repository';
import { DriversService } from '../drivers/drivers.service';
@@ -32,6 +37,7 @@ export class LastMileService {
private readonly logger = new Logger(LastMileService.name);
constructor(
private readonly dataSource: DataSource,
private readonly lastMileRepository: LastMileRepository,
private readonly bookingsRepository: BookingsRepository,
private readonly vehiclesService: VehiclesService,

2
apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
View File

@@ -34,6 +34,7 @@ export interface ImportTrainItemRow {
weight: number | null;
arrivalTime: string | null;
currentStatus: string | null;
inspectionStatus: string | null;
lastMileRequested: boolean;
pickupOption: string;
}
@@ -242,6 +243,7 @@ export class SchedulingReadFacade {
b.cargo_total_weight_vgm AS "weight",
COALESCE(ts.actual_arrival_at, ts.scheduled_arrival_date) AS "arrivalTime",
COALESCE(inv.status, b.status) AS "currentStatus",
inv.inspection_status AS "inspectionStatus",
(b.last_mile_delivery_address IS NOT NULL) AS "lastMileRequested",
CASE WHEN b.last_mile_delivery_address IS NOT NULL
THEN 'DOOR_DELIVERY' ELSE 'TERMINAL_PICKUP' END AS "pickupOption"