10007: Fix create users local script

flexion · Feb 19, 2024 · 0692d2c · 0692d2c
1 parent 3f579b3
commit 0692d2c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 47 deletions.
diff --git a/web-api/src/persistence/dynamo/users/createOrUpdateUser.ts b/web-api/src/persistence/dynamo/users/createOrUpdateUser.ts
@@ -65,7 +65,7 @@ export const createUserRecords = async ({
   applicationContext: ServerApplicationContext;
   user: any;
   userId: string;
-}): Promise<{ userId: string }> => {
+}) => {
   delete user.password;
 
   if (user.barNumber === '') {
@@ -154,6 +154,7 @@ export const createUserRecords = async ({
   }
 
   return {
+    ...user,
     userId,
   };
 };
diff --git a/web-api/src/persistence/dynamo/users/createPetitionerUserRecords.ts b/web-api/src/persistence/dynamo/users/createPetitionerUserRecords.ts
@@ -1,11 +1,12 @@
 import * as client from '../../dynamodbClientService';
+import { ServerApplicationContext } from '@web-api/applicationContext';
 
 export const createPetitionerUserRecords = async ({
   applicationContext,
   user,
   userId,
 }: {
-  applicationContext: IApplicationContext;
+  applicationContext: ServerApplicationContext;
   user: any;
   userId: string;
 }) => {

diff --git a/web-api/storage/scripts/createUsers.ts b/web-api/storage/scripts/createUsers.ts
@@ -1,4 +1,7 @@
-import { ROLES } from '../../../shared/src/business/entities/EntityConstants';
+import {
+  ROLES,
+  Role,
+} from '../../../shared/src/business/entities/EntityConstants';
 import { createApplicationContext } from '../../src/applicationContext';
 import { createPetitionerUserRecords } from '../../../web-api/src/persistence/dynamo/users/createPetitionerUserRecords';
 import { createUserRecords as createPractitionerUserRecords } from '../../../web-api/src/persistence/dynamo/users/createOrUpdatePractitionerUser';
@@ -13,71 +16,63 @@ const EXCLUDE_PROPS = ['pk', 'sk', 'userId'];
 export const createUsers = async () => {
   usersByEmail = {};
 
-  const user = {
+  const applicationContext = createApplicationContext({
     role: ROLES.admin,
-  };
-
-  const applicationContext = createApplicationContext(user);
+  });
 
   await Promise.all(
-    users.map(userRecord => {
+    users.map(async userRecord => {
       if (!userRecord.userId) {
         throw new Error('User has no uuid');
       }
 
-      const { userId } = userRecord;
-
-      if (
-        [
-          ROLES.irsPractitioner,
-          ROLES.privatePractitioner,
-          ROLES.inactivePractitioner,
-        ].includes(userRecord.role)
-      ) {
-        return createPractitionerUserRecords({
+      const practitionerRoles: Role[] = [
+        ROLES.irsPractitioner,
+        ROLES.privatePractitioner,
+        ROLES.inactivePractitioner,
+      ];
+      if (practitionerRoles.includes(userRecord.role as Role)) {
+        const userCreated = await createPractitionerUserRecords({
           applicationContext,
           user: omit(userRecord, EXCLUDE_PROPS),
-          userId,
-        }).then(userCreated => {
-          if (usersByEmail[userCreated.email]) {
-            throw new Error('User already exists');
-          }
-          usersByEmail[userCreated.email] = userCreated;
+          userId: userRecord.userId,
         });
+
+        if (usersByEmail[userCreated.email]) {
+          throw new Error(`User ${JSON.stringify(userRecord)} already exists`);
+        }
+
+        usersByEmail[userCreated.email] = userCreated;
+        return;
       }
 
       if (userRecord.role === ROLES.petitioner) {
-        return createPetitionerUserRecords({
+        const userCreated = await createPetitionerUserRecords({
           applicationContext,
           user: omit(userRecord, EXCLUDE_PROPS),
-          userId,
-        }).then(userCreated => {
-          if (usersByEmail[userCreated.email]) {
-            throw new Error('User already exists');
-          }
-          usersByEmail[userCreated.email] = userCreated;
+          userId: userRecord.userId,
         });
-      }
 
-      return createUserRecords({
-        applicationContext,
-        user: omit(userRecord, EXCLUDE_PROPS),
-        userId,
-      }).then(userCreated => {
         if (usersByEmail[userCreated.email]) {
-          throw new Error('User already exists');
+          throw new Error(`User ${JSON.stringify(userRecord)} already exists`);
         }
+
         usersByEmail[userCreated.email] = userCreated;
+        return;
+      }
+
+      const userCreated = await createUserRecords({
+        applicationContext,
+        user: omit(userRecord, EXCLUDE_PROPS),
+        userId: userRecord.userId,
       });
+
+      if (usersByEmail[userCreated.email]) {
+        throw new Error(`User ${JSON.stringify(userRecord)} already exists`);
+      }
+
+      usersByEmail[userCreated.email] = userCreated;
+      return;
     }),
   );
 };
-
-export const asUserFromEmail = async (email, callback) => {
-  const asUser = usersByEmail[email];
-  if (!asUser) {
-    throw new Error('User not found');
-  }
-  const applicationContext = createApplicationContext(asUser);
-  return await callback(applicationContext);
-};