CCM-10429: Fix PR comments

m-salaudeen · chris-elliott-nhsd · commit 54c147d677ee · 2025-09-30T13:36:45.000+01:00
diff --git a/data-migration/user-transfer/src/user-transfer.ts b/data-migration/user-transfer/src/user-transfer.ts
@@ -24,6 +24,10 @@ function getParameters(): Parameters {
         type: 'string',
         demandOption: true,
       },
+      component: {
+        type: 'string',
+        demandOption: true,
+      },
     })
     .parseSync();
 }
@@ -33,13 +37,13 @@ async function updateItems(
   parameters: Parameters
 ): Promise<void> {
   for (const item of items) {
-    console.log(item.owner.S);
+    console.log(item.id.S, item.owner.S);
 
     // Get owner id of this item
     const { owner, id, templateType, clientId } = item;
 
     //check if owner doesn't have CLIENT#
-    if (owner.S && !owner.S?.includes('CLIENT#')) {
+    if (owner.S && !owner.S?.startsWith('CLIENT#')) {
       // check the user in cognito, if it exist then pull the client id
       const cognitoUser = await findCognitoUser(owner.S);
 
@@ -65,10 +69,14 @@ async function updateItems(
       // if it matches make the required swaps (clientId, createdby and updatedby)
       // if item doesn't have a client id then create one and do the above
       // update the item and delete the previous one
-      await Promise.all([
-        updateItem(item, parameters, newClientId),
-        deleteItem(item, parameters),
-      ]);
+
+      // migrate and update item
+      await updateItem(item, parameters, newClientId);
+
+      // check if migration was successful
+
+      // delete migrated item
+      await deleteItem(item, parameters);
     }
 
     //
@@ -78,13 +86,10 @@ async function updateItems(
 
       //migrate to a new s3 location
       for (const itemObject of itemObjects) {
-        const versionId = itemObject['Key'].split('/').reverse();
         await Promise.all([
           copyObjects(
             owner.S as string,
             itemObject['Key'],
-            id.S as string,
-            versionId[0],
             clientId.S as string
           ),
           // delete previous objects
diff --git a/data-migration/user-transfer/src/utils/backup-utils.ts b/data-migration/user-transfer/src/utils/backup-utils.ts
@@ -1,5 +1,3 @@
-/* eslint-disable security/detect-non-literal-fs-filename */
-import fs from 'node:fs';
 import { AttributeValue } from '@aws-sdk/client-dynamodb';
 import { Parameters } from '@/src/utils/constants';
 import { getAccountId } from '@/src/utils/sts-utils';
@@ -23,27 +21,3 @@ export async function backupData(
   await writeJsonToFile(filePath, JSON.stringify(items), bucketName);
   console.log(`Backed up data to s3://${bucketName}/${filePath}`);
 }
-
-export async function backupDataLocal(
-  items: Record<string, AttributeValue>[]
-): Promise<void> {
-  console.log(`Found ${items.length} results`);
-  if (items.length <= 0) {
-    return;
-  }
-
-  const timestamp = new Date().toISOString().replaceAll(/[.:T-]/g, '_');
-
-  fs.writeFile(
-    `new-data-${timestamp}-templates.json`,
-    JSON.stringify(items),
-    (err) => {
-      if (err) {
-        console.log('Error writing file:', err);
-      } else {
-        console.log('Successfully wrote file');
-      }
-    }
-  );
-  console.log(`Data downloaded`);
-}
diff --git a/data-migration/user-transfer/src/utils/cognito-utils.ts b/data-migration/user-transfer/src/utils/cognito-utils.ts
@@ -68,10 +68,10 @@ async function getUserClientId(
 ): Promise<string | undefined> {
   if (userGroups && userGroups.length > 0) {
     const clientIdGroup = userGroups?.filter((group) =>
-      group.GroupName?.includes('client')
+      group.GroupName?.startsWith('client:')
     );
 
-    return clientIdGroup[0].GroupName?.split(':')[0];
+    return clientIdGroup[0].GroupName?.split(':')[1];
   }
 
   return undefined;
diff --git a/data-migration/user-transfer/src/utils/constants.ts b/data-migration/user-transfer/src/utils/constants.ts
@@ -2,4 +2,5 @@ export type Parameters = {
   sourceOwner?: string;
   destinationOwner?: string;
   environment: string;
+  component: string;
 };
diff --git a/data-migration/user-transfer/src/utils/ddb-utils.ts b/data-migration/user-transfer/src/utils/ddb-utils.ts
@@ -7,15 +7,15 @@ import {
   QueryCommandInput,
   ScanCommand,
   ScanCommandInput,
-  TransactWriteItemsCommand,
 } from '@aws-sdk/client-dynamodb';
 import { Parameters } from '@/src/utils/constants';
 
 const client = new DynamoDBClient({ region: 'eu-west-2' });
 
 // change 'sandbox' back to 'app' when testing on prod environment
-function getTableName(environment: string) {
-  return `nhs-notify-${environment}-sandbox-api-templates`;
+function getTableName(parameters: Parameters) {
+  const { environment, component } = parameters;
+  return `nhs-notify-${environment}-${component}-api-templates`;
 }
 
 export async function retrieveAllTemplates(
@@ -25,9 +25,9 @@ export async function retrieveAllTemplates(
   let lastEvaluatedKey = undefined;
   do {
     const query: ScanCommandInput = {
-      TableName: getTableName(parameters.environment),
+      TableName: getTableName(parameters),
       FilterExpression:
-        'attribute_exists(#owner) AND NOT contains(#owner, :subString)',
+        'attribute_exists(#owner) AND NOT begins_with(#owner, :subString)',
       ExpressionAttributeNames: { '#owner': 'owner' },
       ExpressionAttributeValues: { ':subString': { S: 'CLIENT#' } },
     };
@@ -46,14 +46,11 @@ export async function retrieveTemplates(
   let lastEvaluatedKey = undefined;
   do {
     const query: QueryCommandInput = {
-      TableName: getTableName(parameters.environment),
+      TableName: getTableName(parameters),
       KeyConditionExpression: '#owner = :owner',
       ExpressionAttributeNames: {
         '#owner': 'owner',
       },
-      ExpressionAttributeValues: {
-        ':owner': { S: parameters.sourceOwner as string },
-      },
       ExclusiveStartKey: lastEvaluatedKey,
     };
 
@@ -69,7 +66,7 @@ export async function updateItem(
   parameters: Parameters,
   newClientId: string
 ): Promise<void> {
-  const tableName = getTableName(parameters.environment);
+  const tableName = getTableName(parameters);
   console.log({ item, parameters, newClientId, tableName });
   await client.send(
     new PutItemCommand({
@@ -89,10 +86,11 @@ export async function deleteItem(
   item: Record<string, AttributeValue>,
   parameters: Parameters
 ) {
-  const tableName = getTableName(parameters.environment);
+  const tableName = getTableName(parameters);
   await client.send(
     new DeleteItemCommand({
       Key: {
+        id: item.id,
         owner: item.owner,
       },
       TableName: tableName,
diff --git a/data-migration/user-transfer/src/utils/s3-utils.ts b/data-migration/user-transfer/src/utils/s3-utils.ts
@@ -5,7 +5,8 @@ import {
   PutObjectCommandOutput,
   S3Client,
   NotFound,
-  ListObjectsV2Command,
+  paginateListObjectsV2,
+  HeadObjectCommand,
 } from '@aws-sdk/client-s3';
 import { Parameters } from '@/src/utils/constants';
 import { getAccountId } from './sts-utils';
@@ -34,20 +35,33 @@ export async function writeJsonToFile(
   );
 }
 
+async function listItemObjectsWithPaginator(bucket: string) {
+  const itemObjects = [];
+  const paginatedItemObjects = paginateListObjectsV2(
+    {
+      client: s3Client,
+      pageSize: 1000,
+    },
+    { Bucket: bucket }
+  );
+
+  for await (const page of paginatedItemObjects) {
+    if (page.Contents) {
+      itemObjects.push(...page.Contents.map((item) => item.Key));
+    }
+  }
+
+  return itemObjects.length > 0 ? itemObjects : [];
+}
+
 export async function getItemObjects(
   templateId: string
 ): Promise<unknown | void> {
   try {
-    const items = await s3Client.send(
-      new ListObjectsV2Command({
-        Bucket: sourceBucket,
-      })
-    );
+    const items = await listItemObjectsWithPaginator(sourceBucket as string);
 
-    if (items.Contents && items.Contents.length > 0) {
-      const itemObjects = items.Contents?.filter((item) =>
-        item['Key']?.includes(templateId)
-      );
+    if (items.length > 0) {
+      const itemObjects = items.filter((item) => item.includes(templateId));
       return itemObjects;
     } else {
       throw Error;
@@ -64,25 +78,35 @@ export async function getItemObjects(
 export async function copyObjects(
   owner: string,
   sourceKey: string,
-  templateId: string,
-  versionId: string,
   clientId: string
 ) {
   const destinationKey = sourceKey.replace(owner, clientId);
-  console.log({ sourceKey, destinationKey });
+
+  // Get existing metadata
+  const head = await s3Client.send(
+    new HeadObjectCommand({
+      Bucket: sourceBucket,
+      Key: sourceKey,
+    })
+  );
+
+  const existingMetadata = head.Metadata || {};
+
+  // 2. Update just the one key necessary
+  const { ['owner']: _, ...rest } = existingMetadata;
+  const updatedMetadata = {
+    ...rest,
+    ['client-id']: clientId,
+  };
   return await s3Client.send(
     new CopyObjectCommand({
       CopySource: `${sourceBucket}/${sourceKey}`,
       Bucket: sourceBucket,
       Key: destinationKey,
-      Metadata: {
-        'client-id': clientId,
-        'file-type': 'pdf-template',
-        'template-id': templateId,
-        'version-id': versionId,
-      },
+      Metadata: updatedMetadata,
       MetadataDirective: 'REPLACE',
       TaggingDirective: 'COPY',
+      ContentType: head.ContentType,
     })
   );
 }
@@ -102,24 +126,16 @@ export async function backupObject(parameters: Parameters) {
   const bucketName = `nhs-notify-${accountId}-eu-west-2-main-acct-migration-backup`;
   const key = `ownership-transfer/templates/s3-objects/${environment}/`;
 
-  const items = await s3Client.send(
-    new ListObjectsV2Command({
-      Bucket: sourceBucket,
-    })
-  );
-
-  if (items['Contents'] && items['Contents'].length <= 0) {
-    return;
-  }
+  const items = await listItemObjectsWithPaginator(sourceBucket as string);
 
-  console.log(`Found ${items['Contents']?.length} objects in S3`);
+  console.log(`Found ${items.length} objects in S3`);
 
-  for (const item of items['Contents']) {
+  for (const item of items) {
     await s3Client.send(
       new CopyObjectCommand({
         Bucket: bucketName,
-        Key: key + item.Key,
-        CopySource: `${sourceBucket}/${item.Key}`,
+        Key: key + item,
+        CopySource: `${sourceBucket}/${item}`,
         MetadataDirective: 'COPY',
       })
     );
diff --git a/package-lock.json b/package-lock.json
