DNM: Integration form engine 2

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/address.graphql.js

@@ -0,0 +1,14 @@
+/*
+ *
+ * The "Address" Digital Form pattern.
+ *
+ * Pattern documentation:
+ * https://design.va.gov/patterns/ask-users-for/addresses
+ *
+ */
+module.exports = `
+  fragment address on ParagraphDigitalFormAddress {
+    fieldTitle
+    fieldMilitaryAddressCheckbox
+  }
+`;

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/address.graphql.unit.spec.js

@@ -0,0 +1,13 @@
+/* eslint-disable @department-of-veterans-affairs/axe-check-required */
+
+import { expect } from 'chai';
+import address from './address.graphql';
+
+describe('address fragment', () => {
+  it('includes fieldTitle', () => {
+    expect(address).to.have.string('fieldTitle');
+  });
+  it('includes fieldMilitaryAddressCheckbox', () => {
+    expect(address).to.have.string('fieldMilitaryAddressCheckbox');
+  });
+});

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/digitalForm.graphql.js

@@ -1,3 +1,5 @@
+const address = require('./address.graphql');
+const identificationInformation = require('./identificationInformation.graphql');
 const nameAndDateOfBirth = require('./nameAndDateOfBirth.graphql');
 
 /*
@@ -6,13 +8,19 @@ const nameAndDateOfBirth = require('./nameAndDateOfBirth.graphql');
  *
  */
 module.exports = `
+  ${address}
+  ${identificationInformation}
   ${nameAndDateOfBirth}
 
   fragment digitalForm on NodeDigitalForm {
     nid
     entityLabel
     fieldVaFormNumber
     fieldOmbNumber
+    fieldRespondentBurden
+    fieldExpirationDate {
+      value
+    }
     fieldChapters {
       entity {
         entityId
@@ -22,6 +30,8 @@ module.exports = `
             entityLabel
           }
         }
+        ...address
+        ...identificationInformation
         ...nameAndDateOfBirth
       }
     }

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/digitalForm.graphql.unit.spec.js

@@ -8,11 +8,26 @@ describe('digitalForm fragment', () => {
     expect(digitalForm).to.have.string('nid');
     expect(digitalForm).to.have.string('entityLabel');
     expect(digitalForm).to.have.string('fieldVaFormNumber');
-    expect(digitalForm).to.have.string('fieldOmbNumber');
     expect(digitalForm).to.have.string('fieldChapters');
   });
 
+  it('include OMB info', () => {
+    expect(digitalForm).to.have.string('fieldOmbNumber');
+    expect(digitalForm).to.have.string('fieldRespondentBurden');
+    expect(digitalForm).to.have.string('fieldExpirationDate');
+  });
+
   describe('chapter fragments', () => {
+    it('imports the address fragment', () => {
+      expect(digitalForm).to.have.string('fragment address');
+      expect(digitalForm).to.have.string('...address');
+    });
+
+    it('imports the identificationInformation fragment', () => {
+      expect(digitalForm).to.have.string('fragment identificationInformation');
+      expect(digitalForm).to.have.string('...identificationInformation');
+    });
+
     it('imports the nameAndDateOfBirth fragment', () => {
       expect(digitalForm).to.have.string('fragment nameAndDateOfBirth');
       expect(digitalForm).to.have.string('...nameAndDateOfBirth');

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/identificationInformation.graphql.js

@@ -0,0 +1,14 @@
+/*
+ *
+ * The "Identification Information" Digital Form pattern.
+ *
+ * Pattern documentation:
+ * https://design.va.gov/patterns/ask-users-for/social-security-number
+ *
+ */
+module.exports = `
+  fragment identificationInformation on ParagraphDigitalFormIdentificationInfo {
+    fieldTitle
+    fieldIncludeVeteranSService
+  }
+`;

src/site/stages/build/drupal/static-data-files/digitalForm/fragments/identificationInformation.graphql.unit.spec.js

@@ -0,0 +1,15 @@
+/* eslint-disable @department-of-veterans-affairs/axe-check-required */
+
+import { expect } from 'chai';
+import identificationInformation from './identificationInformation.graphql';
+
+describe('identificationInformation fragment', () => {
+  it('includes fieldTitle', () => {
+    expect(identificationInformation).to.have.string('fieldTitle');
+  });
+  it('includes fieldIncludeVeteranSService', () => {
+    expect(identificationInformation).to.have.string(
+      'fieldIncludeVeteranSService',
+    );
+  });
+});

src/site/stages/build/drupal/static-data-files/digitalForm/postProcessDigitalForm.js

@@ -2,15 +2,34 @@ const { logDrupal } = require('../../utilities-drupal');
 
 const extractAdditionalFields = entity => {
   const additionalFields = {};
+  const { entityId } = entity.type.entity;
 
-  if (entity.type.entity.entityId === 'digital_form_name_and_date_of_bi') {
-    additionalFields.includeDateOfBirth = entity.fieldIncludeDateOfBirth;
+  switch (entityId) {
+    case 'digital_form_address':
+      additionalFields.militaryAddressCheckbox =
+        entity.fieldMilitaryAddressCheckbox;
+      break;
+    case 'digital_form_name_and_date_of_bi':
+      additionalFields.includeDateOfBirth = entity.fieldIncludeDateOfBirth;
+      break;
+    case 'digital_form_identification_info':
+      additionalFields.includeServiceNumber =
+        entity.fieldIncludeVeteranSService;
+      break;
+    default:
+      break;
   }
 
   return additionalFields;
 };
 const extractForms = resultObject => resultObject?.data?.nodeQuery?.entities;
 
+const formatDate = dateString => {
+  const removeLeadingZero = s => s.replace(/^0+/, '');
+  const [year, month, day] = dateString.split('-');
+  return `${removeLeadingZero(month)}/${removeLeadingZero(day)}/${year}`;
+};
+
 const normalizeChapter = ({ entity }) => {
   return {
     id: parseInt(entity.entityId, 10),
@@ -27,7 +46,11 @@ const normalizeForm = (form, logger = logDrupal) => {
       cmsId: form.nid,
       formId: form.fieldVaFormNumber,
       title: form.entityLabel,
-      ombNumber: form.fieldOmbNumber,
+      ombInfo: {
+        expDate: formatDate(form.fieldExpirationDate.value),
+        ombNumber: form.fieldOmbNumber,
+        resBurden: form.fieldRespondentBurden,
+      },
       chapters: form.fieldChapters.map(normalizeChapter),
     };
   } catch (error) {