Tom Butcher
aa4b173a7e
All checks were successful
farmcontrol/farmcontrol-api/pipeline/head This commit looks good
This update introduces a new utility function, `getSort`, to validate and apply sorting based on allowed sorters across multiple routes in the inventory and management modules. The function is integrated into route handlers for invoices, payments, tax records, filament stocks, order items, part stocks, product stocks, purchase orders, shipments, and various management entities. This enhancement improves the flexibility and consistency of sorting operations throughout the application.
88 lines
2.5 KiB
JavaScript
88 lines
2.5 KiB
JavaScript
import express from 'express';
|
|
import { isAuthenticated } from '../../keycloak.js';
|
|
|
|
const router = express.Router();
|
|
|
|
const listAllowedFilters = [
|
|
'_id',
|
|
'job',
|
|
'job._id',
|
|
'printer',
|
|
'printer._id',
|
|
'_reference',
|
|
'state',
|
|
'createdAt',
|
|
'updatedAt',
|
|
'startedAt',
|
|
'finishedAt',
|
|
];
|
|
const listAllowedSorters = [
|
|
'createdAt',
|
|
'state',
|
|
'updatedAt',
|
|
'startedAt',
|
|
'finishedAt',
|
|
'job',
|
|
'printer',
|
|
];
|
|
const propertiesAllowedFilters = ['job'];
|
|
import {
|
|
listSubJobsRouteHandler,
|
|
listSubJobsByPropertiesRouteHandler,
|
|
getSubJobRouteHandler,
|
|
getSubJobStatsRouteHandler,
|
|
getSubJobHistoryRouteHandler,
|
|
searchSubJobsRouteHandler,
|
|
getSubJobPropertyValuesRouteHandler,
|
|
getSubJobNeighborsRouteHandler,
|
|
} from '../../services/production/subjobs.js';
|
|
import { getFilter, convertPropertiesString, getSort } from '../../utils.js';
|
|
|
|
// list of sub jobs
|
|
router.get('/', isAuthenticated, async (req, res) => {
|
|
const { page, limit, property, search, sort, order } = req.query;
|
|
const filter = await getFilter(req.query, listAllowedFilters);
|
|
listSubJobsRouteHandler(req, res, page, limit, property, filter, search, getSort(sort, listAllowedSorters), order);
|
|
});
|
|
|
|
router.get('/properties', isAuthenticated, async (req, res) => {
|
|
let properties = convertPropertiesString(req.query.properties);
|
|
const filter = await getFilter(req.query, propertiesAllowedFilters, false);
|
|
var masterFilter = {};
|
|
if (req.query.masterFilter) {
|
|
masterFilter = JSON.parse(req.query.masterFilter);
|
|
}
|
|
listSubJobsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
|
|
});
|
|
|
|
router.get('/values', isAuthenticated, async (req, res) => {
|
|
const { property } = req.query;
|
|
getSubJobPropertyValuesRouteHandler(req, res, property);
|
|
});
|
|
router.get('/search', isAuthenticated, async (req, res) => {
|
|
const { search } = req.query;
|
|
searchSubJobsRouteHandler(req, res, search);
|
|
});
|
|
|
|
// get sub job stats
|
|
router.get('/stats', isAuthenticated, async (req, res) => {
|
|
getSubJobStatsRouteHandler(req, res);
|
|
});
|
|
|
|
// get sub job history
|
|
router.get('/history', isAuthenticated, async (req, res) => {
|
|
getSubJobHistoryRouteHandler(req, res);
|
|
});
|
|
|
|
router.get('/neighbors', isAuthenticated, async (req, res) => {
|
|
const { property, search, sort, order, id } = req.query;
|
|
const filter = await getFilter(req.query, listAllowedFilters);
|
|
getSubJobNeighborsRouteHandler(req, res, property, filter, search, getSort(sort, listAllowedSorters), order, id);
|
|
});
|
|
|
|
router.get('/:id', isAuthenticated, async (req, res) => {
|
|
getSubJobRouteHandler(req, res);
|
|
});
|
|
|
|
export default router;
|