From 9fed4f1c491b16748df4fcf79bf16942c6d0330c Mon Sep 17 00:00:00 2001 From: Jarrod Flesch Date: Fri, 10 Feb 2023 12:07:45 -0500 Subject: [PATCH] chore: simplifies query --- src/versions/enforceMaxVersions.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/versions/enforceMaxVersions.ts b/src/versions/enforceMaxVersions.ts index de8d5fb98d..9c0a5d39e7 100644 --- a/src/versions/enforceMaxVersions.ts +++ b/src/versions/enforceMaxVersions.ts @@ -22,22 +22,18 @@ export const enforceMaxVersions = async ({ try { const query: { parent?: string | number } = {}; - if (id) query.parent = id; + if (entityType === 'collection') query.parent = id; const oldestAllowedDoc = await Model.find(query).limit(1).skip(max).sort({ updatedAt: -1 }); if (oldestAllowedDoc?.[0]?.updatedAt) { const deleteQuery: FilterQuery = { - $and: [ - { - updatedAt: { - $lte: oldestAllowedDoc[0].updatedAt, - }, - }, - ], + updatedAt: { + $lte: oldestAllowedDoc[0].updatedAt, + }, }; - if (id) deleteQuery.$and.push({ parent: id }); + if (entityType === 'collection') deleteQuery.parent = id; await Model.deleteMany(deleteQuery); }