Funding Sources Feature Branch

api/src/database/db.ts

@@ -376,7 +376,7 @@ export const getDBConnection = function (keycloakToken: object): IDBConnection {
       throw new ApiGeneralError('Failed to identify authenticated user');
     }
 
-    defaultLog.debug({ label: '_setUserContext', keycloakUserInformation });
+    defaultLog.silly({ label: '_setUserContext', keycloakUserInformation });
 
     // Update the logged in user with their latest information from Keyclaok (if it has changed)
     await _updateSystemUserInformation(keycloakUserInformation);

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

@@ -2,8 +2,6 @@ import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
   PostCoordinatorData,
-  PostFundingData,
-  PostFundingSource,
   PostIUCNData,
   PostLocationData,
   PostObjectivesData,
@@ -40,10 +38,6 @@ describe('PostProjectObject', () => {
       expect(projectPostObject.iucn).to.equal(null);
     });
 
-    it('sets funding', function () {
-      expect(projectPostObject.funding).to.equal(null);
-    });
-
     it('sets partnerships', function () {
       expect(projectPostObject.partnerships).to.equal(null);
     });
@@ -91,18 +85,6 @@ describe('PostProjectObject', () => {
           }
         ]
       },
-      funding: {
-        fundingSources: [
-          {
-            agency_id: 1,
-            investment_action_category: 1,
-            agency_project_id: 'agency project id',
-            funding_amount: 12,
-            start_date: '2020/04/03',
-            end_date: '2020/05/05'
-          }
-        ]
-      },
       iucn: {
         classificationDetails: [
           {
@@ -338,81 +320,6 @@ describe('PostPartnershipsData', () => {
   });
 });
 
-describe('PostFundingSource', () => {
-  describe('No values provided', () => {
-    let projectFundingData: PostFundingSource;
-
-    before(() => {
-      projectFundingData = new PostFundingSource(null);
-    });
-
-    it('sets agency_id', () => {
-      expect(projectFundingData.agency_id).to.equal(null);
-    });
-
-    it('sets investment_action_category', () => {
-      expect(projectFundingData.investment_action_category).to.equal(null);
-    });
-
-    it('sets agency_project_id', () => {
-      expect(projectFundingData.agency_project_id).to.equal(null);
-    });
-
-    it('sets funding_amount', () => {
-      expect(projectFundingData.funding_amount).to.equal(null);
-    });
-
-    it('sets start_date', () => {
-      expect(projectFundingData.start_date).to.equal(null);
-    });
-
-    it('sets end_date', () => {
-      expect(projectFundingData.end_date).to.equal(null);
-    });
-  });
-
-  describe('All values provided', () => {
-    let projectFundingData: PostFundingSource;
-
-    const obj = {
-      agency_id: 1,
-      investment_action_category: 1,
-      agency_project_id: 'agency project id',
-      funding_amount: 20,
-      start_date: '2020/04/04',
-      end_date: '2020/05/05'
-    };
-
-    before(() => {
-      projectFundingData = new PostFundingSource(obj);
-    });
-
-    it('sets agency_id', () => {
-      expect(projectFundingData.agency_id).to.equal(obj.agency_id);
-    });
-
-    it('sets investment_action_category', () => {
-      expect(projectFundingData.investment_action_category).to.equal(obj.investment_action_category);
-    });
-
-    it('sets agency_project_id', () => {
-      expect(projectFundingData.agency_project_id).to.equal(obj.agency_project_id);
-    });
-
-    it('sets funding_amount', () => {
-      expect(projectFundingData.funding_amount).to.equal(obj.funding_amount);
-    });
-
-    it('sets start_date', () => {
-      expect(projectFundingData.start_date).to.equal(obj.start_date);
-    });
-
-    it('sets end_date', () => {
-      expect(projectFundingData.end_date).to.equal(obj.end_date);
-    });
-  });
-});
-
 describe('PostIUCNData', () => {
   describe('No values provided', () => {
     let projectIUCNData: PostIUCNData;
@@ -503,75 +410,3 @@ describe('PostLocationData', () => {
     });
   });
 });
-
-describe('PostFundingData', () => {
-  describe('No values provided', () => {
-    let data: PostFundingData;
-
-    before(() => {
-      data = new PostFundingData(null);
-    });
-
-    it('sets fundingSources', () => {
-      expect(data.fundingSources).to.eql([]);
-    });
-  });
-
-  describe('Values provided but not valid arrays', () => {
-    let data: PostFundingData;
-
-    const obj = {
-      fundingSources: null
-    };
-
-    before(() => {
-      data = new PostFundingData(obj);
-    });
-
-    it('sets fundingSources', () => {
-      expect(data.fundingSources).to.eql([]);
-    });
-  });
-
-  describe('Values provided but with no length', () => {
-    let data: PostFundingData;
-
-    const obj = {
-      fundingSources: []
-    };
-
-    before(() => {
-      data = new PostFundingData(obj);
-    });
-
-    it('sets fundingSources', () => {
-      expect(data.fundingSources).to.eql([]);
-    });
-  });
-
-  describe('All values provided', () => {
-    let data: PostFundingData;
-
-    const obj = {
-      fundingSources: [
-        {
-          agency_id: 1,
-          investment_action_category: 1,
-          agency_project_id: 'agency project id',
-          funding_amount: 12,
-          start_date: '2020/04/03',
-          end_date: '2020/05/05',
-          first_nations_id: null
-        }
-      ]
-    };
-
-    before(() => {
-      data = new PostFundingData(obj);
-    });
-
-    it('sets fundingSources', () => {
-      expect(data.fundingSources).to.eql(obj.fundingSources);
-    });
-  });
-});

api/src/models/project-create.ts

@@ -15,7 +15,6 @@ export class PostProjectObject {
   objectives: PostObjectivesData;
   location: PostLocationData;
   iucn: PostIUCNData;
-  funding: PostFundingData;
   partnerships: PostPartnershipsData;
 
   constructor(obj?: any) {
@@ -25,7 +24,6 @@ export class PostProjectObject {
     this.project = (obj?.project && new PostProjectData(obj.project)) || null;
     this.objectives = (obj?.project && new PostObjectivesData(obj.objectives)) || null;
     this.location = (obj?.location && new PostLocationData(obj.location)) || null;
-    this.funding = (obj?.funding && new PostFundingData(obj.funding)) || null;
     this.iucn = (obj?.iucn && new PostIUCNData(obj.iucn)) || null;
     this.partnerships = (obj?.partnerships && new PostPartnershipsData(obj.partnerships)) || null;
   }
@@ -155,54 +153,6 @@ export class PostIUCNData {
   }
 }
 
-/**
- * A single project funding agency.
- *
- * @See PostFundingData
- *
- * @export
- * @class PostFundingSource
- */
-export class PostFundingSource {
-  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 });
-
-    this.agency_id = obj?.agency_id || null;
-    this.investment_action_category = obj?.investment_action_category || null;
-    this.agency_project_id = obj?.agency_project_id || null;
-    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;
-  }
-}
-
-/**
- * Processes POST /project funding data
- *
- * @export
- * @class PostFundingData
- */
-export class PostFundingData {
-  fundingSources: PostFundingSource[];
-
-  constructor(obj?: any) {
-    defaultLog.debug({ label: 'PostFundingData', message: 'params', obj });
-
-    this.fundingSources =
-      (obj?.fundingSources?.length && obj.fundingSources.map((item: any) => new PostFundingSource(item))) || [];
-  }
-}
-
 /**
  * Processes POST /project partnerships data
  *