Refactor propertiesAllowedFilters across various routes to streamline filtering logic. Removed redundant allowedFilters definitions and replaced them with propertiesAllowedFilters for improved query handling in finance, inventory, and management modules.

src/routes/finance/invoices.js

@@ -14,6 +14,16 @@ const listAllowedFilters = [
     'order._id',
     'orderType',
   ];
+const propertiesAllowedFilters = [
+    'vendor',
+    'client',
+    'orderType',
+    'order',
+    'state.type',
+    'value',
+    'vendor._id',
+    'client._id',
+  ];
 import {
   listInvoicesRouteHandler,
   getInvoiceRouteHandler,
@@ -42,17 +52,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'vendor',
-    'client',
-    'orderType',
-    'order',
-    'state.type',
-    'value',
-    'vendor._id',
-    'client._id',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/finance/payments.js

@@ -13,6 +13,16 @@ const listAllowedFilters = [
     'invoice',
     'invoice._id',
   ];
+const propertiesAllowedFilters = [
+    'vendor',
+    'client',
+    'invoice',
+    'state.type',
+    'value',
+    'vendor._id',
+    'client._id',
+    'invoice._id',
+  ];
 import {
   listPaymentsRouteHandler,
   getPaymentRouteHandler,
@@ -42,17 +52,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'vendor',
-    'client',
-    'invoice',
-    'state.type',
-    'value',
-    'vendor._id',
-    'client._id',
-    'invoice._id',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/finance/taxrecords.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['taxRate', 'transactionType', 'transaction', 'transactionDate'];
+const propertiesAllowedFilters = ['taxRate', 'transactionType', 'transaction'];
 import {
   listTaxRecordsRouteHandler,
   getTaxRecordRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['taxRate', 'transactionType', 'transaction'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/filamentstocks.js

@@ -15,6 +15,13 @@ const listAllowedFilters = [
     'stockLocation',
     'stockLocation._id',
   ];
+const propertiesAllowedFilters = [
+    'filament',
+    'filament._id',
+    'filamentSku',
+    'state.type',
+    'filamentSku._id',
+  ];
 import {
   listFilamentStocksRouteHandler,
   getFilamentStockRouteHandler,
@@ -40,14 +47,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'filament',
-    'filament._id',
-    'filamentSku',
-    'state.type',
-    'filamentSku._id',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/orderitems.js

@@ -15,6 +15,17 @@ const listAllowedFilters = [
     'shipment',
     'shipment._id',
   ];
+const propertiesAllowedFilters = [
+    'name',
+    'itemType',
+    'item',
+    'item._id',
+    'order',
+    'order._id',
+    'orderType',
+    'shipment',
+    'shipment._id',
+  ];
 import {
   listOrderItemsRouteHandler,
   getOrderItemRouteHandler,
@@ -40,18 +51,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'name',
-    'itemType',
-    'item',
-    'item._id',
-    'order',
-    'order._id',
-    'orderType',
-    'shipment',
-    'shipment._id',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/partstocks.js

@@ -13,6 +13,7 @@ const listAllowedFilters = [
     'stockLocation',
     'stockLocation._id',
   ];
+const propertiesAllowedFilters = ['part', 'state.type'];
 import {
   listPartStocksRouteHandler,
   getPartStockRouteHandler,
@@ -38,8 +39,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['part', 'state.type'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/productstocks.js

@@ -12,6 +12,7 @@ const listAllowedFilters = [
     'stockLocation',
     'stockLocation._id',
   ];
+const propertiesAllowedFilters = ['productSku', 'state.type'];
 import {
   listProductStocksRouteHandler,
   getProductStockRouteHandler,
@@ -37,8 +38,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['productSku', 'state.type'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/purchaseorders.js

@@ -16,6 +16,18 @@ const listAllowedFilters = [
     'shippingAmountWithTax',
     'grandTotalAmount',
   ];
+const propertiesAllowedFilters = [
+    'vendor',
+    'state.type',
+    'value',
+    'vendor._id',
+    'totalAmount',
+    'totalAmountWithTax',
+    'totalTaxAmount',
+    'shippingAmount',
+    'shippingAmountWithTax',
+    'grandTotalAmount',
+  ];
 import {
   listPurchaseOrdersRouteHandler,
   getPurchaseOrderRouteHandler,
@@ -44,19 +56,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'vendor',
-    'state.type',
-    'value',
-    'vendor._id',
-    'totalAmount',
-    'totalAmountWithTax',
-    'totalTaxAmount',
-    'shippingAmount',
-    'shippingAmountWithTax',
-    'grandTotalAmount',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);

src/routes/inventory/shipments.js

@@ -5,6 +5,14 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['orderType', 'order', 'state', 'courierService', 'order._id', 'taxRate'];
+const propertiesAllowedFilters = [
+    'orderType',
+    'order',
+    'state.type',
+    'courierService',
+    'order._id',
+    'taxRate',
+  ];
 import {
   listShipmentsRouteHandler,
   getShipmentRouteHandler,
@@ -33,15 +41,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'orderType',
-    'order',
-    'state.type',
-    'courierService',
-    'order._id',
-    'taxRate',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);

src/routes/inventory/stockevents.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['owner._id', 'parent._id'];
+const propertiesAllowedFilters = ['owner._id', 'parent._id'];
 import {
   listStockEventsRouteHandler,
   getStockEventRouteHandler,
@@ -30,8 +31,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['owner._id', 'parent._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/stocklocations.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name'];
+const propertiesAllowedFilters = ['name'];
 import {
   listStockLocationsRouteHandler,
   getStockLocationRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/inventory/stocktransfers.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['state', 'state.type', 'postedAt'];
+const propertiesAllowedFilters = ['state.type'];
 import {
   listStockTransfersRouteHandler,
   getStockTransferRouteHandler,
@@ -30,8 +31,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['state.type'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/apppasswords.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'user', 'active', 'user._id'];
+const propertiesAllowedFilters = ['name', 'user', 'active'];
 import {
   listAppPasswordsRouteHandler,
   getAppPasswordRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   const properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name', 'user', 'active'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   const masterFilter = req.query.masterFilter ? JSON.parse(req.query.masterFilter) : {};
   listAppPasswordsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });

src/routes/management/courier.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'website', 'email', 'phone', 'contact', 'country'];
+const propertiesAllowedFilters = ['name', 'website', 'email', 'phone', 'contact', 'country'];
 import {
   listCouriersRouteHandler,
   getCourierRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name', 'website', 'email', 'phone', 'contact', 'country'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/courierservice.js

@@ -15,6 +15,17 @@ const listAllowedFilters = [
     'cost',
     'costWithTax',
   ];
+const propertiesAllowedFilters = [
+    '_id',
+    'courier',
+    'courier._id',
+    'name',
+    'active',
+    'tracked',
+    'deliveryTime',
+    'cost',
+    'costWithTax',
+  ];
 import {
   listCourierServicesRouteHandler,
   getCourierServiceRouteHandler,
@@ -39,18 +50,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    '_id',
-    'courier',
-    'courier._id',
-    'name',
-    'active',
-    'tracked',
-    'deliveryTime',
-    'cost',
-    'costWithTax',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/documentjobs.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'width', 'height'];
+const propertiesAllowedFilters = [];
 import {
   listDocumentJobsRouteHandler,
   getDocumentJobRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/documentprinters.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'tags', 'active', 'isGlobal'];
+const propertiesAllowedFilters = ['tags'];
 import {
   listDocumentPrintersRouteHandler,
   getDocumentPrinterRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['tags'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/documentsizes.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'width', 'height'];
+const propertiesAllowedFilters = [];
 import {
   listDocumentSizesRouteHandler,
   getDocumentSizeRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/documenttemplates.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'tags', 'active', 'global', 'objectType'];
+const propertiesAllowedFilters = ['documentSize', 'tags'];
 import {
   listDocumentTemplatesRouteHandler,
   getDocumentTemplateRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['documentSize', 'tags'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/filaments.js

@@ -5,6 +5,7 @@ import { convertPropertiesString, getFilter, parseFilter } from '../../utils.js'
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'material', 'material._id', 'diameter', 'name', 'cost'];
+const propertiesAllowedFilters = ['diameter', 'material'];
 import {
   listFilamentsRouteHandler,
   listFilamentsByPropertiesRouteHandler,
@@ -41,8 +42,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['diameter', 'material'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);
@@ -76,7 +76,7 @@ router.get('/history', isAuthenticated, (req, res) => {
 
 router.get('/neighbors', isAuthenticated, (req, res) => {
   const { property, search, sort, order, id } = req.query;
-  const filter = getFilter(req.query, listAllowedFilters, false);
+  const filter = getFilter(req.query, listAllowedFilters);
   getFilamentNeighborsRouteHandler(req, res, property, filter, search, sort, order, id);
 });
 

src/routes/management/filamentskus.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'barcode', 'filament', 'filament._id', 'name', 'color', 'cost', 'costWithTax'];
+const propertiesAllowedFilters = ['filament', 'filament._id'];
 import {
   listFilamentSkusRouteHandler,
   getFilamentSkuRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['filament', 'filament._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   let masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/files.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'type', 'size', 'extension'];
+const propertiesAllowedFilters = ['type', 'extension'];
 import {
   listFilesRouteHandler,
   getFileRouteHandler,
@@ -32,8 +33,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['type', 'extension'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/hosts.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'tags'];
+const propertiesAllowedFilters = ['tags'];
 import {
   listHostsRouteHandler,
   getHostRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['tags'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/materials.js

@@ -5,6 +5,7 @@ import { convertPropertiesString, getFilter, parseFilter } from '../../utils.js'
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'tags'];
+const propertiesAllowedFilters = ['name', 'tags'];
 import {
   listMaterialsRouteHandler,
   listMaterialsByPropertiesRouteHandler,
@@ -37,8 +38,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name', 'tags'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);
@@ -72,7 +72,7 @@ router.get('/history', isAuthenticated, (req, res) => {
 
 router.get('/neighbors', isAuthenticated, (req, res) => {
   const { property, search, sort, order, id } = req.query;
-  const filter = getFilter(req.query, listAllowedFilters, false);
+  const filter = getFilter(req.query, listAllowedFilters);
   getMaterialNeighborsRouteHandler(req, res, property, filter, search, sort, order, id);
 });
 

src/routes/management/notetypes.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'active', 'color'];
+const propertiesAllowedFilters = ['active', 'color'];
 import {
   listNoteTypesRouteHandler,
   getNoteTypeRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['active', 'color'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/parts.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['product._id', '_id', 'name'];
+const propertiesAllowedFilters = ['product._id'];
 import {
   listPartsRouteHandler,
   getPartRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['product._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/partskus.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'barcode', 'part', 'part._id', 'name', 'cost', 'price'];
+const propertiesAllowedFilters = ['part', 'part._id'];
 import {
   listPartSkusRouteHandler,
   getPartSkuRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['part', 'part._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   let masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/productcategories.js

@@ -19,6 +19,7 @@ import {
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name'];
+const propertiesAllowedFilters = ['name'];
 
 router.get('/', isAuthenticated, (req, res) => {
   const { page, limit, property, search, sort, order } = req.query;
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   const properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/products.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'globalPrice', 'productCategory', 'productCategory._id'];
+const propertiesAllowedFilters = [];
 import {
   listProductsRouteHandler,
   getProductRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/productskus.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'barcode', 'product', 'product._id', 'name', 'cost', 'price'];
+const propertiesAllowedFilters = ['product', 'product._id'];
 import {
   listProductSkusRouteHandler,
   getProductSkuRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['product', 'product._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   let masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/taxrates.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'rate', 'rateType', 'active', 'country'];
+const propertiesAllowedFilters = ['rateType', 'country', 'active'];
 import {
   listTaxRatesRouteHandler,
   getTaxRateRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['rateType', 'country', 'active'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/users.js

@@ -5,6 +5,7 @@ import { convertPropertiesString, getFilter } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'username', 'firstName', 'lastName', 'email'];
+const propertiesAllowedFilters = [];
 import {
   listUsersRouteHandler,
   listUsersByPropertiesRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/management/vendors.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
+const propertiesAllowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
 import {
   listVendorsRouteHandler,
   getVendorRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/misc/notes.js

@@ -18,6 +18,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['parent._id'];
+const propertiesAllowedFilters = ['parent'];
 
 // list of notes
 router.get('/', isAuthenticated, (req, res) => {
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['parent'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/production/filamentprofiles.js

@@ -16,15 +16,18 @@ import {
 
 const router = express.Router();
 
+const listAllowedFilters = ['_id', 'name'];
+const propertiesAllowedFilters = ['name'];
+
 router.get('/', isAuthenticated, (req, res) => {
   const { page, limit, property, search, sort, order } = req.query;
-  const filter = getFilter(req.query, ['_id', 'name']);
+  const filter = getFilter(req.query, listAllowedFilters);
   listFilamentProfilesRouteHandler(req, res, page, limit, property, filter, search, sort, order);
 });
 
 router.get('/properties', isAuthenticated, (req, res) => {
   const properties = convertPropertiesString(req.query.properties);
-  const filter = getFilter(req.query, ['name'], false);
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);
@@ -47,7 +50,7 @@ router.post('/', isAuthenticated, (req, res) => {
 
 router.get('/neighbors', isAuthenticated, (req, res) => {
   const { property, search, sort, order, id } = req.query;
-  const filter = getFilter(req.query, ['_id', 'name']);
+  const filter = getFilter(req.query, listAllowedFilters);
   getFilamentProfileNeighborsRouteHandler(req, res, property, filter, search, sort, order, id);
 });
 

src/routes/production/gcodefiles.js

@@ -4,6 +4,7 @@ import { isAuthenticated } from '../../keycloak.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'name', 'filament', 'filament._id', 'filamentSku', 'filamentSku._id'];
+const propertiesAllowedFilters = ['filament', 'filament._id', 'filamentSku', 'filamentSku._id'];
 import {
   listGCodeFilesRouteHandler,
   editGCodeFileRouteHandler,
@@ -28,8 +29,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['filament', 'filament._id', 'filamentSku', 'filamentSku._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/production/jobs.js

@@ -4,6 +4,7 @@ import { isAuthenticated } from '../../keycloak.js';
 const router = express.Router();
 
 const listAllowedFilters = ['state', 'gcodeFile._id', 'quantity'];
+const propertiesAllowedFilters = ['state'];
 import {
   listJobsRouteHandler,
   listJobsByPropertiesRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['state'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/production/printerprofiles.js

@@ -16,15 +16,18 @@ import {
 
 const router = express.Router();
 
+const listAllowedFilters = ['_id', 'name'];
+const propertiesAllowedFilters = ['name'];
+
 router.get('/', isAuthenticated, (req, res) => {
   const { page, limit, property, search, sort, order } = req.query;
-  const filter = getFilter(req.query, ['_id', 'name']);
+  const filter = getFilter(req.query, listAllowedFilters);
   listPrinterProfilesRouteHandler(req, res, page, limit, property, filter, search, sort, order);
 });
 
 router.get('/properties', isAuthenticated, (req, res) => {
   const properties = convertPropertiesString(req.query.properties);
-  const filter = getFilter(req.query, ['name'], false);
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);
@@ -47,7 +50,7 @@ router.post('/', isAuthenticated, (req, res) => {
 
 router.get('/neighbors', isAuthenticated, (req, res) => {
   const { property, search, sort, order, id } = req.query;
-  const filter = getFilter(req.query, ['_id', 'name']);
+  const filter = getFilter(req.query, listAllowedFilters);
   getPrinterProfileNeighborsRouteHandler(req, res, property, filter, search, sort, order, id);
 });
 

src/routes/production/subjobs.js

@@ -4,6 +4,7 @@ import { isAuthenticated } from '../../keycloak.js';
 const router = express.Router();
 
 const listAllowedFilters = ['_id', 'job._id', 'printer._id'];
+const propertiesAllowedFilters = ['job'];
 import {
   listSubJobsRouteHandler,
   listSubJobsByPropertiesRouteHandler,
@@ -26,8 +27,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['job'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/sales/clients.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
+const propertiesAllowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
 import {
   listClientsRouteHandler,
   getClientRouteHandler,
@@ -29,8 +30,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['country', 'active', 'createdAt', 'updatedAt'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/sales/listings.js

@@ -15,6 +15,17 @@ const listAllowedFilters = [
     'createdAt',
     'updatedAt',
   ];
+const propertiesAllowedFilters = [
+    'product',
+    'vendor',
+    'stockLocation',
+    'marketplace',
+    'courierServices',
+    'state',
+    'state.type',
+    'createdAt',
+    'updatedAt',
+  ];
 import {
   listListingsRouteHandler,
   getListingRouteHandler,
@@ -40,18 +51,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'product',
-    'vendor',
-    'stockLocation',
-    'marketplace',
-    'courierServices',
-    'state',
-    'state.type',
-    'createdAt',
-    'updatedAt',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/sales/listingvarients.js

@@ -14,6 +14,16 @@ const listAllowedFilters = [
     'createdAt',
     'updatedAt',
   ];
+const propertiesAllowedFilters = [
+    'listing',
+    'listing._id',
+    'product',
+    'productSku',
+    'state',
+    'state.type',
+    'createdAt',
+    'updatedAt',
+  ];
 import {
   listListingVarientsRouteHandler,
   getListingVarientRouteHandler,
@@ -39,17 +49,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = [
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-    'listing',
-    'listing._id',
-    'product',
-    'productSku',
-    'state',
-    'state.type',
-    'createdAt',
-    'updatedAt',
-  ];
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/sales/marketplaces.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['name', 'provider', 'active', 'connected', 'state.type', 'createdAt', 'updatedAt'];
+const propertiesAllowedFilters = ['name', 'provider', 'active', 'connected', 'state.type', 'createdAt', 'updatedAt'];
 import {
   listMarketplacesRouteHandler,
   getMarketplaceRouteHandler,
@@ -34,8 +35,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['name', 'provider', 'active', 'connected', 'state.type', 'createdAt', 'updatedAt'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = JSON.parse(req.query.masterFilter);

src/routes/sales/salesorders.js

@@ -5,6 +5,7 @@ import { getFilter, convertPropertiesString } from '../../utils.js';
 const router = express.Router();
 
 const listAllowedFilters = ['client', 'state', 'value', 'client._id'];
+const propertiesAllowedFilters = ['client', 'state.type', 'value', 'client._id'];
 import {
   listSalesOrdersRouteHandler,
   getSalesOrderRouteHandler,
@@ -33,8 +34,7 @@ router.get('/', isAuthenticated, (req, res) => {
 
 router.get('/properties', isAuthenticated, (req, res) => {
   let properties = convertPropertiesString(req.query.properties);
-  const allowedFilters = ['client', 'state.type', 'value', 'client._id'];
+  const filter = getFilter(req.query, propertiesAllowedFilters, false);
-  const filter = getFilter(req.query, listAllowedFilters, false);
   var masterFilter = {};
   if (req.query.masterFilter) {
     masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);