Fix existing database access

Author: nhsd-david-wass

internal/datastore/src/__test__/db.ts

@@ -151,14 +151,14 @@ const createSupplierConfigTableCommand = new CreateTableCommand({
   TableName: "supplier-config",
   BillingMode: "PAY_PER_REQUEST",
   KeySchema: [
-    { AttributeName: "PK", KeyType: "HASH" }, // Partition key
-    { AttributeName: "SK", KeyType: "RANGE" }, // Sort key
+    { AttributeName: "pk", KeyType: "HASH" }, // Partition key
+    { AttributeName: "sk", KeyType: "RANGE" }, // Sort key
   ],
   GlobalSecondaryIndexes: [
     {
       IndexName: "volumeGroup-index",
       KeySchema: [
-        { AttributeName: "PK", KeyType: "HASH" }, // Partition key for GSI
+        { AttributeName: "pk", KeyType: "HASH" }, // Partition key for GSI
         { AttributeName: "volumeGroup", KeyType: "RANGE" }, // Sort key for GSI
       ],
       Projection: {
@@ -167,8 +167,8 @@ const createSupplierConfigTableCommand = new CreateTableCommand({
     },
   ],
   AttributeDefinitions: [
-    { AttributeName: "PK", AttributeType: "S" },
-    { AttributeName: "SK", AttributeType: "S" },
+    { AttributeName: "pk", AttributeType: "S" },
+    { AttributeName: "sk", AttributeType: "S" },
     { AttributeName: "volumeGroup", AttributeType: "S" },
   ],
 });

internal/datastore/src/__test__/supplier-config-repository.test.ts

@@ -9,8 +9,8 @@ import { SupplierConfigRepository } from "../supplier-config-repository";
 
 function createLetterVariantItem(variantId: string) {
   return {
-    PK: "LETTER_VARIANT",
-    SK: variantId,
+    pk: "ENTITY#letter-variant",
+    sk: `ID#${variantId}`,
     id: variantId,
     name: `Variant ${variantId}`,
     description: `Description for variant ${variantId}`,
@@ -29,8 +29,8 @@ function createVolumeGroupItem(groupId: string, status = "PROD") {
     .toISOString()
     .split("T")[0]; // Ends in a day to ensure it's active based on end date. Tests can override this if needed.
   return {
-    PK: "VOLUME_GROUP",
-    SK: groupId,
+    pk: "ENTITY#volume-group",
+    sk: `ID#${groupId}`,
     id: groupId,
     name: `Volume Group ${groupId}`,
     description: `Description for volume group ${groupId}`,
@@ -46,8 +46,8 @@ function createSupplierAllocationItem(
   supplier: string,
 ) {
   return {
-    PK: `SUPPLIER_ALLOCATION`,
-    SK: allocationId,
+    pk: "ENTITY#supplier-allocation",
+    sk: `ID#${allocationId}`,
     id: allocationId,
     status: "PROD",
     volumeGroup: groupId,
@@ -58,8 +58,8 @@ function createSupplierAllocationItem(
 
 function createSupplierItem(supplierId: string) {
   return {
-    PK: "SUPPLIER",
-    SK: supplierId,
+    pk: "ENTITY#supplier",
+    sk: `ID#${supplierId}`,
     id: supplierId,
     name: `Supplier ${supplierId}`,
     channelType: "LETTER",

internal/datastore/src/supplier-config-repository.ts

@@ -28,7 +28,7 @@ export class SupplierConfigRepository {
     const result = await this.ddbClient.send(
       new GetCommand({
         TableName: this.config.supplierConfigTableName,
-        Key: { PK: "LETTER_VARIANT", SK: variantId },
+        Key: { pk: "ENTITY#letter-variant", sk: `ID#${variantId}` },
       }),
     );
     if (!result.Item) {
@@ -42,7 +42,7 @@ export class SupplierConfigRepository {
     const result = await this.ddbClient.send(
       new GetCommand({
         TableName: this.config.supplierConfigTableName,
-        Key: { PK: "VOLUME_GROUP", SK: groupId },
+        Key: { pk: "ENTITY#volume-group", sk: `ID#${groupId}` },
       }),
     );
     if (!result.Item) {
@@ -61,12 +61,12 @@ export class SupplierConfigRepository {
         KeyConditionExpression: "#pk = :pk AND #group = :groupId",
         FilterExpression: "#status = :status ",
         ExpressionAttributeNames: {
-          "#pk": "PK",
+          "#pk": "pk",
           "#group": "volumeGroup",
           "#status": "status",
         },
         ExpressionAttributeValues: {
-          ":pk": "SUPPLIER_ALLOCATION",
+          ":pk": "ENTITY#supplier-allocation",
           ":groupId": groupId,
           ":status": "PROD",
         },
@@ -87,7 +87,7 @@ export class SupplierConfigRepository {
       const result = await this.ddbClient.send(
         new GetCommand({
           TableName: this.config.supplierConfigTableName,
-          Key: { PK: "SUPPLIER", SK: supplierId },
+          Key: { pk: "ENTITY#supplier", sk: `ID#${supplierId}` },
         }),
       );
       if (!result.Item) {