Merge pull request #2886 from LiteFarmOrg/LF-3591-create-the-revenue-…

…type-backend-api-route-and-controller-and-the-get-all-types-function LF-3591 Create the revenueType backend api (route and controller) and the get all types function
LiteFarmOrg · Sep 21, 2023 · 2e68c32 · 2e68c32
2 parents 489876c + f9770ce
commit 2e68c32
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/packages/api/src/controllers/baseController.js b/packages/api/src/controllers/baseController.js
@@ -193,14 +193,15 @@ export default {
 
   /**
    * To check if record is deleted or not
+   * @param {Object} trx - Transaction object
    * @param {Object} model - Database model instance
    * @param {object} where - 'Where' condition to fetch record
    * @async
    * @returns {Boolean} - true or false
    */
-  async isDeleted(model, where) {
+  async isDeleted(trx, model, where) {
     const record = await model
-      .query()
+      .query(trx)
       .context({ showHidden: true })
       .where(where)
       .select('deleted')
@@ -211,13 +212,14 @@ export default {
 
   /**
    * Check if records exists in table
+   * @param {object} trx - Transaction object
    * @param {object} model - Database model instance
    * @param {object} where - 'Where' condition to fetch record
    * @param {object} whereNot - 'WhereNot' condition to fetch record
    * @returns {Promise} - Object DB record promise
    */
-  existsInTable(model, where, whereNot = {}) {
-    let query = model.query().context({ showHidden: true }).where(where);
+  existsInTable(trx, model, where, whereNot = {}) {
+    let query = model.query(trx).context({ showHidden: true }).where(where);
 
     if (Object.keys(whereNot).length > 0) {
       query = query.whereNot(whereNot);

diff --git a/packages/api/src/controllers/revenueTypeController.js b/packages/api/src/controllers/revenueTypeController.js
@@ -27,7 +27,7 @@ const revenueTypeController = {
         const data = req.body;
         data.revenue_translation_key = baseController.formatTranslationKey(data.revenue_name);
 
-        const record = await baseController.existsInTable(RevenueTypeModel, {
+        const record = await baseController.existsInTable(trx, RevenueTypeModel, {
           revenue_name: data.revenue_name,
           farm_id,
         });
@@ -68,7 +68,7 @@ const revenueTypeController = {
     };
   },
 
-  getAllTypes() {
+  getFarmRevenueType() {
     return async (req, res) => {
       try {
         const farm_id = req.headers.farm_id;
@@ -113,7 +113,7 @@ const revenueTypeController = {
       try {
         // do not allow operations to deleted records
         if (
-          await baseController.isDeleted(RevenueTypeModel, {
+          await baseController.isDeleted(trx, RevenueTypeModel, {
             revenue_type_id: req.params.revenue_type_id,
           })
         ) {
@@ -152,14 +152,15 @@ const revenueTypeController = {
 
       try {
         // do not allow update to deleted records
-        if (await baseController.isDeleted(RevenueTypeModel, { revenue_type_id })) {
+        if (await baseController.isDeleted(trx, RevenueTypeModel, { revenue_type_id })) {
           await trx.rollback();
           return res.status(404).send();
         }
 
         // if record exists then throw Conflict error
         if (
           await baseController.existsInTable(
+            trx,
             RevenueTypeModel,
             {
               revenue_name: data.revenue_name,

diff --git a/packages/api/src/routes/revenueTypeRoute.js b/packages/api/src/routes/revenueTypeRoute.js
@@ -26,7 +26,12 @@ router.post(
   checkScope(['add:revenue_types']),
   RevenueTypeController.addType(),
 );
-router.get('/', checkScope(['get:revenue_types']), RevenueTypeController.getAllTypes());
+router.get(
+  '/farm/:farm_id',
+  hasFarmAccess({ params: 'farm_id' }),
+  checkScope(['get:revenue_types']),
+  RevenueTypeController.getFarmRevenueType(),
+);
 router.get(
   '/:revenue_type_id',
   hasFarmAccess({ params: 'revenue_type_id' }),

diff --git a/packages/api/tests/revenue_type.test.js b/packages/api/tests/revenue_type.test.js
@@ -84,7 +84,7 @@ describe('Revenue Type Tests', () => {
   function getRequest({ user_id = newOwner.user_id, farm_id = farm.farm_id }, callback) {
     chai
       .request(server)
-      .get(`/revenue_type`)
+      .get(`/revenue_type/farm/${farm_id}`)
       .set('user_id', user_id)
       .set('farm_id', farm_id)
       .end(callback);