Full flow of editing objectives

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

@@ -3,9 +3,11 @@ import { describe } from 'mocha';
 import {
   GetCoordinatorData,
   GetPartnershipsData,
+  GetObjectivesData,
   PutCoordinatorData,
   PutPartnershipsData,
-  PutSpeciesData
+  PutSpeciesData,
+  PutObjectivesData
 } from './project-update';
 
 describe('PutPartnershipsData', () => {
@@ -310,3 +312,99 @@ describe('PutSpeciesData', () => {
     });
   });
 });
+
+describe('GetObjectivesData', () => {
+  describe('No values provided', () => {
+    let data: GetObjectivesData;
+
+    before(() => {
+      data = new GetObjectivesData({});
+    });
+
+    it('sets objectives', () => {
+      expect(data.objectives).to.equal(null);
+    });
+
+    it('sets caveats', () => {
+      expect(data.caveats).to.equal(null);
+    });
+
+    it('sets revision_count', () => {
+      expect(data.revision_count).to.equal(null);
+    });
+  });
+
+  describe('all values provided', () => {
+    const obj = {
+      objectives: 'objectives',
+      caveats: 'caveats',
+      revision_count: 1
+    };
+
+    let data: GetObjectivesData;
+
+    before(() => {
+      data = new GetObjectivesData(obj);
+    });
+
+    it('sets objectives', () => {
+      expect(data.objectives).to.equal(obj.objectives);
+    });
+
+    it('sets caveats', () => {
+      expect(data.caveats).to.equal(obj.caveats);
+    });
+
+    it('sets revision_count', () => {
+      expect(data.revision_count).to.equal(obj.revision_count);
+    });
+  });
+});
+
+describe('PutObjectivesData', () => {
+  describe('No values provided', () => {
+    let data: PutObjectivesData;
+
+    before(() => {
+      data = new PutObjectivesData({});
+    });
+
+    it('sets objectives', () => {
+      expect(data.objectives).to.equal('');
+    });
+
+    it('sets caveats', () => {
+      expect(data.caveats).to.equal(null);
+    });
+
+    it('sets revision_count', () => {
+      expect(data.revision_count).to.equal(null);
+    });
+  });
+
+  describe('all values provided', () => {
+    const obj = {
+      objectives: 'objectives',
+      caveats: 'caveats',
+      revision_count: 1
+    };
+
+    let data: PutObjectivesData;
+
+    before(() => {
+      data = new PutObjectivesData(obj);
+    });
+
+    it('sets objectives', () => {
+      expect(data.objectives).to.equal(obj.objectives);
+    });
+
+    it('sets caveats', () => {
+      expect(data.caveats).to.equal(obj.caveats);
+    });
+
+    it('sets revision_count', () => {
+      expect(data.revision_count).to.equal(obj.revision_count);
+    });
+  });
+});

api/src/models/project-update.ts

@@ -191,3 +191,17 @@ export class GetIUCNClassificationData {
       [];
   }
 }
+
+export class GetObjectivesData {
+  objectives: string;
+  caveats: string;
+  revision_count: number;
+
+  constructor(obj?: any) {
+    defaultLog.debug({ label: 'GetObjectivesData', message: 'params', obj });
+
+    this.objectives = obj?.objectives || null;
+    this.caveats = obj?.caveats || null;
+    this.revision_count = obj?.revision_count ?? null;
+  }
+}

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

