feat: optimize dynamic list service.

feat: inactive mode for accounts, items, customers and vendors services.

server/src/api/controllers/Accounts.ts

@@ -29,11 +29,9 @@ export default class AccountsController extends BaseController {
 
     router.get(
       '/transactions',
-      [
-        query('account_id').optional().isInt().toInt(),
-      ],
+      [query('account_id').optional().isInt().toInt()],
       this.asyncMiddleware(this.accountTransactions.bind(this)),
-      this.catchServiceErrors,
+      this.catchServiceErrors
     );
     router.post(
       '/:id/activate',
@@ -136,6 +134,8 @@ export default class AccountsController extends BaseController {
 
       query('column_sort_by').optional(),
       query('sort_order').optional().isIn(['desc', 'asc']),
+
+      query('inactive_mode').optional().isBoolean().toBoolean(),
     ];
   }
 
@@ -213,7 +213,9 @@ export default class AccountsController extends BaseController {
         tenantId,
         accountId
       );
-    return res.status(200).send({ account: this.transfromToResponse(account) });
+      return res
+        .status(200)
+        .send({ account: this.transfromToResponse(account) });
     } catch (error) {
       next(error);
     }
@@ -256,7 +258,7 @@ export default class AccountsController extends BaseController {
 
       return res.status(200).send({
         id: accountId,
-        message: 'The account has been activated successfully.'
+        message: 'The account has been activated successfully.',
       });
     } catch (error) {
       next(error);
@@ -291,22 +293,24 @@ export default class AccountsController extends BaseController {
    * @param {Response} res
    * @param {Response}
    */
-  async getAccountsList(req: Request, res: Response, next: NextFunction) {
+  public async getAccountsList(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
-    const filter: IAccountsFilter = {
-      filterRoles: [],
+
+    // Filter query.
+    const filter = {
       sortOrder: 'asc',
       columnSortBy: 'name',
+      inactiveMode: false,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
+
     try {
-      const {
-        accounts,
-        filterMeta,
-      } = await this.accountsService.getAccountsList(tenantId, filter);
+      const { accounts, filterMeta } =
+        await this.accountsService.getAccountsList(tenantId, filter);
 
       return res.status(200).send({
         accounts: this.transfromToResponse(accounts, 'accountTypeLabel', req),
@@ -343,9 +347,9 @@ export default class AccountsController extends BaseController {
 
   /**
    * Retrieve accounts transactions list.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    * @returns {Response}
    */
   async accountTransactions(req: Request, res: Response, next: NextFunction) {
@@ -353,10 +357,11 @@ export default class AccountsController extends BaseController {
     const transactionsFilter = this.matchedQueryData(req);
 
     try {
-      const { transactions } = await this.accountsService.getAccountsTransactions(
-        tenantId,
-        transactionsFilter
-      );
+      const { transactions } =
+        await this.accountsService.getAccountsTransactions(
+          tenantId,
+          transactionsFilter
+        );
       return res.status(200).send({
         transactions: this.transfromToResponse(transactions),
       });
@@ -372,7 +377,12 @@ export default class AccountsController extends BaseController {
    * @param {Response} res
    * @param {ServiceError} error
    */
-  catchServiceErrors(error, req: Request, res: Response, next: NextFunction) {
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'account_not_found') {
         return res.boom.notFound('The given account not found.', {

server/src/api/controllers/Contacts/Customers.ts

@@ -120,6 +120,8 @@ export default class CustomersController extends ContactsController {
 
       query('custom_view_id').optional().isNumeric().toInt(),
       query('stringified_filter_roles').optional().isJSON(),
+
+      query('inactive_mode').optional().isBoolean().toBoolean(),
     ];
   }
 
@@ -264,17 +266,15 @@ export default class CustomersController extends ContactsController {
    */
   async getCustomersList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
+
     const filter = {
-      filterRoles: [],
+      inactiveMode: false,
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
 
     try {
       const {

server/src/api/controllers/Contacts/Vendors.ts

@@ -100,6 +100,8 @@ export default class VendorsController extends ContactsController {
 
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
+
+      query('inactive_mode').optional().isBoolean().toBoolean(),
     ];
   }
 
@@ -227,8 +229,13 @@ export default class VendorsController extends ContactsController {
    */
   async getVendorsList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
+
     const vendorsFilter: IVendorsFilter = {
-      filterRoles: [],
+      inactiveMode: false,
+      sortOrder: 'asc',
+      columnSortBy: 'created_at',
+      page: 1,
+      pageSize: 12,
       ...this.matchedQueryData(req),
     };
 

server/src/api/controllers/Expenses.ts

@@ -290,16 +290,12 @@ export default class ExpensesController extends BaseController {
   async getExpensesList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
 
     try {
       const { expenses, pagination, filterMeta } =

server/src/api/controllers/FinancialStatements/JournalSheet.ts

@@ -32,13 +32,8 @@ export default class JournalSheetController extends BaseFinancialReportControlle
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
-      oneOf(
-        [
-          query('transaction_types').optional().isArray({ min: 1 }),
-          query('transaction_types.*').optional().isNumeric().toInt(),
-        ],
-        [query('transaction_types').optional().trim().escape()]
-      ),
+      query('transaction_type').optional().trim().escape(),
+      query('transaction_id').optional().isInt().toInt(),
       oneOf(
         [
           query('account_ids').optional().isArray({ min: 1 }),

server/src/api/controllers/ItemCategories.ts

@@ -199,8 +199,8 @@ export default class ItemsCategoriesController extends BaseController {
    */
   async getList(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
+
     const itemCategoriesFilter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       ...this.matchedQueryData(req),

server/src/api/controllers/Items.ts

@@ -185,6 +185,8 @@ export default class ItemsController extends BaseController {
 
       query('custom_view_id').optional().isNumeric().toInt(),
       query('stringified_filter_roles').optional().isJSON(),
+
+      query('inactive_mode').optional().isBoolean().toBoolean(),
     ];
   }
 
@@ -339,17 +341,16 @@ export default class ItemsController extends BaseController {
    */
   async getItemsList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
+
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
+      inactiveMode: false,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
+
     try {
       const {
         items,

server/src/api/controllers/ManualJournals.ts

@@ -288,14 +288,10 @@ export default class ManualJournalsController extends BaseController {
     const filter = {
       sortOrder: 'asc',
       columnSortBy: 'created_at',
-      filterRoles: [],
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
     try {
       const {
         manualJournals,

server/src/api/controllers/Purchases/Bills.ts

@@ -1,5 +1,6 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { check, param, query } from 'express-validator';
+import * as R from 'ramda';
 import { Service, Inject } from 'typedi';
 import { IBillDTO, IBillEditDTO } from 'interfaces';
 import asyncMiddleware from 'api/middleware/asyncMiddleware';
@@ -300,14 +301,11 @@ export default class BillsController extends BaseController {
     const filter = {
       page: 1,
       pageSize: 12,
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
+
     try {
       const { bills, pagination, filterMeta } =
         await this.billsService.getBills(tenantId, filter);

server/src/api/controllers/Resources.ts

@@ -1,16 +1,13 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import {
-  param,
-  query,
-} from 'express-validator';
+import { param, query } from 'express-validator';
 import asyncMiddleware from 'api/middleware/asyncMiddleware';
 import BaseController from './BaseController';
 import { ServiceError } from 'exceptions';
 import ResourceService from 'services/Resource/ResourceService';
 
 @Service()
-export default class ResourceController extends BaseController{
+export default class ResourceController extends BaseController {
   @Inject()
   resourcesService: ResourceService;
 
@@ -21,42 +18,76 @@ export default class ResourceController extends BaseController{
     const router = Router();
 
     router.get(
-      '/:resource_model/fields', [
-        ...this.resourceModelParamSchema,
-      ],
+      '/:resource_model/meta',
+      [...this.resourceModelParamSchema],
+      this.asyncMiddleware(this.resourceMeta.bind(this)),
+      this.handleServiceErrors
+    );
+
+    router.get(
+      '/:resource_model/fields',
+      [...this.resourceModelParamSchema],
       this.validationResult,
       asyncMiddleware(this.resourceFields.bind(this)),
       this.handleServiceErrors
     );
     router.get(
-      '/:resource_model/data', [
-        ...this.resourceModelParamSchema,
-      ],
+      '/:resource_model/data',
+      [...this.resourceModelParamSchema],
       this.validationResult,
       asyncMiddleware(this.resourceData.bind(this)),
-      this.handleServiceErrors,
-    )
+      this.handleServiceErrors
+    );
     return router;
   }
 
   get resourceModelParamSchema() {
-    return [
-      param('resource_model').exists().trim().escape(),
-    ];
+    return [param('resource_model').exists().trim().escape()];
   }
 
+  /**
+   * Retrieve resource model meta.
+   * @param {Request} req -
+   * @param {Response} res -
+   * @param {NextFunction} next -
+   * @returns {Response}
+   */
+  private resourceMeta = (
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ): Response => {
+    const { tenantId } = req;
+    const { resource_model: resourceModel } = req.params;
+
+    try {
+      const resourceMeta = this.resourcesService.getResourceMeta(
+        tenantId,
+        resourceModel
+      );
+      return res
+        .status(200)
+        .send({ resource_meta: this.transfromToResponse(resourceMeta) });
+    } catch (error) {
+      next(error);
+    }
+  };
+
   /**
    * Retrieve resource fields of the given resource.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
   resourceFields(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { resource_model: resourceModel } = req.params;
 
     try {
-      const resourceFields = this.resourcesService.getResourceFields(tenantId, resourceModel);
+      const resourceFields = this.resourcesService.getResourceFields(
+        tenantId,
+        resourceModel
+      );
 
       return res.status(200).send({
         resource_fields: this.transfromToResponse(resourceFields),
@@ -68,9 +99,9 @@ export default class ResourceController extends BaseController{
 
   /**
    * Retrieve resource data of the give resource based on the given query.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
   async resourceData(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
@@ -78,7 +109,11 @@ export default class ResourceController extends BaseController{
     const filter = req.query;
 
     try {
-      const resourceData = await this.resourcesService.getResourceData(tenantId, resourceModel, filter);
+      const resourceData = await this.resourcesService.getResourceData(
+        tenantId,
+        resourceModel,
+        filter
+      );
 
       return res.status(200).send({
         resource_data: this.transfromToResponse(resourceData),
@@ -90,12 +125,17 @@ export default class ResourceController extends BaseController{
 
   /**
    * Handles service errors.
-   * @param {Error} error 
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Error} error
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
-  handleServiceErrors(error: Error, req: Request, res: Response, next: NextFunction) {
+  private handleServiceErrors(
+    error: Error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'RESOURCE_MODEL_NOT_FOUND') {
         return res.status(400).send({
@@ -105,4 +145,4 @@ export default class ResourceController extends BaseController{
     }
     next(error);
   }
-};
+}

server/src/api/controllers/Sales/PaymentReceives.ts

@@ -261,16 +261,12 @@ export default class PaymentReceivesController extends BaseController {
   async getPaymentReceiveList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
 
     try {
       const {

server/src/api/controllers/Sales/SalesEstimates.ts

@@ -2,11 +2,11 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { check, param, query, matchedData } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import { ISaleEstimateDTO } from 'interfaces';
-import BaseController from 'api/controllers/BaseController'
+import BaseController from 'api/controllers/BaseController';
 import asyncMiddleware from 'api/middleware/asyncMiddleware';
 import SaleEstimateService from 'services/Sales/SalesEstimate';
 import DynamicListingService from 'services/DynamicListing/DynamicListService';
-import { ServiceError } from "exceptions";
+import { ServiceError } from 'exceptions';
 
 @Service()
 export default class SalesEstimatesController extends BaseController {
@@ -23,63 +23,56 @@ export default class SalesEstimatesController extends BaseController {
     const router = Router();
 
     router.post(
-      '/', [
-        ...this.estimateValidationSchema,
-      ],
+      '/',
+      [...this.estimateValidationSchema],
       this.validationResult,
       asyncMiddleware(this.newEstimate.bind(this)),
-      this.handleServiceErrors,
+      this.handleServiceErrors
     );
     router.post(
       '/:id/deliver',
-      [
-        ...this.validateSpecificEstimateSchema,
-      ],
+      [...this.validateSpecificEstimateSchema],
       this.validationResult,
       asyncMiddleware(this.deliverSaleEstimate.bind(this)),
-      this.handleServiceErrors,
+      this.handleServiceErrors
     );
     router.post(
       '/:id/approve',
-      [
-        this.validateSpecificEstimateSchema,
-      ],
+      [this.validateSpecificEstimateSchema],
       this.validationResult,
       asyncMiddleware(this.approveSaleEstimate.bind(this)),
       this.handleServiceErrors
     );
     router.post(
       '/:id/reject',
-      [
-        this.validateSpecificEstimateSchema,
-      ],
+      [this.validateSpecificEstimateSchema],
       this.validationResult,
       asyncMiddleware(this.rejectSaleEstimate.bind(this)),
-      this.handleServiceErrors,
-    )
+      this.handleServiceErrors
+    );
     router.post(
-      '/:id', [
+      '/:id',
+      [
         ...this.validateSpecificEstimateSchema,
         ...this.estimateValidationSchema,
       ],
       this.validationResult,
       asyncMiddleware(this.editEstimate.bind(this)),
-      this.handleServiceErrors,
+      this.handleServiceErrors
     );
     router.delete(
-      '/:id', [
-        this.validateSpecificEstimateSchema,
-      ],
+      '/:id',
+      [this.validateSpecificEstimateSchema],
       this.validationResult,
       asyncMiddleware(this.deleteEstimate.bind(this)),
-      this.handleServiceErrors,
+      this.handleServiceErrors
     );
     router.get(
       '/:id',
       this.validateSpecificEstimateSchema,
       this.validationResult,
       asyncMiddleware(this.getEstimate.bind(this)),
-      this.handleServiceErrors,
+      this.handleServiceErrors
     );
     router.get(
       '/',
@@ -87,7 +80,7 @@ export default class SalesEstimatesController extends BaseController {
       this.validationResult,
       asyncMiddleware(this.getEstimates.bind(this)),
       this.handleServiceErrors,
-      this.dynamicListService.handlerErrorsToResponse,
+      this.dynamicListService.handlerErrorsToResponse
     );
     return router;
   }
@@ -109,8 +102,14 @@ export default class SalesEstimatesController extends BaseController {
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.quantity').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim().escape(),
-      check('entries.*.discount').optional({ nullable: true }).isNumeric().toFloat(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
+      check('entries.*.discount')
+        .optional({ nullable: true })
+        .isNumeric()
+        .toFloat(),
 
       check('note').optional().trim().escape(),
       check('terms_conditions').optional().trim().escape(),
@@ -122,9 +121,7 @@ export default class SalesEstimatesController extends BaseController {
    * Specific sale estimate validation schema.
    */
   get validateSpecificEstimateSchema() {
-    return [
-      param('id').exists().isNumeric().toInt(),
-    ];
+    return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
@@ -137,8 +134,8 @@ export default class SalesEstimatesController extends BaseController {
       query('column_sort_by').optional(),
       query('sort_order').optional().isIn(['desc', 'asc']),
       query('page').optional().isNumeric().toInt(),
-      query('page_size').optional().isNumeric().toInt(), 
-    ]
+      query('page_size').optional().isNumeric().toInt(),
+    ];
   }
 
   /**
@@ -152,7 +149,10 @@ export default class SalesEstimatesController extends BaseController {
     const estimateDTO: ISaleEstimateDTO = this.matchedBodyData(req);
 
     try {
-      const storedEstimate = await this.saleEstimateService.createEstimate(tenantId, estimateDTO);
+      const storedEstimate = await this.saleEstimateService.createEstimate(
+        tenantId,
+        estimateDTO
+      );
 
       return res.status(200).send({
         id: storedEstimate.id,
@@ -165,8 +165,8 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Handle update estimate details with associated entries.
-   * @param {Request} req 
-   * @param {Response} res 
+   * @param {Request} req
+   * @param {Response} res
    */
   async editEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
@@ -175,12 +175,16 @@ export default class SalesEstimatesController extends BaseController {
 
     try {
       // Update estimate with associated estimate entries.
-      await this.saleEstimateService.editEstimate(tenantId, estimateId, estimateDTO);
+      await this.saleEstimateService.editEstimate(
+        tenantId,
+        estimateId,
+        estimateDTO
+      );
 
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been created successfully.',
-      });  
+      });
     } catch (error) {
       next(error);
     }
@@ -188,8 +192,8 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Deletes the given estimate with associated entries.
-   * @param {Request} req 
-   * @param {Response} res 
+   * @param {Request} req
+   * @param {Response} res
    */
   async deleteEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
@@ -200,7 +204,7 @@ export default class SalesEstimatesController extends BaseController {
 
       return res.status(200).send({
         id: estimateId,
-        message: 'The sale estimate has been deleted successfully.'
+        message: 'The sale estimate has been deleted successfully.',
       });
     } catch (error) {
       next(error);
@@ -209,8 +213,8 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Deliver the given sale estimate.
-   * @param {Request} req 
-   * @param {Response} res 
+   * @param {Request} req
+   * @param {Response} res
    */
   async deliverSaleEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
@@ -230,9 +234,9 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Marks the sale estimate as approved.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
   async approveSaleEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
@@ -252,9 +256,9 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Marks the sale estimate as rejected.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
   async rejectSaleEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
@@ -274,16 +278,19 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Retrieve the given estimate with associated entries.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
   async getEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      const estimate = await this.saleEstimateService.getEstimate(tenantId, estimateId);
+      const estimate = await this.saleEstimateService.getEstimate(
+        tenantId,
+        estimateId
+      );
 
       return res.status(200).send({ estimate });
     } catch (error) {
@@ -293,35 +300,28 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Retrieve estimates with pagination metadata.
-   * @param {Request} req 
-   * @param {Response} res 
+   * @param {Request} req
+   * @param {Response} res
    */
   async getEstimates(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
 
     try {
-      const {
-        salesEstimates,
-        pagination,
-        filterMeta
-      } = await this.saleEstimateService.estimatesList(tenantId, filter);
+      const { salesEstimates, pagination, filterMeta } =
+        await this.saleEstimateService.estimatesList(tenantId, filter);
 
       return res.status(200).send({
         sales_estimates: this.transfromToResponse(salesEstimates),
         pagination,
         filter_meta: this.transfromToResponse(filterMeta),
-      })
+      });
     } catch (error) {
       next(error);
     }
@@ -329,12 +329,17 @@ export default class SalesEstimatesController extends BaseController {
 
   /**
    * Handles service errors.
-   * @param {Error} error 
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
+   * @param {Error} error
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
    */
-  handleServiceErrors(error: Error, req: Request, res: Response, next: NextFunction) {
+  private handleServiceErrors(
+    error: Error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'ITEMS_NOT_FOUND') {
         return res.boom.badRequest(null, {
@@ -409,4 +414,4 @@ export default class SalesEstimatesController extends BaseController {
     }
     next(error);
   }
-};
+}

server/src/api/controllers/Sales/SalesInvoices.ts

@@ -284,23 +284,15 @@ export default class SaleInvoicesController extends BaseController {
   ) {
     const { tenantId } = req;
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
-
     try {
-      const {
-        salesInvoices,
-        filterMeta,
-        pagination,
-      } = await this.saleInvoiceService.salesInvoicesList(tenantId, filter);
+      const { salesInvoices, filterMeta, pagination } =
+        await this.saleInvoiceService.salesInvoicesList(tenantId, filter);
 
       return res.status(200).send({
         sales_invoices: salesInvoices,

server/src/api/controllers/Sales/SalesReceipts.ts

@@ -230,16 +230,12 @@ export default class SalesReceiptsController extends BaseController {
   async getSalesReceipts(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
-      filterRoles: [],
       sortOrder: 'asc',
       columnSortBy: 'created_at',
       page: 1,
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-    if (filter.stringifiedFilterRoles) {
-      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
-    }
 
     try {
       const {