perf(core): improved log deletion performance

Author: shaadcode

src/Constant/Constant.ts

@@ -1,7 +1,6 @@
 import type { LabelFunction, StaticLabel } from 'payload'
-import type { AllCollectionHooks } from 'src/types/pluginOptions.js'
 
-import type { Duration } from './../utils/toMS.js'
+import type { AllCollectionHooks } from './../types/pluginOptions.js'
 
 import { sharedLogic } from './../core/log-builders/collections/shared.js'
 
@@ -23,8 +22,6 @@ export const defaultCollectionValues: DefaultCollectionValues = {
   },
 }
 
-export const defaultAutoDeleteLog: Duration = '1mo'
-
 export const defaultPluginOpts = {
   collection: {
     trackCollections: [],

src/Constant/automation.ts

@@ -1,4 +1,4 @@
-import type { ManualStrategy } from 'src/types/pluginOptions.js'
+import type { ManualStrategy } from './../types/pluginOptions.js'
 
 // export const defaultAutomationValues =
 //   // PluginOptions['automation']
@@ -13,13 +13,13 @@ import type { ManualStrategy } from 'src/types/pluginOptions.js'
 //     },
 //   }
 
-export const cleanupStrategies = {
+export const cleanupStrategiesDefaultValues = {
   // count: {
   //   name: 'count',
   //   amountToDelete: 100,
   //   deletionCount: 50,
   // } as CountStrategy,
-  manual: { name: 'manual', amount: 200, olderThan: '1w' } as ManualStrategy,
+  manual: { name: 'manual', amount: 200, olderThan: '1w' } as Required<ManualStrategy>,
   // time: {
   //   name: 'time',
   //   olderThan: '30s',

src/collections/auditor.ts

@@ -1,7 +1,7 @@
 import type { CollectionConfig } from 'payload'
-import type { hookTypes } from 'src/pluginUtils/configHelpers.js'
 
 import type { AuditHookOperationType } from '../types/pluginOptions.js'
+import type { hookTypes } from './../pluginUtils/configHelpers.js'
 
 import { defaultCollectionValues } from '../Constant/Constant.js'
 

src/collections/hooks/beforeChange.ts

@@ -2,7 +2,8 @@ import type { BeforeChangeHook } from 'node_modules/payload/dist/collections/con
 
 import type { Duration } from './../../utils/toMS.js'
 
-import { defaultAutoDeleteLog, defaultCollectionValues } from './../../Constant/Constant.js'
+import { cleanupStrategiesDefaultValues } from './../../Constant/automation.js'
+import { defaultCollectionValues } from './../../Constant/Constant.js'
 import ms from './../../utils/toMS.js'
 
 type AutoLogCleanerProps = {
@@ -17,30 +18,32 @@ export const autoLogCleaner: BeforeChangeHook<AutoLogCleanerProps> = async ({
   req,
 }) => {
   try {
-    const millisecondsAgo = new Date(Date.now() - ms(data.olderThan || defaultAutoDeleteLog))
-    const oldLogs = await req.payload.find({
-      collection: context.pluginOptions.collection?.slug
-        ? context.pluginOptions.collection?.slug
-        : defaultCollectionValues.slug,
-      limit: context.pluginOptions.automation?.logCleanup?.strategy?.amount || 100,
+    const millisecondsAgo = new Date(
+      Date.now() - ms(data.olderThan || cleanupStrategiesDefaultValues.manual.olderThan),
+    )
+    const collectionSlug = context.pluginOptions.collection?.slug ?? defaultCollectionValues.slug
+    const limit = context.pluginOptions.automation?.logCleanup?.strategy?.amount ?? 100
+
+    const oldLogsToDelete = await req.payload.find({
+      collection: collectionSlug,
+      limit,
       where: {
         createdAt: {
           less_than: millisecondsAgo.toISOString(),
         },
       },
     })
 
-    if (oldLogs.docs.length > 0) {
-      const deletePromises = oldLogs.docs.map((log) =>
-        req.payload.delete({
-          id: log.id,
-          collection: context.pluginOptions.collection?.slug
-            ? context.pluginOptions.collection?.slug
-            : defaultCollectionValues.slug,
-        }),
-      )
-
-      await Promise.all(deletePromises)
+    const ids = oldLogsToDelete.docs.map((doc) => doc.id)
+    if (ids.length > 0) {
+      await req.payload.delete({
+        collection: collectionSlug,
+        where: {
+          id: {
+            in: ids,
+          },
+        },
+      })
     }
   } catch (err) {
     console.error('Error cleaning old logs:', err)

src/pluginUtils/configHelpers.ts

@@ -5,7 +5,7 @@ import type { AllCollectionHooks, PluginOptions } from './../types/pluginOptions
 import auditor from '../collections/auditor.js'
 import { bufferManager } from '../core/buffer/bufferManager.js'
 import { autoLogCleaner } from './../collections/hooks/beforeChange.js'
-import { cleanupStrategies } from './../Constant/automation.js'
+import { cleanupStrategiesDefaultValues } from './../Constant/automation.js'
 import { hookMap } from './../Constant/Constant.js'
 
 type AccessOps = 'create' | 'delete' | 'read' | 'update'
@@ -140,7 +140,7 @@ export const attachAutomationConfig = (
           data: {
             olderThan:
               pluginOpts.automation?.logCleanup?.strategy?.olderThan ??
-              cleanupStrategies.manual.olderThan,
+              cleanupStrategiesDefaultValues.manual.olderThan,
           },
         }),
     ],

src/utils/prettyDebugLog.ts

@@ -1,5 +1,5 @@
-import type { hookTypes } from 'src/pluginUtils/configHelpers.js'
-import type { AuditHookOperationType } from 'src/types/pluginOptions.js'
+import type { hookTypes } from './../pluginUtils/configHelpers.js'
+import type { AuditHookOperationType } from './../types/pluginOptions.js'
 
 /* eslint-disable no-console */
 export const prettyDebugLog = (

src/utils/toMS.ts

@@ -1,7 +1,7 @@
-import { defaultAutoDeleteLog } from './../Constant/Constant.js'
+import { cleanupStrategiesDefaultValues } from 'src/Constant/automation.js'
 
 export type Duration = `${number}${'d' | 'h' | 'm' | 'mo' | 's' | 'w' | 'y'}`
-const ms = (duration: Duration = defaultAutoDeleteLog): number => {
+const ms = (duration: Duration = cleanupStrategiesDefaultValues.manual.olderThan): number => {
   const match = /^(\d+)([smhdwy]|mo)$/.exec(duration)
 
   if (!match) {