Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile

2026-08-29 12:58:13 +00:00 · 2026-06-24 01:22:31 +03:00
parent 196e296275 6d648b2553
commit 72df5ce689
53 changed files with 1797 additions and 2638 deletions
--- a/apps/edr-freight-web/backoffice/src/services/customers.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/customers.service.ts
@@ -24,6 +24,7 @@ function mapCompany(dto: Record<string, unknown>): Company {
  const attrs = (dto.attributes as Record<string, unknown> | null) ?? {};
  return {
    ...(dto as unknown as Company),
+    companyProfiles: (dto.companyProfiles as Company["companyProfiles"]) ?? [],
    contactPersonName: (attrs.contactPersonName as string | null) ?? null,
    contactPersonPhone: (attrs.contactPersonPhone as string | null) ?? null,
    generalManagerName: (attrs.generalManagerName as string | null) ?? null,
--- a/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts
@@ -67,7 +67,11 @@ const byIdPath = (resource: RuleEngineResourceSlug, id: string): string => {
  }
 };

-const defaultMeta = (dataLength: number, page = 1, pageSize = 10): RuleEngineListMeta => ({
+const defaultMeta = (
+  dataLength: number,
+  page = 1,
+  pageSize = 10,
+): RuleEngineListMeta => ({
  total: dataLength,
  page,
  pageSize,
@@ -79,7 +83,7 @@ const isPaginatedListResult = <T extends RuleEngineRecord>(
 ): value is RuleEngineListResult<T> =>
  Boolean(value) &&
  typeof value === "object" &&
-  "data" in value &&
+  "data" in (value ?? {}) &&
  Array.isArray((value as RuleEngineListResult<T>).data);

 const normalizeList = <T extends RuleEngineRecord>(
@@ -104,7 +108,10 @@ const normalizeList = <T extends RuleEngineRecord>(
  }

  if (Array.isArray(body)) {
-    return { data: body as T[], meta: defaultMeta(body.length, page, pageSize) };
+    return {
+      data: body as T[],
+      meta: defaultMeta(body.length, page, pageSize),
+    };
  }

  return { data: [], meta: defaultMeta(0, page, pageSize) };
@@ -161,7 +168,10 @@ export const ruleEngineService = {
    return normalizeEntity<T>(response.data);
  },

-  remove: async (resource: RuleEngineResourceSlug, id: string): Promise<void> => {
+  remove: async (
+    resource: RuleEngineResourceSlug,
+    id: string,
+  ): Promise<void> => {
    await client.delete(byIdPath(resource, id));
  },

@@ -181,24 +191,36 @@ export const ruleEngineService = {
  },

  submitRate: async <T extends RuleEngineRecord>(id: string): Promise<T> => {
-    const response = await client.post(URL_CONSTANTS.RULE_ENGINE.RATE_SUBMIT(id));
+    const response = await client.post(
+      URL_CONSTANTS.RULE_ENGINE.RATE_SUBMIT(id),
+    );
    return normalizeEntity<T>(response.data);
  },

  approveRate: async <T extends RuleEngineRecord>(id: string): Promise<T> => {
-    const response = await client.post(URL_CONSTANTS.RULE_ENGINE.RATE_APPROVE(id));
+    const response = await client.post(
+      URL_CONSTANTS.RULE_ENGINE.RATE_APPROVE(id),
+    );
    return normalizeEntity<T>(response.data);
  },

  getApprovalChain: async (
    requiresDirectorApproval = true,
  ): Promise<RuleEngineRecord[]> => {
-    const response = await client.get(URL_CONSTANTS.RULE_ENGINE.APPROVAL_RULES_CHAIN, {
-      params: { requiresDirectorApproval },
-    });
+    const response = await client.get(
+      URL_CONSTANTS.RULE_ENGINE.APPROVAL_RULES_CHAIN,
+      {
+        params: { requiresDirectorApproval },
+      },
+    );
    const body = unwrap(response.data) as unknown;
    if (Array.isArray(body)) return body as RuleEngineRecord[];
-    if (body && typeof body === "object" && "data" in body && Array.isArray((body as { data: unknown }).data)) {
+    if (
+      body &&
+      typeof body === "object" &&
+      "data" in body &&
+      Array.isArray((body as { data: unknown }).data)
+    ) {
      return (body as { data: RuleEngineRecord[] }).data;
    }
    return [];
--- a/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
@@ -1,13 +1,12 @@
-import { api as client } from '../auth/http';
-import { unwrap } from '@/utils/endpoint';
-import { URL_CONSTANTS } from '@/constants/URLS';
+import { api as client } from "../auth/http";
+import { unwrap } from "@/utils/endpoint";
+import { URL_CONSTANTS } from "@/constants/URLS";
 import type {
  BatchBoardSchedule,
  BatchBoardScheduleDetail,
  BookableSchedule,
  AssignBookingsPayload,
  CompositionRemovalEntry,
-  CompositionUnassignedBooking,
  UnassignedBookingsResponse,
  CreateTrainSchedulePayload,
  EligibleContainerBookingsResponse,
@@ -24,7 +23,7 @@ import type {
  TrainTrackResponse,
  WagonAllocationAttemptResult,
  YardOption,
-} from '@/types/trainScheduling';
+} from "@/types/trainScheduling";

 interface BookingReferenceDataResponse {
  yard?: Array<YardOption & { label?: string }>;
@@ -58,7 +57,9 @@ export const trainSchedulingService = {
  ): Promise<TrainSchedulePreviewResponse> => {
    const useUnified = !freightType || freightType === "MIXED";
    const response = await client.post<TrainSchedulePreviewResponse>(
-      useUnified ? URL_CONSTANTS.TRAIN_SCHEDULING.PREVIEW : pathsFor(freightType).PREVIEW,
+      useUnified
+        ? URL_CONSTANTS.TRAIN_SCHEDULING.PREVIEW
+        : pathsFor(freightType).PREVIEW,
      payload,
    );
    return unwrap(response.data);
@@ -91,7 +92,9 @@ export const trainSchedulingService = {
    return unwrap(response.data);
  },

-  getBatchBoardDetail: async (scheduleId: string): Promise<BatchBoardScheduleDetail> => {
+  getBatchBoardDetail: async (
+    scheduleId: string,
+  ): Promise<BatchBoardScheduleDetail> => {
    const response = await client.get<BatchBoardScheduleDetail>(
      URL_CONSTANTS.TRAIN_SCHEDULING.BATCH_BOARD_DETAIL(scheduleId),
    );
@@ -132,7 +135,9 @@ export const trainSchedulingService = {
    return unwrap(response.data);
  },

-  runAllocation: async (scheduleId: string): Promise<WagonAllocationAttemptResult> => {
+  runAllocation: async (
+    scheduleId: string,
+  ): Promise<WagonAllocationAttemptResult> => {
    const response = await client.post<WagonAllocationAttemptResult>(
      URL_CONSTANTS.TRAIN_SCHEDULING.RUN_ALLOCATION(scheduleId),
      {},
@@ -152,20 +157,29 @@ export const trainSchedulingService = {
  },

  markBookingPaid: async (bookingId: string): Promise<void> => {
-    await client.post(URL_CONSTANTS.TRAIN_SCHEDULING.MARK_BOOKING_PAID(bookingId), {});
+    await client.post(
+      URL_CONSTANTS.TRAIN_SCHEDULING.MARK_BOOKING_PAID(bookingId),
+      {},
+    );
  },

  expireBooking: async (bookingId: string): Promise<void> => {
-    await client.post(URL_CONSTANTS.TRAIN_SCHEDULING.EXPIRE_BOOKING(bookingId), {});
+    await client.post(
+      URL_CONSTANTS.TRAIN_SCHEDULING.EXPIRE_BOOKING(bookingId),
+      {},
+    );
  },

  moveBookingSchedule: async (
    bookingId: string,
    trainScheduleId: string,
  ): Promise<void> => {
-    await client.post(URL_CONSTANTS.TRAIN_SCHEDULING.MOVE_BOOKING_SCHEDULE(bookingId), {
-      trainScheduleId,
-    });
+    await client.post(
+      URL_CONSTANTS.TRAIN_SCHEDULING.MOVE_BOOKING_SCHEDULE(bookingId),
+      {
+        trainScheduleId,
+      },
+    );
  },

  getScheduleById: async (
@@ -173,7 +187,9 @@ export const trainSchedulingService = {
    freightType?: FreightType,
  ): Promise<TrainScheduleDetail> => {
    const response = await client.get<TrainScheduleDetail>(
-      pathsFor(freightType === "MIXED" ? undefined : freightType).SCHEDULE_BY_ID(id),
+      pathsFor(
+        freightType === "MIXED" ? undefined : freightType,
+      ).SCHEDULE_BY_ID(id),
    );
    return unwrap(response.data);
  },
@@ -225,7 +241,9 @@ export const trainSchedulingService = {
    return unwrap(response.data);
  },

-  finalizeSchedule: async (scheduleId: string): Promise<TrainScheduleDetail> => {
+  finalizeSchedule: async (
+    scheduleId: string,
+  ): Promise<TrainScheduleDetail> => {
    const response = await client.post<TrainScheduleDetail>(
      URL_CONSTANTS.TRAIN_SCHEDULING.FINALIZE(scheduleId),
      {},
@@ -233,7 +251,9 @@ export const trainSchedulingService = {
    return unwrap(response.data);
  },

-  dispatchSchedule: async (scheduleId: string): Promise<TrainScheduleDetail> => {
+  dispatchSchedule: async (
+    scheduleId: string,
+  ): Promise<TrainScheduleDetail> => {
    const response = await client.post<TrainScheduleDetail>(
      URL_CONSTANTS.TRAIN_SCHEDULING.DISPATCH(scheduleId),
      {},
@@ -272,13 +292,17 @@ export const trainSchedulingService = {
    freightType: FreightType = "CONTAINER",
  ): Promise<TrainScheduleDetail> => {
    const response = await client.post<TrainScheduleDetail>(
-      pathsFor(freightType === "MIXED" ? undefined : freightType).CANCEL_SCHEDULE(id),
+      pathsFor(
+        freightType === "MIXED" ? undefined : freightType,
+      ).CANCEL_SCHEDULE(id),
      {},
    );
    return unwrap(response.data);
  },

-  getAvailableLocomotives: async (routeId?: string): Promise<LocomotiveRecord[]> => {
+  getAvailableLocomotives: async (
+    routeId?: string,
+  ): Promise<LocomotiveRecord[]> => {
    if (routeId) {
      const response = await client.get<LocomotiveRecord[]>(
        URL_CONSTANTS.TRAIN_SCHEDULING.AVAILABLE_LOCOMOTIVES,
@@ -286,9 +310,12 @@ export const trainSchedulingService = {
      );
      return unwrap(response.data);
    }
-    const response = await client.get<LocomotiveRecord[]>(URL_CONSTANTS.LOCOMOTIVES.BASE, {
-      params: { status: 'AVAILABLE' },
-    });
+    const response = await client.get<LocomotiveRecord[]>(
+      URL_CONSTANTS.LOCOMOTIVES.BASE,
+      {
+        params: { status: "AVAILABLE" },
+      },
+    );
    return unwrap(response.data);
  },

@@ -380,7 +407,10 @@ export const trainSchedulingService = {
    }));
  },

-  removeWagonSlot: async (scheduleId: string, wagonId: string): Promise<TrainScheduleDetail> => {
+  removeWagonSlot: async (
+    scheduleId: string,
+    wagonId: string,
+  ): Promise<TrainScheduleDetail> => {
    const response = await client.delete<TrainScheduleDetail>(
      URL_CONSTANTS.TRAIN_SCHEDULING.REMOVE_WAGON_SLOT(scheduleId, wagonId),
    );
@@ -392,7 +422,10 @@ export const trainSchedulingService = {
    itemId: string,
    payload: { containerNumber: string | null },
  ): Promise<{ id: string; containerNumber: string | null }> => {
-    const response = await client.patch<{ id: string; containerNumber: string | null }>(
+    const response = await client.patch<{
+      id: string;
+      containerNumber: string | null;
+    }>(
      URL_CONSTANTS.TRAIN_SCHEDULING.UPDATE_CONTAINER_ITEM(scheduleId, itemId),
      payload,
    );