From 74c0d8eb52ece7d3f82fbea96f563650050c5fb2 Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Sat, 1 Aug 2026 13:22:51 +0100 Subject: [PATCH] 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 | 22 +++++++++--------- src/routes/finance/payments.js | 22 +++++++++--------- src/routes/finance/taxrecords.js | 4 ++-- src/routes/inventory/filamentstocks.js | 16 ++++++------- src/routes/inventory/orderitems.js | 24 ++++++++++---------- src/routes/inventory/partstocks.js | 4 ++-- src/routes/inventory/productstocks.js | 4 ++-- src/routes/inventory/purchaseorders.js | 26 +++++++++++----------- src/routes/inventory/shipments.js | 18 +++++++-------- src/routes/inventory/stockevents.js | 4 ++-- src/routes/inventory/stocklocations.js | 4 ++-- src/routes/inventory/stocktransfers.js | 4 ++-- src/routes/management/apppasswords.js | 4 ++-- src/routes/management/courier.js | 4 ++-- src/routes/management/courierservice.js | 24 ++++++++++---------- src/routes/management/documentjobs.js | 4 ++-- src/routes/management/documentprinters.js | 4 ++-- src/routes/management/documentsizes.js | 4 ++-- src/routes/management/documenttemplates.js | 4 ++-- src/routes/management/filaments.js | 6 ++--- src/routes/management/filamentskus.js | 4 ++-- src/routes/management/files.js | 4 ++-- src/routes/management/hosts.js | 4 ++-- src/routes/management/materials.js | 6 ++--- src/routes/management/notetypes.js | 4 ++-- src/routes/management/parts.js | 4 ++-- src/routes/management/partskus.js | 4 ++-- src/routes/management/productcategories.js | 4 ++-- src/routes/management/products.js | 4 ++-- src/routes/management/productskus.js | 4 ++-- src/routes/management/taxrates.js | 4 ++-- src/routes/management/users.js | 4 ++-- src/routes/management/vendors.js | 4 ++-- src/routes/misc/notes.js | 4 ++-- src/routes/production/filamentprofiles.js | 9 +++++--- src/routes/production/gcodefiles.js | 4 ++-- src/routes/production/jobs.js | 4 ++-- src/routes/production/printerprofiles.js | 9 +++++--- src/routes/production/subjobs.js | 4 ++-- src/routes/sales/clients.js | 4 ++-- src/routes/sales/listings.js | 24 ++++++++++---------- src/routes/sales/listingvarients.js | 22 +++++++++--------- src/routes/sales/marketplaces.js | 4 ++-- src/routes/sales/salesorders.js | 4 ++-- 44 files changed, 179 insertions(+), 173 deletions(-) diff --git a/src/routes/finance/invoices.js b/src/routes/finance/invoices.js index 4b039ce..019a3cf 100644 --- a/src/routes/finance/invoices.js +++ b/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 = [ - 'vendor', - 'client', - 'orderType', - 'order', - 'state.type', - 'value', - 'vendor._id', - 'client._id', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/finance/payments.js b/src/routes/finance/payments.js index f004fc4..96bcfff 100644 --- a/src/routes/finance/payments.js +++ b/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 = [ - 'vendor', - 'client', - 'invoice', - 'state.type', - 'value', - 'vendor._id', - 'client._id', - 'invoice._id', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/finance/taxrecords.js b/src/routes/finance/taxrecords.js index b053834..6a10ddc 100644 --- a/src/routes/finance/taxrecords.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/filamentstocks.js b/src/routes/inventory/filamentstocks.js index dc32832..4822556 100644 --- a/src/routes/inventory/filamentstocks.js +++ b/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 = [ - 'filament', - 'filament._id', - 'filamentSku', - 'state.type', - 'filamentSku._id', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/orderitems.js b/src/routes/inventory/orderitems.js index 5a27c9f..2d3f536 100644 --- a/src/routes/inventory/orderitems.js +++ b/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 = [ - 'name', - 'itemType', - 'item', - 'item._id', - 'order', - 'order._id', - 'orderType', - 'shipment', - 'shipment._id', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/partstocks.js b/src/routes/inventory/partstocks.js index b7f2429..5700953 100644 --- a/src/routes/inventory/partstocks.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/productstocks.js b/src/routes/inventory/productstocks.js index 12e3680..a708583 100644 --- a/src/routes/inventory/productstocks.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/purchaseorders.js b/src/routes/inventory/purchaseorders.js index e00b836..dab9f0e 100644 --- a/src/routes/inventory/purchaseorders.js +++ b/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 = [ - 'vendor', - 'state.type', - 'value', - 'vendor._id', - 'totalAmount', - 'totalAmountWithTax', - 'totalTaxAmount', - 'shippingAmount', - 'shippingAmountWithTax', - 'grandTotalAmount', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true); diff --git a/src/routes/inventory/shipments.js b/src/routes/inventory/shipments.js index bb4f58e..5aacb68 100644 --- a/src/routes/inventory/shipments.js +++ b/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 = [ - 'orderType', - 'order', - 'state.type', - 'courierService', - 'order._id', - 'taxRate', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true); diff --git a/src/routes/inventory/stockevents.js b/src/routes/inventory/stockevents.js index e78d8aa..34b4b3e 100644 --- a/src/routes/inventory/stockevents.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/stocklocations.js b/src/routes/inventory/stocklocations.js index b04dabd..8425e13 100644 --- a/src/routes/inventory/stocklocations.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/inventory/stocktransfers.js b/src/routes/inventory/stocktransfers.js index 80f1d21..40d465d 100644 --- a/src/routes/inventory/stocktransfers.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/apppasswords.js b/src/routes/management/apppasswords.js index f9ccb79..d9136cf 100644 --- a/src/routes/management/apppasswords.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); const masterFilter = req.query.masterFilter ? JSON.parse(req.query.masterFilter) : {}; listAppPasswordsByPropertiesRouteHandler(req, res, properties, filter, masterFilter); }); diff --git a/src/routes/management/courier.js b/src/routes/management/courier.js index 569da30..a3f22e0 100644 --- a/src/routes/management/courier.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/courierservice.js b/src/routes/management/courierservice.js index 5281a4b..45c97cc 100644 --- a/src/routes/management/courierservice.js +++ b/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 = [ - '_id', - 'courier', - 'courier._id', - 'name', - 'active', - 'tracked', - 'deliveryTime', - 'cost', - 'costWithTax', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/documentjobs.js b/src/routes/management/documentjobs.js index d70cb5f..b5f8a28 100644 --- a/src/routes/management/documentjobs.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/documentprinters.js b/src/routes/management/documentprinters.js index 7511604..8fb30cd 100644 --- a/src/routes/management/documentprinters.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/documentsizes.js b/src/routes/management/documentsizes.js index 5e116d9..6edc94c 100644 --- a/src/routes/management/documentsizes.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/documenttemplates.js b/src/routes/management/documenttemplates.js index a80d2db..9654c65 100644 --- a/src/routes/management/documenttemplates.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/filaments.js b/src/routes/management/filaments.js index c7815cd..1f23bea 100644 --- a/src/routes/management/filaments.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, 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); }); diff --git a/src/routes/management/filamentskus.js b/src/routes/management/filamentskus.js index 48a5c61..1ac3caf 100644 --- a/src/routes/management/filamentskus.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); let masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/files.js b/src/routes/management/files.js index b8e8bc2..0ac6b80 100644 --- a/src/routes/management/files.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/hosts.js b/src/routes/management/hosts.js index 2184f4a..3a586ce 100644 --- a/src/routes/management/hosts.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/materials.js b/src/routes/management/materials.js index 763178e..0837211 100644 --- a/src/routes/management/materials.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, 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); }); diff --git a/src/routes/management/notetypes.js b/src/routes/management/notetypes.js index 0edc3c7..3f9b2ea 100644 --- a/src/routes/management/notetypes.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/parts.js b/src/routes/management/parts.js index a8e6c85..8788185 100644 --- a/src/routes/management/parts.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/partskus.js b/src/routes/management/partskus.js index 15128b7..0df0b97 100644 --- a/src/routes/management/partskus.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); let masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/productcategories.js b/src/routes/management/productcategories.js index ed58ab1..facbe96 100644 --- a/src/routes/management/productcategories.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/products.js b/src/routes/management/products.js index 9e62c58..74a2fc5 100644 --- a/src/routes/management/products.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/productskus.js b/src/routes/management/productskus.js index 41c759f..20c1c08 100644 --- a/src/routes/management/productskus.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); let masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/taxrates.js b/src/routes/management/taxrates.js index 8ccc72d..2f9b3fb 100644 --- a/src/routes/management/taxrates.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/users.js b/src/routes/management/users.js index e09aef2..072d364 100644 --- a/src/routes/management/users.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/management/vendors.js b/src/routes/management/vendors.js index 4c3dc9d..4b9299e 100644 --- a/src/routes/management/vendors.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/misc/notes.js b/src/routes/misc/notes.js index f841a8b..e1a3115 100644 --- a/src/routes/misc/notes.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/production/filamentprofiles.js b/src/routes/production/filamentprofiles.js index 3d287d4..ffa212b 100644 --- a/src/routes/production/filamentprofiles.js +++ b/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); }); diff --git a/src/routes/production/gcodefiles.js b/src/routes/production/gcodefiles.js index 6a50a36..5afff4d 100644 --- a/src/routes/production/gcodefiles.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/production/jobs.js b/src/routes/production/jobs.js index a55baf6..a5f95a8 100644 --- a/src/routes/production/jobs.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/production/printerprofiles.js b/src/routes/production/printerprofiles.js index 102851f..327df40 100644 --- a/src/routes/production/printerprofiles.js +++ b/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); }); diff --git a/src/routes/production/subjobs.js b/src/routes/production/subjobs.js index 2620d5a..db84e36 100644 --- a/src/routes/production/subjobs.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/sales/clients.js b/src/routes/sales/clients.js index 4964ca9..06a9383 100644 --- a/src/routes/sales/clients.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/sales/listings.js b/src/routes/sales/listings.js index 75a24e7..91107b8 100644 --- a/src/routes/sales/listings.js +++ b/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 = [ - 'product', - 'vendor', - 'stockLocation', - 'marketplace', - 'courierServices', - 'state', - 'state.type', - 'createdAt', - 'updatedAt', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/sales/listingvarients.js b/src/routes/sales/listingvarients.js index c6eb5f2..431221a 100644 --- a/src/routes/sales/listingvarients.js +++ b/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 = [ - 'listing', - 'listing._id', - 'product', - 'productSku', - 'state', - 'state.type', - 'createdAt', - 'updatedAt', - ]; - const filter = getFilter(req.query, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/sales/marketplaces.js b/src/routes/sales/marketplaces.js index e344906..15525ca 100644 --- a/src/routes/sales/marketplaces.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = JSON.parse(req.query.masterFilter); diff --git a/src/routes/sales/salesorders.js b/src/routes/sales/salesorders.js index 558b3bf..ede7e44 100644 --- a/src/routes/sales/salesorders.js +++ b/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, listAllowedFilters, false); + const filter = getFilter(req.query, propertiesAllowedFilters, false); var masterFilter = {}; if (req.query.masterFilter) { masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);