farmcontrol/farmcontrol-api
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor allowedFilters in inventory and management routes to improve consistency and readability. Cleaned up whitespace and ensured all filters are properly formatted for better query handling across purchase orders, shipments, and filament SKUs.
Some checks failed
farmcontrol/farmcontrol-api/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Tom Butcher 2026-08-01 18:25:59 +01:00
parent c0112d61fb
commit f69c88926c
4 changed files with 74 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/inventory/purchaseorders.js
View File

@ -17,8 +17,8 @@ const listAllowedFilters = [
'grandTotalAmount',
'createdAt',
'updatedAt',
'_reference'
];
'_reference',
];
const propertiesAllowedFilters = [
'vendor',
'state.type',
@ -30,7 +30,7 @@ const propertiesAllowedFilters = [
'shippingAmount',
'shippingAmountWithTax',
'grandTotalAmount',
];
];
import {
listPurchaseOrdersRouteHandler,
getPurchaseOrderRouteHandler,
@ -46,8 +46,7 @@ import {
cancelPurchaseOrderRouteHandler,
searchPurchaseOrdersRouteHandler,
getPurchaseOrderPropertyValuesRouteHandler,
getPurchaseOrderNeighborsRouteHandler
getPurchaseOrderNeighborsRouteHandler,
} from '../../services/inventory/purchaseorders.js';
// list of purchase orders
@ -62,7 +61,7 @@ router.get('/properties', isAuthenticated, (req, res) => {
const filter = getFilter(req.query, propertiesAllowedFilters, false);
var masterFilter = {};
if (req.query.masterFilter) {
masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);
masterFilter = getFilter(JSON.parse(req.query.masterFilter), propertiesAllowedFilters, true);
}
listPurchaseOrdersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
});
@ -76,7 +75,6 @@ router.get('/search', isAuthenticated, (req, res) => {
searchPurchaseOrdersRouteHandler(req, res, search);
});
router.post('/', isAuthenticated, (req, res) => {
newPurchaseOrderRouteHandler(req, res);
});

12
src/routes/inventory/shipments.js
View File

@ -13,8 +13,8 @@ const listAllowedFilters = [
'taxRate',
'createdAt',
'updatedAt',
'_reference'
];
'_reference',
];
const propertiesAllowedFilters = [
'orderType',
'order',
@ -22,7 +22,7 @@ const propertiesAllowedFilters = [
'courierService',
'order._id',
'taxRate',
];
];
import {
listShipmentsRouteHandler,
getShipmentRouteHandler,
@ -38,8 +38,7 @@ import {
cancelShipmentRouteHandler,
searchShipmentsRouteHandler,
getShipmentPropertyValuesRouteHandler,
getShipmentNeighborsRouteHandler
getShipmentNeighborsRouteHandler,
} from '../../services/inventory/shipments.js';
// list of shipments
@ -54,7 +53,7 @@ router.get('/properties', isAuthenticated, (req, res) => {
const filter = getFilter(req.query, propertiesAllowedFilters, false);
var masterFilter = {};
if (req.query.masterFilter) {
masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);
masterFilter = getFilter(JSON.parse(req.query.masterFilter), propertiesAllowedFilters, true);
}
listShipmentsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
});
@ -68,7 +67,6 @@ router.get('/search', isAuthenticated, (req, res) => {
searchShipmentsRouteHandler(req, res, search);
});
router.post('/', isAuthenticated, (req, res) => {
newShipmentRouteHandler(req, res);
});

10
src/routes/management/filamentskus.js
View File

@ -15,9 +15,9 @@ const listAllowedFilters = [
'costWithTax',
'createdAt',
'updatedAt',
'_reference'
];
const propertiesAllowedFilters = ['filament', 'filament._id'];
'_reference',
];
const propertiesAllowedFilters = ['filament', 'filament._id', 'diameter'];
import {
listFilamentSkusRouteHandler,
getFilamentSkuRouteHandler,
@ -29,8 +29,7 @@ import {
getFilamentSkuHistoryRouteHandler,
searchFilamentSkusRouteHandler,
getFilamentSkuPropertyValuesRouteHandler,
getFilamentSkuNeighborsRouteHandler
getFilamentSkuNeighborsRouteHandler,
} from '../../services/management/filamentskus.js';
router.get('/', isAuthenticated, (req, res) => {
@ -58,7 +57,6 @@ router.get('/search', isAuthenticated, (req, res) => {
searchFilamentSkusRouteHandler(req, res, search);
});
router.post('/', isAuthenticated, (req, res) => {
newFilamentSkuRouteHandler(req, res);
});

11
src/routes/sales/salesorders.js
View File

@ -11,8 +11,8 @@ const listAllowedFilters = [
'client._id',
'createdAt',
'updatedAt',
'_reference'
];
'_reference',
];
const propertiesAllowedFilters = ['client', 'state.type', 'value', 'client._id'];
import {
listSalesOrdersRouteHandler,
@ -29,8 +29,7 @@ import {
cancelSalesOrderRouteHandler,
searchSalesOrdersRouteHandler,
getSalesOrderPropertyValuesRouteHandler,
getSalesOrderNeighborsRouteHandler
getSalesOrderNeighborsRouteHandler,
} from '../../services/sales/salesorders.js';
// list of sales orders
@ -45,7 +44,7 @@ router.get('/properties', isAuthenticated, (req, res) => {
const filter = getFilter(req.query, propertiesAllowedFilters, false);
var masterFilter = {};
if (req.query.masterFilter) {
masterFilter = getFilter(JSON.parse(req.query.masterFilter), allowedFilters, true);
masterFilter = getFilter(JSON.parse(req.query.masterFilter), propertiesAllowedFilters, true);
}
listSalesOrdersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
});
@ -59,7 +58,6 @@ router.get('/search', isAuthenticated, (req, res) => {
searchSalesOrdersRouteHandler(req, res, search);
});
router.post('/', isAuthenticated, (req, res) => {
newSalesOrderRouteHandler(req, res);
});
@ -110,4 +108,3 @@ router.post('/:id/cancel', isAuthenticated, async (req, res) => {
});
export default router;