fix(admin-form.service): fixed logical error in duplicate form field (#…

…2301)

* fix(admin-form.service): fixed logical error in duplicate form field

* docs(admin-form.service): updated comments for duplicateFormField

src/app/modules/form/admin-form/admin-form.service.ts

@@ -499,7 +499,12 @@ export const duplicateFormField = (
     },
   ).andThen((updatedForm) => {
     if (!updatedForm) {
-      return errAsync(new FormNotFoundError())
+      // Success means field is in initial form object but query still returned null.
+      // Return best guess error that form is now not found in the DB.
+      // Otherwise, err(FieldNotFoundError) will be returned by the function.
+      return getFormField(form, fieldId).asyncAndThen(() =>
+        errAsync(new FormNotFoundError()),
+      )
     }
     const updatedField = last(updatedForm.form_fields)
     return updatedField

src/app/routes/api/v3/admin/forms/__tests__/admin-forms.form.routes.spec.ts

@@ -1743,7 +1743,9 @@ describe('admin-form.form.routes', () => {
 
       // Assert
       expect(response.status).toEqual(404)
-      expect(response.body).toEqual({ message: 'Form not found' })
+      expect(response.body).toEqual({
+        message: `Attempted to retrieve field ${randomFieldId} from ${formToUpdate._id} but field was not present`,
+      })
     })
 
     it('should return 410 when form is already archived', async () => {