Lf 4380 api route for edit update route for edit animal and batch details

packages/api/src/controllers/animalBatchController.js

@@ -16,10 +16,8 @@
 import { Model, transaction } from 'objection';
 import AnimalBatchModel from '../models/animalBatchModel.js';
 import baseController from './baseController.js';
-import CustomAnimalBreedModel from '../models/customAnimalBreedModel.js';
-import CustomAnimalTypeModel from '../models/customAnimalTypeModel.js';
 import { handleObjectionError } from '../util/errorCodes.js';
-import { assignInternalIdentifiers } from '../util/animal.js';
+import { assignInternalIdentifiers, checkAndAddCustomTypeAndBreed } from '../util/animal.js';
 import { uploadPublicImage } from '../util/imageUpload.js';
 
 const animalBatchController = {
@@ -60,50 +58,14 @@ const animalBatchController = {
         const { farm_id } = req.headers;
         const result = [];
 
-        // avoid attempts to add an already created type or breed to the DB
-        // where multiple batches have the same type_name or breed_name
-        const typeIdsMap = {};
-        const typeBreedIdsMap = {};
+        // Create utility object used in type and breed
+        req.body.typeIdsMap = {};
+        req.body.typeBreedIdsMap = {};
 
         for (const animalBatch of req.body) {
-          if (animalBatch.type_name) {
-            let typeId = typeIdsMap[animalBatch.type_name];
-
-            if (!typeId) {
-              const newType = await baseController.postWithResponse(
-                CustomAnimalTypeModel,
-                { type: animalBatch.type_name, farm_id },
-                req,
-                { trx },
-              );
-              typeId = newType.id;
-              typeIdsMap[animalBatch.type_name] = typeId;
-            }
-            animalBatch.custom_type_id = typeId;
-            delete animalBatch.type_name;
-          }
-
-          if (animalBatch.breed_name) {
-            const typeColumn = animalBatch.default_type_id ? 'default_type_id' : 'custom_type_id';
-            const typeId = animalBatch.type_name
-              ? typeIdsMap[animalBatch.type_name]
-              : animalBatch.default_type_id || animalBatch.custom_type_id;
-            const typeBreedKey = `${typeColumn}_${typeId}_${animalBatch.breed_name}`;
-            let breedId = typeBreedIdsMap[typeBreedKey];
-
-            if (!breedId) {
-              const newBreed = await baseController.postWithResponse(
-                CustomAnimalBreedModel,
-                { farm_id, [typeColumn]: typeId, breed: animalBatch.breed_name },
-                req,
-                { trx },
-              );
-              breedId = newBreed.id;
-              typeBreedIdsMap[typeBreedKey] = breedId;
-            }
-            animalBatch.custom_breed_id = breedId;
-            delete animalBatch.breed_name;
-          }
+          await checkAndAddCustomTypeAndBreed(req, animalBatch, farm_id, trx);
+          // TODO: allow animal group addition on creation like animals
+          // await checkAndAddGroup(req, animal, farm_id, trx);
 
           // Remove farm_id if it happens to be set in animal object since it should be obtained from header
           delete animalBatch.farm_id;
@@ -115,8 +77,17 @@ const animalBatchController = {
             { trx },
           );
 
+          // TODO: allow animal group addition on creation like animals
+          // Format group_ids
+          // const groupIdMap =
+          //   individualAnimalBatchResult.group_ids?.map((group) => group.animal_group_id) || [];
+          // individualAnimalBatchResult.group_ids = groupIdMap;
+
           result.push(individualAnimalBatchResult);
         }
+        // delete utility objects
+        delete req.body.typeIdsMap;
+        delete req.body.typeBreedIdsMap;
 
         await trx.commit();
 
@@ -128,6 +99,80 @@ const animalBatchController = {
     };
   },
 
+  editAnimalBatches() {
+    return async (req, res) => {
+      const trx = await transaction.start(Model.knex());
+
+      try {
+        const { farm_id } = req.headers;
+
+        // Create utility object used in type and breed
+        req.body.typeIdsMap = {};
+        req.body.typeBreedIdsMap = {};
+
+        // select only allowed properties to edit
+        for (const animalBatch of req.body) {
+          await checkAndAddCustomTypeAndBreed(req, animalBatch, farm_id, trx);
+          // TODO: allow animal group editing
+          // await checkAndAddGroup(req, animal, farm_id, trx);
+
+          const {
+            id,
+            count,
+            custom_breed_id,
+            custom_type_id,
+            default_breed_id,
+            default_type_id,
+            name,
+            notes,
+            photo_url,
+            organic_status,
+            supplier,
+            price,
+            sex_detail,
+            origin_id,
+            group_ids,
+            animal_batch_use_relationships,
+          } = animalBatch;
+
+          await baseController.upsertGraph(
+            AnimalBatchModel,
+            {
+              id,
+              count,
+              custom_breed_id,
+              custom_type_id,
+              default_breed_id,
+              default_type_id,
+              name,
+              notes,
+              photo_url,
+              organic_status,
+              supplier,
+              price,
+              sex_detail,
+              origin_id,
+              group_ids,
+              animal_batch_use_relationships,
+            },
+            req,
+            { trx },
+          );
+        }
+
+        // delete utility objects
+        delete req.body.typeIdsMap;
+        delete req.body.typeBreedIdsMap;
+
+        await trx.commit();
+        // Do not send result revalidate using tags on frontend
+        return res.status(204).send();
+      } catch (error) {
+        handleObjectionError(error, res, trx);
+      }
+    };
+  },
+
   removeAnimalBatches() {
     return async (req, res) => {
       const trx = await transaction.start(Model.knex());