ccfri-4568 - fix blank Facility Start Date error and code clean up

Author: vietle-cgi

backend/src/components/facility.js

@@ -30,9 +30,7 @@ function buildNewFacilityPayload(req) {
 function mapFacilityObjectForBack(data) {
   const facilityForBack = new MappableObjectForBack(data, FacilityMappings).toJSON();
 
-  if (facilityForBack.ccof_facilitystartdate) {
-    facilityForBack.ccof_facilitystartdate = `${facilityForBack.ccof_facilitystartdate}-01-01`;
-  }
+  facilityForBack.ccof_facilitystartdate = facilityForBack.ccof_facilitystartdate ? `${facilityForBack.ccof_facilitystartdate}-01-01` : null;
   if (facilityForBack.ccof_licensestartdate) {
     facilityForBack.ccof_licensestartdate = facilityForBack.ccof_licensestartdate + 'T12:00:00-07:00';
   }

frontend/src/components/ccofApplication/group/FacilityInformation.vue

@@ -50,7 +50,7 @@
               </v-radio-group>
             </div>
             <AppAddressForm
-              v-if="model.isFacilityAddressSameAsOrgStreetAddress === false"
+              v-if="showFacilityAddressForm"
               :disabled="isLocked"
               :manual-entry="model.isFacilityAddressEnteredManually"
               :address="model.facilityAddress"
@@ -80,7 +80,7 @@
                 <v-radio label="Yes" :value="true" />
                 <v-radio label="No" :value="false" />
               </v-radio-group>
-              <template v-if="model.isFacilityContactSameAsOrgContact === false">
+              <template v-if="showFacilityContactForm">
                 <v-row>
                   <v-col cols="12" md="6">
                     <v-text-field
@@ -240,6 +240,14 @@ export default {
     }
     next();
   },
+  computed: {
+    showFacilityAddressForm() {
+      return this.model.isFacilityAddressSameAsOrgStreetAddress === false;
+    },
+    showFacilityContactForm() {
+      return this.model.isFacilityContactSameAsOrgContact === false;
+    },
+  },
   methods: {
     updateStreetAddress(updatedModel) {
       if (isEmpty(updatedModel)) return;