Merge pull request #100 from arati-tekdi/main

Added condition for custom field
tekdi · Nov 23, 2024 · a3c4fcf · a3c4fcf
2 parents b75a609 + 459c5b9
commit a3c4fcf
Showing 1 changed file with 39 additions and 14 deletions.
diff --git a/src/adapters/postgres/cohortMembers-adapter.ts b/src/adapters/postgres/cohortMembers-adapter.ts
@@ -640,7 +640,7 @@ export class PostgresCohortMembersService {
 
     return result;
   }
-  //****
+
   public async updateCohortMembers(
     cohortMembershipId: string,
     loginUser: any,
@@ -694,20 +694,45 @@ export class PostgresCohortMembersService {
         HttpStatus.NOT_FOUND
       );
     }
-
-    const customFields = cohortMembersUpdateDto.customFields;
-    delete cohortMembersUpdateDto.customFields;
-    Object.assign(cohortMembershipToUpdate, cohortMembersUpdateDto);
-
-    await this.cohortMembersRepository.save(cohortMembershipToUpdate);
-    //update custom fields
-
-    let responseForCustomField = await this.processCustomFields(
-      customFields,
-      cohortMembershipId,
-      cohortMembersUpdateDto
+    let result = await this.cohortMembersRepository.save(
+      cohortMembershipToUpdate
     );
-    if (responseForCustomField.success) {
+    //update custom fields
+    let responseForCustomField;
+    if (
+      cohortMembersUpdateDto.customFields &&
+      cohortMembersUpdateDto.customFields.length > 0
+    ) {
+      const customFields = cohortMembersUpdateDto.customFields;
+      delete cohortMembersUpdateDto.customFields;
+      Object.assign(cohortMembershipToUpdate, cohortMembersUpdateDto);
+
+      responseForCustomField = await this.processCustomFields(
+        customFields,
+        cohortMembershipId,
+        cohortMembersUpdateDto
+      );
+      if (result && responseForCustomField.success) {
+        return APIResponse.success(
+          res,
+          apiId,
+          [],
+          HttpStatus.CREATED,
+          API_RESPONSES.COHORTMEMBER_UPDATE_SUCCESSFULLY
+        );
+      } else {
+        const errorMessage =
+          responseForCustomField.error || "Internal server error";
+        return APIResponse.error(
+          res,
+          apiId,
+          "Internal Server Error",
+          errorMessage,
+          HttpStatus.INTERNAL_SERVER_ERROR
+        );
+      }
+    }
+    if (result) {
       return APIResponse.success(
         res,
         apiId,