Issue #SH-489 fix:teacher form not updating as expected (#4405)

src/app/client/src/app/plugins/profile/components/submit-teacher-details/submit-teacher-details.component.spec.data.ts

@@ -558,5 +558,23 @@ export const mockRes = {
         'tncAcceptedVersion': 'v1'
       }
     }
+  },
+  externalId: [
+    {
+      "idType": "declared-ext-id",
+      "provider": "tp",
+      "id": "p"
+    },
+    {
+      "idType": "declared-school-name",
+      "provider": "tp",
+      "id": "2222"
+    }
+  ],
+  stateDetails: {
+    'code': '50',
+    'name': 'mock state',
+    'id': '969dd3c1-4e9',
+    'type': 'state'
   }
 };

src/app/client/src/app/plugins/profile/components/submit-teacher-details/submit-teacher-details.component.spec.ts

@@ -227,5 +227,33 @@ describe('SubmitTeacherDetailsComponent', () => {
     const data = component.isStateChanged();
     expect(data).toBe(false);
   });
+
+  it('should return add operation as form action is submit', () => {
+    component.formAction = 'submit';
+    const data = component.getOperation('declared-school-name', 'tp', '2222');
+    expect(data).toBe('add');
+  });
+
+  it('should return add operation as form action is update and state changed', () => {
+    const userData = mockRes.userData.result.response;
+    const state = component.userDetailsForm.controls['state'];
+    state.setValue(mockRes.stateDetails);
+    component.formAction = 'update';
+    userData.externalIds = mockRes.externalId;
+    component.userProfile = userData;
+    const data = component.getOperation('declared-school-name', 'tp', '2222');
+    expect(data).toBe('add');
+  });
+
+  it('should return edit operation as form action is update and value present in userprofile', () => {
+    const userData = mockRes.userData.result.response;
+    const state = component.userDetailsForm.controls['state'];
+    state.setValue(userData.userLocations[1]);
+    component.formAction = 'update';
+    userData.externalIds = mockRes.externalId;
+    component.userProfile = userData;
+    const data = component.getOperation('declared-school-name', 'tp', '2222');
+    expect(data).toBe('edit');
+  });
   
 });

src/app/client/src/app/plugins/profile/components/submit-teacher-details/submit-teacher-details.component.ts

@@ -236,6 +236,25 @@ export class SubmitTeacherDetailsComponent implements OnInit, OnDestroy {
     return isStateChanged;
   }
 
+  getOperation(fieldType, provider, inputFieldValue) {
+    let operation;
+    if (this.formAction === 'submit' || this.formAction === 'update' && this.isStateChanged()) {
+      operation = 'add'
+    } else {
+      const externalIdObj = this.findExternalIdObj(fieldType, provider);
+      operation = externalIdObj ? inputFieldValue ? 'edit' : 'remove' : 'add';
+    }
+    return operation;
+  }
+
+  findExternalIdObj(fieldType, provider) {
+    const externalIds = _.get(this.userProfile, 'externalIds');
+    const externalIdObj = _.find(externalIds, function (externalId) {
+      return (externalId.idType === fieldType && externalId.provider === provider)
+    });
+    return externalIdObj && externalIdObj.id
+  }
+
   onSubmitForm() {
     this.searchService.getOrganisationDetails({ locationIds: [_.get(this.userDetailsForm, 'value.state.id')] }).pipe(
       takeUntil(this.unsubscribe))
@@ -246,34 +265,26 @@ export class SubmitTeacherDetailsComponent implements OnInit, OnDestroy {
           if (_.get(this.userDetailsForm, 'value.state.code')) { locationCodes.push(_.get(this.userDetailsForm, 'value.state.code')); }
           if (_.get(this.userDetailsForm, 'value.district')) { locationCodes.push(_.get(this.userDetailsForm, 'value.district')); }
           const provider = _.get(orgData, 'result.response.content[0].channel');
-          let operation = this.formAction === 'submit' ? 'add' : 'edit';
           let externalIds = [];
           if (this.formAction === 'update' && this.isStateChanged() || provider !== _.get(this.userProfile, 'externalIds[0].provider')) {
-            operation = 'add';
             const extIds = this.userProfile.externalIds || [];
             _.forEach(extIds, (externalId, index) => {
               extIds[index]['operation'] = 'remove';
             });
             externalIds = extIds.concat(externalIds);
           }
-          if (_.get(this.userDetailsForm, 'value.school')) {
-            externalIds.push({
-              id: _.get(this.userDetailsForm, 'value.school'),
-              operation, idType: 'declared-school-name', provider
-            });
-          }
-          if (_.get(this.userDetailsForm, 'value.udiseId')) {
-            externalIds.push({
-              id: _.get(this.userDetailsForm, 'value.udiseId'),
-              operation, idType: 'declared-school-udise-code', provider
-            });
-          }
-          if (_.get(this.userDetailsForm, 'value.teacherId')) {
-            externalIds.push({
-              id: _.get(this.userDetailsForm, 'value.teacherId'),
-              operation, idType: 'declared-ext-id', provider
-            });
-          }
+          const fields = new Map([['value.school', 'declared-school-name'], ['value.udiseId', 'declared-school-udise-code'], ['value.teacherId', 'declared-ext-id']]);
+          fields.forEach((fieldKey, formKey) => {
+            const id = _.get(this.userDetailsForm, formKey) || this.findExternalIdObj(fieldKey, provider);
+            if (id) {
+              externalIds.push({
+                id,
+                operation: this.getOperation(fieldKey, provider, _.get(this.userDetailsForm, formKey)),
+                idType: fieldKey,
+                provider
+              });
+            }
+          });
           const data = {
             userId: this.userService.userid,
             locationCodes,