Merge pull request #313 from GTBitsOfGood/ezra/311-partner-shipment-status-updates

Ezra/311 partner shipment status updates

Author: ND68

src/services/allocationService.ts

@@ -569,20 +569,13 @@ export default class AllocationService {
       }))
       .filter((pair) => hasShippingIdentifier(pair));
 
-    const lookupPairs = shippingNumberPairs.filter(
-      (
-        pair
-      ): pair is { donorShippingNumber: string; hfhShippingNumber: string } =>
-        Boolean(pair.donorShippingNumber && pair.hfhShippingNumber)
-    );
-
     const statusMap = new Map<string, ShipmentStatus>();
-    if (lookupPairs.length > 0) {
+    if (shippingNumberPairs.length > 0) {
       const statusRecords = await db.shippingStatus.findMany({
         where: {
-          OR: lookupPairs.map((pair) => ({
-            donorShippingNumber: pair.donorShippingNumber,
-            hfhShippingNumber: pair.hfhShippingNumber,
+          OR: shippingNumberPairs.map((pair) => ({
+            donorShippingNumber: pair.donorShippingNumber ?? null,
+            hfhShippingNumber: pair.hfhShippingNumber ?? null,
           })),
         },
       });

src/services/distributionService.ts

@@ -13,7 +13,7 @@ import {
 import { Prisma, ShipmentStatus } from "@prisma/client";
 import { Filters } from "@/types/api/filter.types";
 import { buildQueryWithPagination, buildWhereFromFilters } from "@/util/table";
-import { hasShippingIdentifier } from "@/util/shipping";
+import { hasShippingIdentifier, normalizeShippingTuple } from "@/util/shipping";
 
 export default class DistributionService {
   static async getAllDistributions(
@@ -386,17 +386,17 @@ export default class DistributionService {
         let shipmentStatus: ShipmentStatus =
           ShipmentStatus.WAITING_ARRIVAL_FROM_DONOR;
 
-        if (tuple.donorShippingNumber && tuple.hfhShippingNumber) {
-          const shippingStatus = await db.shippingStatus.findFirst({
-            where: {
-              hfhShippingNumber: tuple.hfhShippingNumber,
-              donorShippingNumber: tuple.donorShippingNumber,
-            },
-          });
+        const normalizedTuple = normalizeShippingTuple(tuple); 
+
+        const shippingStatus = await db.shippingStatus.findFirst({
+          where: {
+            hfhShippingNumber: normalizedTuple.hfhShippingNumber,
+            donorShippingNumber: normalizedTuple.donorShippingNumber,
+          },
+        });
 
-          if (shippingStatus) {
-            shipmentStatus = shippingStatus.value;
-          }
+        if (shippingStatus) {
+          shipmentStatus = shippingStatus.value;
         }
 
         items.push({

src/services/shippingStatusService.ts

@@ -513,19 +513,12 @@ export class ShippingStatusService {
       return { shippingStatuses: [], items: [], total: 0 };
     }
 
-    const lookupPairs = validPairs.filter(
-      (
-        pair
-      ): pair is { donorShippingNumber: string; hfhShippingNumber: string } =>
-        Boolean(pair.donorShippingNumber && pair.hfhShippingNumber)
-    );
-
-    const statusRecords = lookupPairs.length
+    const statusRecords = validPairs.length
       ? await db.shippingStatus.findMany({
           where: {
-            OR: lookupPairs.map((pair) => ({
-              donorShippingNumber: pair.donorShippingNumber,
-              hfhShippingNumber: pair.hfhShippingNumber,
+            OR: validPairs.map((pair) => ({
+              donorShippingNumber: pair.donorShippingNumber ?? null,
+              hfhShippingNumber: pair.hfhShippingNumber ?? null,
             })),
           },
         })

src/services/signOffService.ts

@@ -201,11 +201,11 @@ export class SignOffService {
           hfhShippingNumber: allocation.lineItem.hfhShippingNumber,
         };
 
-        if (hasShippingIdentifier(tuple) && tuple.donorShippingNumber && tuple.hfhShippingNumber) {
+        if (hasShippingIdentifier(tuple)) {
           const status = await db.shippingStatus.findFirst({
             where: {
-              donorShippingNumber: tuple.donorShippingNumber,
-              hfhShippingNumber: tuple.hfhShippingNumber,
+              donorShippingNumber: tuple.donorShippingNumber ?? null,
+              hfhShippingNumber: tuple.hfhShippingNumber ?? null,
             },
           });