feat(fulfillment): refactor fulfillment parcels view model

Author: belsman

packages/modules/fulfillment/src/lib/models/fulfiillment-label.model.ts

@@ -0,0 +1,71 @@
+import {
+  IoRestorecommerceFulfillmentFulfillment,
+  IoRestorecommerceFulfillmentFulfillmentState,
+  IoRestorecommerceFulfillmentItem,
+  IoRestorecommerceFulfillmentLabel,
+  IoRestorecommerceFulfillmentParcel,
+} from '@console-core/graphql';
+
+import {
+  FulfillmentParcelItemVM,
+  FulfillmentParcelVM,
+} from './fulfillment-parcel.model';
+
+export function mapFulfillmentParcelsToVM(
+  payload: IoRestorecommerceFulfillmentFulfillment
+): FulfillmentParcelVM[] {
+  const parcels = payload?.packaging?.parcels ?? [];
+  const labels = payload?.labels ?? [];
+
+  return parcels.map(
+    (parcel: IoRestorecommerceFulfillmentParcel): FulfillmentParcelVM => {
+      const label = labels.find(
+        (l: IoRestorecommerceFulfillmentLabel) => l.parcelId === parcel.id
+      );
+
+      const currency =
+        parcel.amount?.currencyId ?? parcel.price?.currencyId ?? '';
+
+      return {
+        id: `${parcel.id}`,
+        shortId: `${parcel.id?.slice(0, 8)}`,
+        productId: `${parcel.productId}`,
+        variantId: `${parcel.variantId}`,
+
+        grossLabel: formatMoney(parcel.amount?.gross ?? 0, currency),
+        netLabel: formatMoney(parcel.amount?.net ?? 0, currency),
+        vatLabel: formatMoney(parcel.amount?.vats?.[0]?.vat ?? 0, currency),
+        regularPriceLabel: formatMoney(
+          parcel.price?.regularPrice ?? 0,
+          currency
+        ),
+
+        shipmentNumber: `${label?.shipmentNumber}`,
+        labelState:
+          label?.state ?? IoRestorecommerceFulfillmentFulfillmentState.Pending,
+        labelUrl: `${label?.file?.url}`,
+
+        items: (parcel.items ?? []).map(
+          (item: IoRestorecommerceFulfillmentItem) =>
+            ({
+              name: item.name,
+              quantity: item.quantity,
+              hsCode: item.hsCode,
+              weightLabel: item.package?.weightInKg
+                ? `${item.package.weightInKg} kg`
+                : '—',
+              sizeLabel: item.package?.sizeInCm
+                ? `${item.package.sizeInCm.length} × ${item.package.sizeInCm.width} × ${item.package.sizeInCm.height} cm`
+                : '—',
+            }) as FulfillmentParcelItemVM
+        ),
+      };
+    }
+  );
+}
+
+function formatMoney(value?: number, currency?: string): string {
+  if (value == null) return '—';
+
+  return `${value.toFixed(2)} ${currency ?? ''}`.trim();
+}

packages/modules/fulfillment/src/lib/models/fulfillment-list-item.model.ts

@@ -1,12 +1,25 @@
-import { ParcelItem } from './fulfillment-parcel-item.model';
+export interface FulfillmentParcelItemVM {
+  name: string;
+  quantity: number;
+  hsCode?: string;
+  weightLabel?: string;
+  sizeLabel?: string;
+}
 
-export interface Parcel {
+export interface FulfillmentParcelVM {
   id: string;
-
+  shortId: string;
   productId?: string;
   variantId?: string;
 
-  weightKg: number;
+  grossLabel?: string;
+  netLabel?: string;
+  vatLabel?: string;
+  regularPriceLabel?: string;
+
+  shipmentNumber?: string;
+  labelState?: string;
+  labelUrl?: string;
 
-  items: ParcelItem[];
+  items: FulfillmentParcelItemVM[];
 }

packages/modules/fulfillment/src/lib/models/fulfillment-parcel-item.model.ts

@@ -1,37 +1,13 @@
 import { IoRestorecommerceFulfillmentFulfillment } from '@console-core/graphql';
 
+import { mapFulfillmentParcelsToVM } from './fulfillment-parcel.mapper';
 import { FulfillmentState } from './fulfillment-state.model';
 import { Fulfillment } from './fulfillment.model';
 
 export function mapFulfillmentDto(
   dto: IoRestorecommerceFulfillmentFulfillment
 ): Fulfillment {
-  const parcels =
-    dto.packaging?.parcels?.map((p) => ({
-      id: p.id ?? '',
-
-      productId: p.productId ?? undefined,
-      variantId: p.variantId ?? undefined,
-
-      weightKg: p.package?.weightInKg ?? 0,
-
-      items:
-        p.items?.map((i) => ({
-          name: i.name ?? '',
-          quantity: i.quantity ?? 0,
-          productId: i.productId ?? '',
-          weightKg: i.package?.weightInKg ?? 0,
-        })) ?? [],
-    })) ?? [];
-
-  const labels =
-    dto.labels?.map((l) => ({
-      id: l.id ?? '',
-      parcelId: l.parcelId ?? '',
-      shipmentNumber: l.shipmentNumber ?? '',
-      state: l.state ?? '',
-      url: l.file?.url ?? '',
-    })) ?? [];
+  const parcels = mapFulfillmentParcelsToVM(dto);
 
   return {
     id: dto.id ?? '',
@@ -43,16 +19,15 @@ export function mapFulfillmentDto(
       ? new Date(dto.meta.modified as string)
       : undefined,
 
-    parcels,
-    labels,
-
     shippingCost: {
       currency: dto.totalAmounts?.[0].currency?.code ?? 'EUR',
       gross: dto.totalAmounts?.[0].gross ?? 0,
       net: dto.totalAmounts?.[0].net ?? 0,
       tax: dto.totalAmounts?.[0].vats?.[0].vat ?? 0,
     },
 
+    parcels,
+
     orderId:
       dto.references?.find((r) => r.instanceType?.includes('order'))
         ?.instanceId ?? undefined,

packages/modules/fulfillment/src/lib/models/fulfillment-parcel.mapper.ts

@@ -1,5 +1,4 @@
-import { Label } from './fulfiillment-label.model';
-import { Parcel } from './fulfillment-parcel.model';
+import { FulfillmentParcelVM } from './fulfillment-parcel.model';
 import { FulfillmentState } from './fulfillment-state.model';
 import { Money } from './money.model';
 
@@ -10,8 +9,7 @@ export interface Fulfillment {
   createdAt: Date;
   modifiedAt?: Date;
 
-  parcels: Parcel[];
-  labels: Label[];
+  parcels: FulfillmentParcelVM[];
 
   shippingCost?: Money;