@@ -7,6 +7,7 @@ import {
   GetCoordinatorData,
   GetIUCNClassificationData,
   GetPartnershipsData,
+  GetObjectivesData,
   PutCoordinatorData,
   PutPartnershipsData,
   PutLocationData,
@@ -26,7 +27,8 @@ import {
   getCoordinatorByProjectSQL,
   putProjectSQL,
   getIndigenousPartnershipsByProjectSQL,
-  getIUCNActionClassificationByProjectSQL
+  getIUCNActionClassificationByProjectSQL,
+  getObjectivesByProjectSQL
 } from '../../../queries/project/project-update-queries';
 import {
   deleteIUCNSQL,
@@ -131,7 +133,7 @@ export interface IGetProjectForUpdate {
   coordinator: GetCoordinatorData | null;
   permit: any;
   project: any;
-  objectives: any;
+  objectives: GetObjectivesData | null;
   location: any;
   species: any;
   iucn: GetIUCNClassificationData | null;
@@ -205,6 +207,14 @@ function getProjectForUpdate(): RequestHandler {
         );
       }
 
+      if (entities.includes(GET_ENTITIES.objectives)) {
+        promises.push(
+          getObjectivesData(projectId, connection).then((value) => {
+            results.objectives = value;
+          })
+        );
+      }
+
       await Promise.all(promises);
 
       await connection.commit();
@@ -311,6 +321,24 @@ export const getSpeciesData = async (projectId: number, connection: IDBConnectio
   return new GetSpeciesData(resultFocalSpecies, resultAncillarySpecies);
 };
 
+export const getObjectivesData = async (projectId: number, connection: IDBConnection): Promise<GetObjectivesData> => {
+  const sqlStatement = getObjectivesByProjectSQL(projectId);
+
+  if (!sqlStatement) {
+    throw new HTTP400('Failed to build SQL statement');
+  }
+
+  const response = await connection.query(sqlStatement.text, sqlStatement.values);
+
+  const result = (response && response.rows && response.rows[0]) || null;
+
+  if (!result) {
+    throw new HTTP400('Failed to get project objectives data');
+  }
+
+  return new GetObjectivesData(result);
+};
+
 export const PUT: Operation = [logRequest('paths/project/{projectId}/update', 'PUT'), updateProject()];
 
 PUT.apiDoc = {

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

@@ -3,7 +3,8 @@ import { describe } from 'mocha';
 import {
   getIndigenousPartnershipsByProjectSQL,
   getCoordinatorByProjectSQL,
-  getIUCNActionClassificationByProjectSQL
+  getIUCNActionClassificationByProjectSQL,
+  getObjectivesByProjectSQL
 } from './project-update-queries';
 
 describe('getIndigenousPartnershipsByProjectSQL', () => {
@@ -47,3 +48,17 @@ describe('getCoordinatorByProjectSQL', () => {
     expect(response).to.not.be.null;
   });
 });
+
+describe('getObjectivesByProjectSQL', () => {
+  it('Null projectId', () => {
+    const response = getObjectivesByProjectSQL((null as unknown) as number);
+
+    expect(response).to.be.null;
+  });
+
+  it('valid projectId', () => {
+    const response = getObjectivesByProjectSQL(1);
+
+    expect(response).to.not.be.null;
+  });
+});

api/src/queries/project/project-update-queries.ts

@@ -206,3 +206,36 @@ export const putProjectSQL = (
 
   return sqlStatement;
 };
+
+/**
+ * SQL query to get objectives information, for update purposes.
+ *
+ * @param {number} projectId
+ * @return {*}  {(SQLStatement | null)}
+ */
+export const getObjectivesByProjectSQL = (projectId: number): SQLStatement | null => {
+  defaultLog.debug({ label: 'getObjectivesByProjectSQL', message: 'params', projectId });
+
+  if (!projectId) {
+    return null;
+  }
+  const sqlStatement = SQL`
+    SELECT
+      objectives,
+      caveats,
+      revision_count
+    FROM
+      project
+    WHERE
+      id = ${projectId};
+  `;
+
+  defaultLog.debug({
+    label: 'getObjectivesByProjectSQL',
+    message: 'sql',
+    'sqlStatement.text': sqlStatement.text,
+    'sqlStatement.values': sqlStatement.values
+  });
+
+  return sqlStatement;
+};

app/src/features/projects/view/ProjectDetails.tsx

@@ -32,7 +32,7 @@ const ProjectDetails: React.FC<IProjectDetailsProps> = (props) => {
       </Box>
       <Box mb={3}>
         <Paper>
-          <ProjectObjectives projectForViewData={projectForViewData} />
+          <ProjectObjectives projectForViewData={projectForViewData} codes={codes} refresh={props.refresh} />
         </Paper>
       </Box>