Fix : Duplicatecode for bulk upload

tekdi · Mar 3, 2025 · 631d127 · 631d127
1 parent cbb3a24
commit 631d127
Showing 1 changed file with 31 additions and 66 deletions.
diff --git a/src/adapters/postgres/user-adapter.ts b/src/adapters/postgres/user-adapter.ts
@@ -954,78 +954,43 @@ export class PostgresUserService implements IServicelocator {
     }
   }
   async bulkCreateUser(request: any, userCreateDto: UserCreateDto, response: Response) {
-      // check and validate all fields
-      let validatedRoles = await this.validateRequestBody(userCreateDto)
-
-      if (
-        validatedRoles &&
-        Array.isArray(validatedRoles) &&
-        validatedRoles.length > 0
-      ) {
-        const errorMessage = validatedRoles.join("; ");
-        throw new Error(errorMessage);
-      } else if (validatedRoles) {
-        throw new Error("Validation Error");
-      }
+    // check and validate all fields
+    let validatedRoles = await this.validateRequestBody(userCreateDto)
+
+    if (
+      validatedRoles &&
+      Array.isArray(validatedRoles) &&
+      validatedRoles.length > 0
+    ) {
+      const errorMessage = validatedRoles.join("; ");
+      throw new Error(errorMessage);
+    } else if (validatedRoles) {
+      throw new Error("Validation Error");
+    }
 
-      userCreateDto.username = userCreateDto.username.toLocaleLowerCase();
-      const userSchema = new UserCreateDto(userCreateDto);
+    userCreateDto.username = userCreateDto.username.toLocaleLowerCase();
+    const userSchema = new UserCreateDto(userCreateDto);
 
-      let errKeycloak = "";
-      let resKeycloak = "";
+    let errKeycloak = "";
+    let resKeycloak = "";
 
-      const keycloakResponse = await getKeycloakAdminToken();
-      const token = keycloakResponse.data.access_token;
-      let checkUserinKeyCloakandDb = await this.checkUserinKeyCloakandDb(userCreateDto)
-      // let checkUserinDb = await this.checkUserinKeyCloakandDb(userCreateDto.username);
-      if (checkUserinKeyCloakandDb) {
-        throw new Error('User Already Exist') 
+    const keycloakResponse = await getKeycloakAdminToken();
+    const token = keycloakResponse.data.access_token;
+    let checkUserinKeyCloakandDb = await this.checkUserinKeyCloakandDb(userCreateDto)
+    // let checkUserinDb = await this.checkUserinKeyCloakandDb(userCreateDto.username);
+    if (checkUserinKeyCloakandDb) {
+      throw new Error('User Already Exist') 
+    }
+    resKeycloak = await createUserInKeyCloak(userSchema, token).catch(
+      (error) => {
+        errKeycloak = error.response?.data.errorMessage;
+        throw new Error(errKeycloak);
       }
-      resKeycloak = await createUserInKeyCloak(userSchema, token).catch(
-        (error) => {
-          errKeycloak = error.response?.data.errorMessage;
-          throw new Error(errKeycloak);
-        }
-      );
-
-      userCreateDto.userId = resKeycloak;
-
-      let result = await this.createUserInDatabase(request, userCreateDto, response);
-
-      const createFailures = [];
-      if (result && userCreateDto.customFields && userCreateDto.customFields.length > 0) {
-
-        let userId = result?.userId;
-        let roles;
-
-        if (validatedRoles) {
-          roles = validatedRoles?.map(({ code }) => code?.toUpperCase())
-        }
-
-        const customFields = await this.fieldsService.findCustomFields("USERS", roles)
-
-        if (customFields) {
-          const customFieldAttributes = customFields.reduce((fieldDetail, { fieldId, fieldAttributes, fieldParams, name }) => fieldDetail[`${fieldId}`] ? fieldDetail : { ...fieldDetail, [`${fieldId}`]: { fieldAttributes, fieldParams, name } }, {});
-
-
-          for (let fieldValues of userCreateDto.customFields) {
-            const fieldData = {
-              fieldId: fieldValues['fieldId'],
-              value: fieldValues['value']
-            }
+    );
 
-            let res = await this.fieldsService.updateCustomFields(userId, fieldData, customFieldAttributes[fieldData.fieldId]);
+    userCreateDto.userId = resKeycloak;
 
-            if (res.correctValue) {
-              if (!result['customFields'])
-                result['customFields'] = [];
-              result["customFields"].push(res);
-            } else {
-              createFailures.push(`${fieldData.fieldId}: ${res?.valueIssue} - ${res.fieldName}`)
-            }
-          }
-        }
-      }
+    let result = await this.createUserInDatabase(request, userCreateDto, response);
   }
 
   async bulkUploadUsers(request: any,csvFile :any, response: Response) {