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

Compare commits

base: farmcontrol:8974d1e9da1c9d5320d52f7876e3a00ce6f343db
Branches Tags
farmcontrol:main
farmcontrol:config-updates
..
compare: farmcontrol:b0943f3fa0c855f6c539a84f85d1d45f4eebfbd8
Branches Tags
farmcontrol:main
farmcontrol:config-updates

No commits in common. "8974d1e9da1c9d5320d52f7876e3a00ce6f343db" and "b0943f3fa0c855f6c539a84f85d1d45f4eebfbd8" have entirely different histories.
8974d1e9da ... b0943f3fa0

5 changed files with 26 additions and 107 deletions
Show Stats Expand all files Collapse all files

81
src/database/database.js
View File

@ -657,26 +657,21 @@ export const listPropertyValues = async ({ model, property, filter = {}, search
return await model.aggregate(aggregateCommand);
};
function getEmbeddedSchemaType(path) {
if (!path) return null;
return path.embeddedSchemaType ?? path.$embeddedSchemaType ?? path.caster ?? null;
}
function getObjectRefPathInfo(model, property) {
if (!model?.schema || !property) return null;
const path = model.schema.path(property);
if (!path) return null;
const schemaType = path.instance === 'Array' ? getEmbeddedSchemaType(path) : path;
const schemaType = path.instance === 'Array' ? path.caster : path;
if (!schemaType) return null;
const instance = schemaType.instance;
if (instance !== 'ObjectID' && instance !== 'ObjectId') return null;
return {
ref: schemaType.options?.ref ?? path.options?.ref,
refPath: schemaType.options?.refPath ?? path.options?.refPath,
ref: schemaType.options?.ref,
refPath: schemaType.options?.refPath,
};
}
@ -695,52 +690,28 @@ function inferTypeFieldFromRefFunction(refFn) {
return matches.find((name) => name.endsWith('Type') || name === 'type') || matches[0] || null;
}
function getArrayUnwindPaths(model, property) {
if (!model?.schema || !property) return [];
function getArrayParentPaths(model, property) {
if (!model?.schema || !property?.includes('.')) return [];
const paths = [];
const parents = [];
const parts = property.split('.');
for (let i = 1; i < parts.length; i++) {
const parentPath = parts.slice(0, i).join('.');
const parentSchemaPath = model.schema.path(parentPath);
if (parentSchemaPath?.instance === 'Array') {
paths.push(parentPath);
parents.push(parentPath);
}
}
const path = model.schema.path(property);
if (path?.instance === 'Array') {
paths.push(property);
}
return paths;
}
function flattenRefIds(ids) {
const flattened = [];
const visit = (value) => {
if (value == null) return;
if (Array.isArray(value)) {
value.forEach(visit);
return;
}
if (
typeof value === 'object' &&
!(value instanceof mongoose.Types.ObjectId) &&
!(value instanceof Date) &&
value._id != null
) {
visit(value._id);
return;
}
flattened.push(value);
};
visit(ids);
return flattened;
return parents;
}
async function fetchBasicObjectsByIds(refName, ids) {
const uniqueIds = [
...new Map(flattenRefIds(ids).map((id) => [id.toString(), id])).values(),
...new Map(
(ids || [])
.filter((id) => id != null)
.map((id) => [id.toString(), id])
).values(),
];
if (uniqueIds.length === 0) return [];
@ -791,10 +762,10 @@ export const getPropertyValues = async ({ model, property, filter = {} }) => {
pipeline.push({ $match: convertedFilter });
}
for (const unwindPath of getArrayUnwindPaths(model, property)) {
for (const parentPath of getArrayParentPaths(model, property)) {
pipeline.push({
$unwind: {
path: `$${unwindPath}`,
path: `$${parentPath}`,
preserveNullAndEmptyArrays: false,
},
});
@ -832,28 +803,6 @@ export const getPropertyValues = async ({ model, property, filter = {} }) => {
}
if (hasFixedRef) {
const unwindPaths = getArrayUnwindPaths(model, property);
if (unwindPaths.length > 0) {
const pipeline = [];
if (Object.keys(convertedFilter).length > 0) {
pipeline.push({ $match: convertedFilter });
}
for (const unwindPath of unwindPaths) {
pipeline.push({
$unwind: {
path: `$${unwindPath}`,
preserveNullAndEmptyArrays: false,
},
});
}
pipeline.push(
{ $match: { [property]: { $ne: null } } },
{ $group: { _id: `$${property}` } }
);
const ids = (await model.aggregate(pipeline)).map((row) => row._id);
return fetchBasicObjectsByIds(pathInfo.ref, ids);
}
const ids = await model.distinct(property, convertedFilter);
return fetchBasicObjectsByIds(pathInfo.ref, ids);
}

6
src/database/schemas/management/documentjob.schema.js
View File

@ -31,12 +31,6 @@ const documentJobSchema = new Schema(
ref: 'documentPrinter',
required: true,
},
quantity: {
type: Number,
required: true,
default: 1,
min: 1,
},
content: {
type: String,
required: false,

3
src/routes/management/documentjobs.js
View File

@ -7,7 +7,6 @@ const router = express.Router();
const listAllowedFilters = [
'name',
'quantity',
'width',
'height',
'state',
@ -15,7 +14,7 @@ const listAllowedFilters = [
'updatedAt',
'_reference',
];
const listAllowedSorters = ['name', 'quantity', 'state', 'createdAt', 'updatedAt'];
const listAllowedSorters = ['name', 'state', 'createdAt', 'updatedAt'];
const propertiesAllowedFilters = [];
import {
listDocumentJobsRouteHandler,

4
src/services/management/documentjobs.js
View File

@ -113,9 +113,6 @@ export const editDocumentJobRouteHandler = async (req, res) => {
logger.trace(`Document Job with ID: ${id}`);
const updateData = {};
if (req.body.quantity != null) {
updateData.quantity = req.body.quantity;
}
// Create audit log before updating
const result = await editObject({
model: documentJobModel,
@ -145,7 +142,6 @@ export const newDocumentJobRouteHandler = async (req, res) => {
objectType: req.body.objectType,
object: req.body.object,
content: req.body.content,
quantity: req.body.quantity ?? 1,
state: { type: 'draft' },
createdAt: new Date(),
updatedAt: new Date(),

39
src/utils.js
View File

@ -93,19 +93,8 @@ function getBaseProperty(property) {
return property;
}
function getEmbeddedSchemaType(path) {
if (!path) return null;
return path.embeddedSchemaType ?? path.$embeddedSchemaType ?? path.caster ?? null;
}
function getObjectIdSchemaTypeFromPath(path) {
if (!path) return null;
const schemaType = path.instance === 'Array' ? getEmbeddedSchemaType(path) : path;
if (!schemaType) return null;
if (schemaType.instance === 'ObjectId' || schemaType.instance === 'ObjectID') {
return schemaType;
}
return null;
function isObjectIdSchemaType(path) {
return path?.instance === 'ObjectId' || path?.instance === 'ObjectID';
}
function getSchemaPathFromModels(property, model = null) {
@ -123,14 +112,12 @@ function getFilterFieldKind(property, model = null) {
const inspectPath = (path) => {
if (!path) return null;
const objectIdType = getObjectIdSchemaTypeFromPath(path);
if (isObjectIdPath(property) || objectIdType) {
const ref = objectIdType?.options?.ref ?? path.options?.ref;
if (property.endsWith('._id') && property !== '_id' && ref) {
if (isObjectIdPath(property) || isObjectIdSchemaType(path)) {
if (property.endsWith('._id') && property !== '_id' && path.options?.ref) {
return { kind: 'objectId', property: baseProperty };
}
if (ref) {
return { kind: 'objectRef', property: baseProperty, ref };
if (path.options?.ref) {
return { kind: 'objectRef', property: baseProperty, ref: path.options.ref };
}
return { kind: 'objectId', property: baseProperty };
}
@ -175,8 +162,7 @@ function buildRegexOp(pattern, useOptions = true) {
function getSchemaRefName(property, model = null) {
const baseProperty = getBaseProperty(property);
const path = model?.schema?.path(baseProperty) ?? getSchemaPathFromModels(baseProperty);
const embeddedType = getEmbeddedSchemaType(path);
return path?.options?.ref ?? embeddedType?.options?.ref ?? null;
return path?.options?.ref ?? path?.caster?.options?.ref ?? null;
}
function getRefModelEntryFromSchemaRef(refName) {
@ -1278,7 +1264,6 @@ function filterDistributeKeys(value, keys = DISTRIBUTE_KEYS) {
result[key] = val;
}
}
console.log('filterDistributeKeys', result);
return result;
}
@ -1291,11 +1276,11 @@ async function distributeStats(value, type) {
}
async function distributeNew(value, type) {
await natsServer.publish(`${type}s.new`, value);
await natsServer.publish(`${type}s.new`, filterDistributeKeys(value));
}
async function distributeDelete(value, type) {
await natsServer.publish(`${type}s.delete`, value);
await natsServer.publish(`${type}s.delete`, filterDistributeKeys(value));
}
function getReferenceId(value) {
@ -1604,11 +1589,7 @@ function normalizeFilterQuery(query = {}) {
// qs turns `order._id=` into `{ order: { _id } }`. Lift it so it can be parsed
// as the order object filter instead of a nested query object.
if (
queryClean.order &&
typeof queryClean.order === 'object' &&
!Array.isArray(queryClean.order)
) {
if (queryClean.order && typeof queryClean.order === 'object' && !Array.isArray(queryClean.order)) {
if (queryClean.order._id !== undefined) {
queryClean['order._id'] = queryClean.order._id;
}