From 8e95383afef0803ed415dfa941b854ee2f70b06c Mon Sep 17 00:00:00 2001 From: Jarrod Flesch Date: Fri, 10 Feb 2023 11:53:57 -0500 Subject: [PATCH] chore: accounts for globals in filter query --- src/versions/enforceMaxVersions.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/versions/enforceMaxVersions.ts b/src/versions/enforceMaxVersions.ts index 6824486067..de8d5fb98d 100644 --- a/src/versions/enforceMaxVersions.ts +++ b/src/versions/enforceMaxVersions.ts @@ -1,3 +1,4 @@ +import { FilterQuery } from 'mongoose'; import { Payload } from '../payload'; import { CollectionModel } from '../collections/config/types'; @@ -26,18 +27,19 @@ export const enforceMaxVersions = async ({ const oldestAllowedDoc = await Model.find(query).limit(1).skip(max).sort({ updatedAt: -1 }); if (oldestAllowedDoc?.[0]?.updatedAt) { - await Model.deleteMany({ + const deleteQuery: FilterQuery = { $and: [ - { - parent: id, - }, { updatedAt: { $lte: oldestAllowedDoc[0].updatedAt, }, }, ], - }); + }; + + if (id) deleteQuery.$and.push({ parent: id }); + + await Model.deleteMany(deleteQuery); } } catch (err) { payload.logger.error(`There was an error cleaning up old versions for the ${entityType} ${slug}`);