fix: minor updates

Greenstand · Apr 18, 2022 · 740a390 · 740a390
1 parent 73d13da
commit 740a390
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 61 deletions.
diff --git a/server/handlers/stakeholderHandler.js b/server/handlers/stakeholderHandler.js
@@ -23,19 +23,19 @@ const stakeholderPostSchema = Joi.object({
   type: Joi.string(),
   email: Joi.string(),
   phone: Joi.string(),
-}).unknown();
+}).unknown(false);
 
 const stakeholderDeleteSchema = Joi.object({
   id: Joi.string().uuid(),
   type: Joi.string(),
-}).unknown();
+}).unknown(false);
 
 const updateStakeholderSchema = Joi.object({
   id: Joi.string().uuid().required(),
-  type: Joi.string().required(),
-  email: Joi.string().required(),
-  phone: Joi.string().required(),
-}).unknown(true);
+  type: Joi.string(),
+  email: Joi.string(),
+  phone: Joi.string(),
+}).unknown(false);
 
 const stakeholderGetAll = async (req, res) => {
   await stakeholderGetQuerySchema.validateAsync(req.query, {
@@ -94,6 +94,43 @@ const stakeholderGetAllById = async (req, res) => {
   });
 };
 
+const stakeholderCreate = async function (req, res) {
+  const requestObject = await stakeholderPostSchema.validateAsync(req.body, {
+    abortEarly: false,
+  });
+  const { id } = req.params || req.body.relation_id;
+
+  const stakeholderService = new StakeholderService();
+  const result = await stakeholderService.createStakeholder(id, requestObject);
+
+  res.status(201).json(result);
+};
+
+const stakeholderDelete = async function (req, res) {
+  const requestObject = await stakeholderDeleteSchema.validateAsync(req.body, {
+    abortEarly: false,
+  });
+  const { id } = req.params || req.body.relation_id;
+
+  const stakeholderService = new StakeholderService();
+  const result = await stakeholderService.deleteStakeholder(id, requestObject);
+
+  res.status(200).json(result);
+};
+
+const stakeholderUpdate = async function (req, res) {
+  const requestObject = await updateStakeholderSchema.validateAsync(req.body, {
+    abortEarly: false,
+  });
+
+  // NOT CURRENTLY IN USE
+  // const { id } = req.params;
+  const stakeholderService = new StakeholderService();
+  const result = await stakeholderService.updateStakeholder(requestObject);
+
+  res.status(200).json(result);
+};
+
 // const stakeholderGetRelations = async function (req, res, next) {
 //   const { id } = req.params;
 //   const session = new Session(false);
@@ -163,44 +200,6 @@ const stakeholderGetAllById = async (req, res) => {
 //   }
 // };
 
-const stakeholderCreate = async function (req, res) {
-  const requestObject = await stakeholderPostSchema.validateAsync(req.body, {
-    abortEarly: false,
-  });
-  const { id } = req.params || req.body.relation_id;
-
-  const stakeholderService = new StakeholderService();
-  const result = await stakeholderService.createStakeholder(id, requestObject);
-
-  res.status(201).json(result);
-};
-
-const stakeholderDelete = async function (req, res) {
-  const requestObject = await stakeholderDeleteSchema.validateAsync(req.body, {
-    abortEarly: false,
-  });
-  const { id } = req.params || req.body.relation_id;
-
-  const stakeholderService = new StakeholderService();
-  const result = await stakeholderService.deleteStakeholder(id, requestObject);
-
-  res.status(200).json(result);
-};
-
-const stakeholderUpdate = async function (req, res) {
-  const requestObject = await updateStakeholderSchema
-    .unknown(true)
-    .validateAsync(req.body, {
-      abortEarly: false,
-    });
-
-  const { id } = req.params;
-  const stakeholderService = new StakeholderService();
-  const result = await stakeholderService.updateStakeholder(id, requestObject);
-
-  res.status(200).json(result);
-};
-
 module.exports = {
   stakeholderGetAllById,
   stakeholderGetAll,

diff --git a/server/models/Stakeholder.js b/server/models/Stakeholder.js
@@ -267,7 +267,7 @@ class Stakeholder {
     return stakeholderRelation;
   }
 
-  async updateStakeholder(_id, data) {
+  async updateStakeholder(data) {
     const editedStakeholder = this.stakeholderTree({ ...data });
 
     // remove children and parents temporarily to update

diff --git a/server/models/Stakeholder.spec.js b/server/models/Stakeholder.spec.js
@@ -62,16 +62,5 @@ describe('Stakeholder Model', () => {
         .property('id')
         .eq('792a4eee-8e18-4750-a56f-91bdec383aa6');
     });
-
-    it('should get stakeholders with filter -- id (integer)', async () => {
-      const stakeholder = new Stakeholder();
-      const result = await stakeholder.getAllStakeholders({
-        id: 1,
-      });
-
-      expect(result.stakeholders).to.have.length(1);
-      expect(result.totalCount).to.eql(1);
-      expect(result.stakeholders[0]).property('id').eq(1);
-    });
   });
 });
diff --git a/server/services/StakeholderService.js b/server/services/StakeholderService.js
@@ -56,13 +56,10 @@ class StakeholderService {
     }
   }
 
-  async updateStakeholder(id, requestObject) {
+  async updateStakeholder(requestObject) {
     try {
       await this._session.beginTransaction();
-      const result = await this._stakeholder.updateStakeholder(
-        id,
-        requestObject,
-      );
+      const result = await this._stakeholder.updateStakeholder(requestObject);
       await this._session.commitTransaction();
 
       return result;