fix dates

Author: nhsd-david-wass

lambdas/supplier-allocator/src/services/__tests__/supplier-config.test.ts

@@ -122,6 +122,23 @@ describe("supplier-config service", () => {
       );
       expect(deps.logger.error).toHaveBeenCalled();
     });
+    it("returns group details when start date and end date are both today", async () => {
+      const today = new Date().toISOString();
+      const group = {
+        id: "g4",
+        status: "PROD",
+        startDate: today,
+        endDate: today,
+      } as any;
+      const deps = makeDeps();
+      deps.supplierConfigRepo.getVolumeGroup = jest
+        .fn()
+        .mockResolvedValue(group);
+
+      const result = await getVolumeGroupDetails("g4", deps);
+
+      expect(result).toBe(group);
+    });
   });
 
   describe("getSupplierAllocationsForVolumeGroup", () => {

lambdas/supplier-allocator/src/services/supplier-config.ts

@@ -22,16 +22,15 @@ export async function getVolumeGroupDetails(
   const groupDetails: VolumeGroup =
     await deps.supplierConfigRepo.getVolumeGroup(groupId);
 
-  deps.logger.info({
-    description: "Comparing dates for volume group",
-    startdate: new Date(groupDetails.startDate),
-    endDate: groupDetails.endDate ? new Date(groupDetails.endDate) : null,
-    currentDate: new Date(),
-  });
+  const startOfDay = new Date();
+  startOfDay.setHours(0, 0, 0, 0);
+  const endOfDay = new Date();
+  endOfDay.setHours(23, 59, 59, 999);
+
   if (
     groupDetails.status === "PROD" &&
-    new Date(groupDetails.startDate) <= new Date() &&
-    (!groupDetails.endDate || new Date(groupDetails.endDate) >= new Date())
+    new Date(groupDetails.startDate) < endOfDay &&
+    (!groupDetails.endDate || new Date(groupDetails.endDate) > startOfDay)
   ) {
     return groupDetails;
   }