BHBC-2286/2266/2284/2271

api/package.json

@@ -43,7 +43,6 @@
     "fast-deep-equal": "~3.1.3",
     "fast-json-patch": "~3.1.1",
     "form-data": "~4.0.0",
-    "jsonpath": "~1.1.1",
     "jsonpath-plus": "^7.2.0",
     "jsonwebtoken": "~8.5.1",
     "jwks-rsa": "~2.0.5",
@@ -71,7 +70,6 @@
     "@types/express": "~4.17.13",
     "@types/geojson": "~7946.0.8",
     "@types/gulp": "~4.0.9",
-    "@types/jsonpath": "~0.2.0",
     "@types/jsonwebtoken": "~8.5.5",
     "@types/lodash": "~4.14.176",
     "@types/mime": "~2.0.3",

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

@@ -21,6 +21,10 @@ describe('GetProjectData', () => {
       data = new GetProjectData();
     });
 
+    it('sets id', () => {
+      expect(data.id).to.equal(null);
+    });
+
     it('sets name', () => {
       expect(data.project_name).to.equal('');
     });
@@ -48,6 +52,7 @@ describe('GetProjectData', () => {
 
   describe('all values provided', () => {
     const projectData = {
+      project_id: 1,
       name: 'project name',
       pt_id: 4,
       start_date: '2020-04-20T07:00:00.000Z',
@@ -63,6 +68,10 @@ describe('GetProjectData', () => {
       data = new GetProjectData(projectData, activityData);
     });
 
+    it('sets id', () => {
+      expect(data.id).to.equal(projectData.project_id);
+    });
+
     it('sets name', () => {
       expect(data.project_name).to.equal(projectData.name);
     });

api/src/models/project-view.ts

@@ -1,9 +1,9 @@
 import { Feature } from 'geojson';
 import moment from 'moment';
 import { COMPLETION_STATUS } from '../constants/status';
+import { ProjectMetadataPublish } from '../repositories/history-publish-repository';
 
 export interface IGetProject {
-  id: number;
   coordinator: GetCoordinatorData;
   project: GetProjectData;
   objectives: GetObjectivesData;
@@ -20,6 +20,7 @@ export interface IGetProject {
  * @class GetProjectData
  */
 export class GetProjectData {
+  id: number;
   uuid: string;
   project_name: string;
   project_type: number;
@@ -31,6 +32,7 @@ export class GetProjectData {
   revision_count: number;
 
   constructor(projectData?: any, activityData?: any[]) {
+    this.id = projectData?.project_id || null;
     this.uuid = projectData?.uuid || '';
     this.project_name = projectData?.name || '';
     this.project_type = projectData?.pt_id || -1;
@@ -194,6 +196,10 @@ export class GetPartnershipsData {
   }
 }
 
+export type ProjectSupplementaryData = {
+  project_metadata_publish: ProjectMetadataPublish | null;
+};
+
 interface IGetAttachmentsSource {
   file_name: string;
   file_type: string;

api/src/paths/project/{projectId}/survey/{surveyId}/update.ts

@@ -295,7 +295,7 @@ export function updateSurvey(): RequestHandler {
 
       return res.status(200).json({ id: surveyId });
     } catch (error) {
-      defaultLog.error({ label: 'updateProject', message: 'error', error });
+      defaultLog.error({ label: 'updateSurvey', message: 'error', error });
       await connection.rollback();
       throw error;
     } finally {

api/src/paths/project/{projectId}/view.test.ts

@@ -5,6 +5,7 @@ import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import * as db from '../../../database/db';
 import { HTTPError } from '../../../errors/http-error';
+import { IGetProject } from '../../../models/project-view';
 import { ProjectService } from '../../../services/project-service';
 import { getMockDBConnection, getRequestHandlerMocks } from '../../../__mocks__/db';
 import { GET, viewProject } from './view';
@@ -30,9 +31,11 @@ describe('project/{projectId}/view', () => {
 
       sinon.stub(db, 'getDBConnection').returns(dbConnectionObj);
 
-      const viewProjectResult = { id: 1 };
+      const viewProjectResult = { project: { id: 1 } } as IGetProject;
+      const supplementaryProjectData = { project_metadata_publish: null };
 
-      sinon.stub(ProjectService.prototype, 'getProjectById').resolves(viewProjectResult as any);
+      sinon.stub(ProjectService.prototype, 'getProjectById').resolves(viewProjectResult);
+      sinon.stub(ProjectService.prototype, 'getProjectSupplementaryDataById').resolves(supplementaryProjectData);
 
       const { mockReq, mockRes, mockNext } = getRequestHandlerMocks();
 
@@ -45,7 +48,10 @@ describe('project/{projectId}/view', () => {
       }
 
       expect(mockRes.statusValue).to.equal(200);
-      expect(mockRes.jsonValue).to.eql(viewProjectResult);
+      expect(mockRes.jsonValue).to.eql({
+        projectData: viewProjectResult,
+        projectSupplementaryData: supplementaryProjectData
+      });
     });
 
     it('catches and re-throws error', async () => {