even more logging

Author: nhsd-david-wass

lambdas/supplier-allocator/src/handler/allocate-handler.ts

@@ -233,20 +233,21 @@ function emitDataMetrics(
 }
 
 function incrementAllocation(
-  volumeGroupAllocation: VolumeGroupAllocation,
+  volumeGroupAllocations: VolumeGroupAllocation,
   volumeGroupId: string,
   supplierId: string,
   allocation: number,
   deps: Deps,
 ) {
-  const groupAllocations = volumeGroupAllocation.get(volumeGroupId) ?? {};
+  const groupAllocations = volumeGroupAllocations.get(volumeGroupId) ?? {};
   groupAllocations[supplierId] =
     (groupAllocations[supplierId] ?? 0) + allocation;
-  volumeGroupAllocation.set(volumeGroupId, groupAllocations);
+  volumeGroupAllocations.set(volumeGroupId, groupAllocations);
   deps.logger.info({
     description: "Updated allocations for volume group and supplier",
     volumeGroupId,
     groupAllocations,
+    setVolumeGroupAllocations: volumeGroupAllocations.get(volumeGroupId),
   });
 }
 
@@ -283,6 +284,7 @@ async function processSupplierAllocation(
     eventId: letterEvent.id,
     domainId: letterEvent.data.domainId,
     letterVariantId: letterEvent.data.letterVariantId,
+    existingVolumeGroupAllocations: volumeGroupAllocations,
   });
   const supplierDetails: SupplierDetails = await getSupplierFromConfig(
     letterEvent,
@@ -311,6 +313,10 @@ async function processSupplierAllocation(
   } else {
     incrementMetric(perAllocationFailure, supplier, priority);
   }
+  deps.logger.info({
+    description: "Completed supplier allocation logic for letter event",
+    finalvolumeGroupAllocations: volumeGroupAllocations,
+  });
 
   // Send to allocated letters queue
   const queueUrl = process.env.UPSERT_LETTERS_QUEUE_URL;
@@ -400,6 +406,7 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
           letterVariantId: letterEvent.data.letterVariantId,
           supplier: supplierAllocationResult.supplier,
           priority: supplierAllocationResult.priority,
+          volumeGroupAllocations,
         });
         supplier = supplierAllocationResult.supplier;
         priority = supplierAllocationResult.priority;
@@ -411,7 +418,7 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
           letterVariantId: letterEvent.data.letterVariantId,
           supplier,
           priority,
-          volumeGroupAllocations,
+          volumeGroupAllocations: volumeGroupAllocations.entries(),
         });
       } catch (error) {
         deps.logger.error({
@@ -425,6 +432,12 @@ export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
       }
     });
 
+    deps.logger.info({
+      description: "awaiting completion of supplier allocation tasks for batch",
+      totalRecords: event.Records.length,
+      taskCount: tasks.length,
+      tasks,
+    });
     await Promise.all(tasks);
 
     emitMetrics(perAllocationSuccess, MetricStatus.Success, deps);

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

@@ -43,6 +43,12 @@ export async function updateSupplierAllocation(
   newAllocation: number,
   deps: Deps,
 ): Promise<void> {
+  deps.logger.info({
+    description: "Updating supplier allocation",
+    volumeGroupId,
+    supplierId,
+    newAllocation,
+  });
   await deps.supplierQuotasRepo.updateOverallAllocation(
     volumeGroupId,
     supplierId,