SIMSBIOHUB-24: First Nations as a funding source on projects/ surveys

api/src/models/project-create.test.ts

@@ -468,7 +468,7 @@ describe('PostLocationData', () => {
     });
 
     it('sets location_description', function () {
-      expect(projectLocationData.location_description).to.equal(null);
+      expect(projectLocationData.location_description).to.be.undefined;
     });
 
     it('sets geometry', function () {
@@ -570,7 +570,8 @@ describe('PostFundingData', () => {
           agency_project_id: 'agency project id',
           funding_amount: 12,
           start_date: '2020/04/03',
-          end_date: '2020/05/05'
+          end_date: '2020/05/05',
+          first_nations_id: null
         }
       ]
     };

api/src/models/project-create.ts

@@ -121,7 +121,7 @@ export class PostLocationData {
       }
     });
 
-    this.location_description = (obj && obj.location_description) || null;
+    this.location_description = obj?.location_description;
     this.geometry = (obj?.geometry?.length && obj.geometry) || [];
   }
 }
@@ -166,12 +166,14 @@ export class PostIUCNData {
  * @class PostFundingSource
  */
 export class PostFundingSource {
-  agency_id: number;
+  id?: number;
+  agency_id?: number;
   investment_action_category: number;
   agency_project_id: string;
   funding_amount: number;
   start_date: string;
   end_date: string;
+  first_nations_id?: number;
 
   constructor(obj?: any) {
     defaultLog.debug({ label: 'PostFundingSource', message: 'params', obj });
@@ -182,6 +184,7 @@ export class PostFundingSource {
     this.funding_amount = obj?.funding_amount || null;
     this.start_date = obj?.start_date || null;
     this.end_date = obj?.end_date || null;
+    this.first_nations_id = obj?.first_nations_id || null;
   }
 }
 

api/src/models/project-update.test.ts

@@ -217,7 +217,7 @@ describe('PutLocationData', () => {
     });
 
     it('sets location_description', () => {
-      expect(data.location_description).to.equal(null);
+      expect(data.location_description).to.undefined;
     });
 
     it('sets geometry', () => {

api/src/models/project-update.ts

@@ -74,7 +74,7 @@ export class PutLocationData {
       }
     });
 
-    this.location_description = (obj && obj.location_description) || null;
+    this.location_description = obj?.location_description;
     this.geometry = (obj?.geometry?.length && obj.geometry) || [];
     this.revision_count = obj?.revision_count ?? null;
   }
@@ -106,13 +106,14 @@ export class PutIUCNData {
 }
 
 export class PutFundingSource {
-  id: number;
-  investment_action_category: number;
-  agency_project_id: string;
-  funding_amount: number;
+  id?: number;
+  investment_action_category?: number;
+  agency_project_id?: string;
+  funding_amount?: number;
   start_date: string;
   end_date: string;
   revision_count: number;
+  first_nations_id?: number;
 
   constructor(obj?: any) {
     defaultLog.debug({ label: 'PutFundingSource', message: 'params', obj });
@@ -124,6 +125,7 @@ export class PutFundingSource {
     this.start_date = obj?.start_date || null;
     this.end_date = obj?.end_date || null;
     this.revision_count = obj?.revision_count ?? null;
+    this.first_nations_id = obj?.first_nations_id ?? null;
   }
 }
 

api/src/models/project-view.test.ts

@@ -385,7 +385,9 @@ describe('GetFundingData', () => {
         start_date: Date.now().toString(),
         end_date: Date.now().toString(),
         agency_project_id: '12',
-        revision_count: 1
+        revision_count: 1,
+        first_nations_name: null,
+        first_nations_id: null
       }
     ];
 

api/src/models/project-view.ts

@@ -41,8 +41,7 @@ export class GetProjectData {
     this.end_date = projectData?.end_date || '';
     this.comments = projectData?.comments || '';
     this.completion_status =
-      (projectData &&
-        projectData.end_date &&
+      (projectData?.end_date &&
         moment(projectData.end_date).endOf('day').isBefore(moment()) &&
         COMPLETION_STATUS.COMPLETED) ||
       COMPLETION_STATUS.ACTIVE;
@@ -104,7 +103,7 @@ export class GetLocationData {
   revision_count: number;
 
   constructor(locationData?: any) {
-    const locationDataItem = locationData && locationData.length && locationData[0];
+    const locationDataItem = locationData?.length && locationData[0];
 
     this.location_description = locationDataItem?.location_description || '';
     this.geometry = (locationDataItem?.geometry?.length && locationDataItem.geometry) || [];
@@ -129,28 +128,28 @@ export class GetIUCNClassificationData {
 
   constructor(iucnClassificationData?: any[]) {
     this.classificationDetails =
-      (iucnClassificationData &&
-        iucnClassificationData.map((item: any) => {
-          return {
-            classification: item.classification,
-            subClassification1: item.subclassification1,
-            subClassification2: item.subclassification2
-          };
-        })) ||
-      [];
+      iucnClassificationData?.map((item: any) => {
+        return {
+          classification: item.classification,
+          subClassification1: item.subclassification1,
+          subClassification2: item.subclassification2
+        };
+      }) ?? [];
   }
 }
 
 interface IGetFundingSource {
   id: number;
-  agency_id: number;
-  investment_action_category: number;
-  investment_action_category_name: string;
+  agency_id?: number;
+  investment_action_category?: number;
+  investment_action_category_name?: string;
   agency_name: string;
-  funding_amount: number;
+  funding_amount?: number;
   start_date: string;
   end_date: string;
   agency_project_id: string;
+  first_nations_id?: number;
+  first_nations_name?: string;
   revision_count: number;
 }
 
@@ -159,22 +158,22 @@ export class GetFundingData {
 
   constructor(fundingData?: any[]) {
     this.fundingSources =
-      (fundingData &&
-        fundingData.map((item: any) => {
-          return {
-            id: item.id,
-            agency_id: item.agency_id,
-            investment_action_category: item.investment_action_category,
-            investment_action_category_name: item.investment_action_category_name,
-            agency_name: item.agency_name,
-            funding_amount: item.funding_amount,
-            start_date: item.start_date,
-            end_date: item.end_date,
-            agency_project_id: item.agency_project_id,
-            revision_count: item.revision_count
-          };
-        })) ||
-      [];
+      fundingData?.map((item: any) => {
+        return {
+          id: item.id,
+          agency_id: item.agency_id,
+          investment_action_category: item.investment_action_category,
+          investment_action_category_name: item.investment_action_category_name,
+          agency_name: item.agency_name,
+          funding_amount: item.funding_amount,
+          start_date: item.start_date,
+          end_date: item.end_date,
+          agency_project_id: item.agency_project_id,
+          revision_count: item.revision_count,
+          first_nations_id: item.first_nations_id,
+          first_nations_name: item.first_nations_name
+        };
+      }) ?? [];
   }
 }
 

api/src/models/survey-view.test.ts

@@ -240,7 +240,9 @@ describe('GetSurveyFundingSources', () => {
         investment_action_category_id: 4,
         investment_action_category_name: 'name11',
         agency_name: 'name1',
-        funding_source_project_id: '5'
+        funding_source_project_id: '5',
+        first_nations_id: null,
+        first_nations_name: null
       },
       {
         project_funding_source_id: 6,
@@ -251,7 +253,9 @@ describe('GetSurveyFundingSources', () => {
         investment_action_category_id: 9,
         investment_action_category_name: 'name22',
         agency_name: 'name2',
-        funding_source_project_id: '10'
+        funding_source_project_id: '10',
+        first_nations_id: null,
+        first_nations_name: null
       }
     ];
 
@@ -270,7 +274,9 @@ describe('GetSurveyFundingSources', () => {
           investment_action_category_id: 4,
           investment_action_category_name: 'name11',
           agency_name: 'name1',
-          funding_source_project_id: '5'
+          funding_source_project_id: '5',
+          first_nations_id: null,
+          first_nations_name: null
         },
         {
           pfs_id: 6,
@@ -281,7 +287,9 @@ describe('GetSurveyFundingSources', () => {
           investment_action_category_id: 9,
           investment_action_category_name: 'name22',
           agency_name: 'name2',
-          funding_source_project_id: '10'
+          funding_source_project_id: '10',
+          first_nations_id: null,
+          first_nations_name: null
         }
       ]);
     });

api/src/models/survey-view.ts

@@ -84,7 +84,7 @@ export class GetPermitData {
         permit_id: item.permit_id,
         permit_number: item.number,
         permit_type: item.type
-      })) || [];
+      })) ?? [];
   }
 }
 
