LF-4528 Update animal models and controllers

* include animals and batches in GET tasks API response
LiteFarmOrg · Nov 27, 2024 · 9f26f35 · 9f26f35
1 parent 273f1f7
commit 9f26f35
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/packages/api/src/controllers/animalBatchController.js b/packages/api/src/controllers/animalBatchController.js
@@ -34,6 +34,7 @@ const animalBatchController = {
             group_ids: true,
             sex_detail: true,
             animal_batch_use_relationships: true,
+            tasks: true,
           });
         return res.status(200).send(
           rows.map(({ animal_union_batch, group_ids, ...rest }) => ({

diff --git a/packages/api/src/controllers/animalController.js b/packages/api/src/controllers/animalController.js
@@ -37,6 +37,7 @@ const animalController = {
             animal_union_batch: true,
             group_ids: true,
             animal_use_relationships: true,
+            tasks: true,
           });
         return res.status(200).send(
           rows.map(({ animal_union_batch, group_ids, ...rest }) => ({

diff --git a/packages/api/src/models/animalBatchModel.js b/packages/api/src/models/animalBatchModel.js
@@ -176,6 +176,7 @@ class AnimalBatchModel extends baseModel {
           },
           to: 'task.task_id',
         },
+        modify: (query) => query.select('task.task_id').where('deleted', false),
       },
       default_type: {
         modelClass: DefaultAnimalTypeModel,

diff --git a/packages/api/src/models/animalModel.js b/packages/api/src/models/animalModel.js
@@ -170,6 +170,7 @@ class Animal extends baseModel {
           },
           to: 'task.task_id',
         },
+        modify: (query) => query.select('task.task_id').where('deleted', false),
       },
       default_type: {
         modelClass: DefaultAnimalTypeModel,