Merge branch 'main' into forms-960-idp-refactor

usingtechnology · Jan 26, 2024 · 48269b1 · 48269b1
2 parents 22a4377 + 7cb9c4e
commit 48269b1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/app/src/forms/common/constants.js b/app/src/forms/common/constants.js
@@ -58,6 +58,9 @@ module.exports = Object.freeze({
     FORM_SUBMITTED: 'eventSubmission',
     FORM_STATUS_CHANGE: 'eventStatusChange',
     FORM_ASSIGNMENT: 'eventAssignment',
+    FORM_PUBLISHED: 'eventFormPublished',
+    FORM_DRAFT_PUBLISHED: 'eventFormDraftPublished',
+    FORM_UNPUBLISHED: 'eventFormUnPublished',
   },
   StorageTypes: {
     UPLOADS: 'uploads',

diff --git a/app/src/forms/form/service.js b/app/src/forms/form/service.js
@@ -384,6 +384,21 @@ const service = {
 
       await trx.commit();
 
+      const { subscribe } = await service.readForm(formId);
+      if (subscribe && subscribe.enabled) {
+        const subscribeConfig = await service.readFormSubscriptionDetails(formId);
+        const config = Object.assign({}, subscribe, subscribeConfig);
+        const formVersion = new FormVersion();
+        formVersion.id = formVersionId;
+        formVersion.formId = formId;
+
+        if (publish) {
+          service.postSubscriptionEvent(config, formVersion, null, SubscriptionEvent.FORM_PUBLISHED);
+        } else {
+          service.postSubscriptionEvent(config, formVersion, null, SubscriptionEvent.FORM_UNPUBLISHED);
+        }
+      }
+
       // return the published form/version...
       return await service.readPublishedForm(formId);
     } catch (err) {
@@ -483,11 +498,11 @@ const service = {
         };
 
         await FormSubmissionStatus.query(trx).insert(stObj);
-      }
-      if (subscribe && subscribe.enabled) {
-        const subscribeConfig = await service.readFormSubscriptionDetails(formVersion.formId);
-        const config = Object.assign({}, subscribe, subscribeConfig);
-        service.postSubscriptionEvent(config, formVersion, submissionId, SubscriptionEvent.FORM_SUBMITTED);
+        if (subscribe && subscribe.enabled) {
+          const subscribeConfig = await service.readFormSubscriptionDetails(formVersion.formId);
+          const config = Object.assign({}, subscribe, subscribeConfig);
+          service.postSubscriptionEvent(config, formVersion, submissionId, SubscriptionEvent.FORM_SUBMITTED);
+        }
       }
 
       // does this submission contain any file uploads?
@@ -670,6 +685,16 @@ const service = {
       await FormVersionDraft.query().deleteById(formVersionDraftId);
       await trx.commit();
 
+      const { subscribe } = await service.readForm(formId);
+      if (subscribe && subscribe.enabled) {
+        const subscribeConfig = await service.readFormSubscriptionDetails(formId);
+        const config = Object.assign({}, subscribe, subscribeConfig);
+        const formVersion = new FormVersion();
+        formVersion.id = version.id;
+        formVersion.formId = formId;
+        service.postSubscriptionEvent(config, formVersion, null, SubscriptionEvent.FORM_DRAFT_PUBLISHED);
+      }
+
       // return the published version...
       return await service.readVersion(version.id);
     } catch (err) {
@@ -748,7 +773,10 @@ const service = {
       if (subscribe && subscribe.endpointUrl) {
         const axiosOptions = { timeout: 10000 };
         const axiosInstance = axios.create(axiosOptions);
-        const jsonData = { formId: formVersion.formId, formVersion: formVersion.id, submissionId: submissionId, subscriptionEvent: subscriptionEvent };
+        const jsonData = { formId: formVersion.formId, formVersion: formVersion.id, subscriptionEvent: subscriptionEvent };
+        if (submissionId != null) {
+          jsonData['submissionId'] = submissionId;
+        }
 
         axiosInstance.interceptors.request.use(
           (cfg) => {
@@ -759,7 +787,6 @@ const service = {
             return Promise.reject(error);
           }
         );
-
         axiosInstance.post(subscribe.endpointUrl, jsonData);
       }
     } catch (err) {