@@ -108,36 +108,38 @@ export class GetSurveyPurposeAndMethodologyData {
 
 interface IGetSurveyFundingSource {
   pfs_id: number;
-  funding_amount: number;
+  funding_amount?: number;
   funding_source_id: number;
   funding_start_date: string;
   funding_end_date: string;
-  investment_action_category_id: number;
-  investment_action_category_name: string;
-  agency_name: string;
+  investment_action_category_id?: number;
+  investment_action_category_name?: string;
+  agency_name?: string;
   funding_source_project_id: string;
+  first_nations_id?: number;
+  first_nations_name?: string;
 }
 
 export class GetSurveyFundingSources {
   funding_sources: IGetSurveyFundingSource[];
 
   constructor(obj?: any[]) {
     this.funding_sources =
-      (obj &&
-        obj.map((item: any) => {
-          return {
-            pfs_id: item.project_funding_source_id,
-            funding_amount: item.funding_amount,
-            funding_source_id: item.funding_source_id,
-            funding_start_date: item.funding_start_date,
-            funding_end_date: item.funding_end_date,
-            investment_action_category_id: item.investment_action_category_id,
-            investment_action_category_name: item.investment_action_category_name,
-            agency_name: item.agency_name,
-            funding_source_project_id: item.funding_source_project_id
-          };
-        })) ||
-      [];
+      obj?.map((item: any) => {
+        return {
+          pfs_id: item.project_funding_source_id,
+          funding_amount: item.funding_amount,
+          funding_source_id: item.funding_source_id,
+          funding_start_date: item.funding_start_date,
+          funding_end_date: item.funding_end_date,
+          investment_action_category_id: item.investment_action_category_id,
+          investment_action_category_name: item.investment_action_category_name,
+          agency_name: item.agency_name,
+          funding_source_project_id: item.funding_source_project_id,
+          first_nations_id: item.first_nations_id,
+          first_nations_name: item.first_nations_name
+        };
+      }) ?? [];
   }
 }