Merge pull request #3569 from LiteFarmOrg/LF-4553b-better-middleware-…

…approach LF-4553b Allow patching date and assignee on custom tasks without location
LiteFarmOrg · Dec 6, 2024 · f42af14 · f42af14
2 parents f1db435 + 4e86b13
commit f42af14
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 82 deletions.
diff --git a/packages/api/src/middleware/acl/hasFarmAccess.js b/packages/api/src/middleware/acl/hasFarmAccess.js
@@ -30,7 +30,6 @@ const entitiesGetters = {
   nomination_id: fromNomination,
   transplant_task: fromTransPlantTask,
   product_id: fromProduct,
-  taskIdTaskType: fromTaskIdTaskType,
 };
 import userFarmModel from '../../models/userFarmModel.js';
 
@@ -85,6 +84,11 @@ async function fromTaskId(task_id) {
     .join('task_type', 'task.task_type_id', 'task_type.task_type_id')
     .where({ task_id })
     .first();
+
+  if (taskType?.farm_id) {
+    return { farm_id: taskType.farm_id };
+  }
+
   //TODO: planting transplant task authorization test
   if (['PLANT_TASK', 'TRANSPLANT_TASK'].includes(taskType?.task_translation_key)) {
     const task_type = taskType.task_translation_key.toLowerCase();
@@ -205,28 +209,6 @@ async function fromLocations(locations) {
   }
 }
 
-async function fromTaskIdTaskType(req) {
-  if (!req.params || !req.params.task_id) {
-    return {};
-  }
-
-  try {
-    const task_id = req.params.task_id;
-
-    const task = await knex('task').where({ task_id }).first();
-
-    if (!task) return {};
-
-    const taskType = await knex('task_type').where({ task_type_id: task.task_type_id }).first();
-
-    if (!taskType) return {};
-
-    return { farm_id: taskType.farm_id };
-  } catch (e) {
-    return {};
-  }
-}
-
 async function fromLocationIds(location_ids) {
   if (!location_ids || !location_ids.length) {
     return {};

diff --git a/packages/api/src/routes/taskRoute.js b/packages/api/src/routes/taskRoute.js
@@ -274,7 +274,7 @@ router.patch(
 router.patch(
   '/complete/custom_task/:task_id',
   modelMapping['custom_task'],
-  hasFarmAccess({ mixed: 'taskIdTaskType' }),
+  hasFarmAccess({ params: 'task_id' }),
   checkScope(['edit:task']),
   checkCompleteTask('custom_task'),
   taskController.completeTask('custom_task'),

diff --git a/packages/api/tests/mock.factories.js b/packages/api/tests/mock.factories.js
@@ -1101,9 +1101,12 @@ function fakeFertilizer(defaultData = {}) {
 }
 
 async function taskFactory(
-  { promisedUser = usersFactory(), promisedTaskType = task_typeFactory() } = {},
+  { promisedUser = usersFactory(), promisedTaskType, promisedFarm } = {},
   task = fakeTask(),
 ) {
+  if (!promisedTaskType) {
+    promisedTaskType = task_typeFactory({ promisedFarm });
+  }
   const [user, taskType] = await Promise.all([promisedUser, promisedTaskType]);
   const [{ user_id }] = user;
   const [{ task_type_id }] = taskType;