@stamhoofd/backend 2.115.1 → 2.117.0

package/migrations.ts

@@ -4,7 +4,7 @@ backendEnv.load({ service: 'api' }).catch((error) => {
     console.error('Failed to load environment:', error);
     process.exit(1);
 }).then(async () => {
-    const { run } = await import('./src/migrate');
+    const { run } = await import('./src/migrate.js');
     await run();
     process.exit(0);
 }).catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.115.1",
+    "version": "2.117.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -55,14 +55,14 @@
         "@simonbackx/simple-encoding": "2.23.1",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.115.1",
-        "@stamhoofd/backend-middleware": "2.115.1",
-        "@stamhoofd/email": "2.115.1",
-        "@stamhoofd/models": "2.115.1",
-        "@stamhoofd/queues": "2.115.1",
-        "@stamhoofd/sql": "2.115.1",
-        "@stamhoofd/structures": "2.115.1",
-        "@stamhoofd/utility": "2.115.1",
+        "@stamhoofd/backend-i18n": "2.117.0",
+        "@stamhoofd/backend-middleware": "2.117.0",
+        "@stamhoofd/email": "2.117.0",
+        "@stamhoofd/models": "2.117.0",
+        "@stamhoofd/queues": "2.117.0",
+        "@stamhoofd/sql": "2.117.0",
+        "@stamhoofd/structures": "2.117.0",
+        "@stamhoofd/utility": "2.117.0",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "4b692d62820d095e00524e3c0214e8f73a69506e"
+    "gitHead": "ad4b006dca3aa5a7c14b2afc83b6df3c2a72424c"
 }

package/src/audit-logs/DocumentTemplateLogger.ts

@@ -1,5 +1,5 @@
 import { DocumentTemplate } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const DocumentTemplateLogger = new ModelLogger(DocumentTemplate, {

package/src/audit-logs/EmailAddressLogger.ts

@@ -1,6 +1,6 @@
 import { EmailAddress } from '@stamhoofd/email';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
-import { ModelLogger } from './ModelLogger';
+import { ModelLogger } from './ModelLogger.js';
 
 export const EmailAddressLogger = new ModelLogger(EmailAddress, {
     async optionsGenerator(event) {

package/src/audit-logs/EmailLogger.ts

@@ -1,7 +1,7 @@
 import { Email } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType, EmailStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { ModelLogger } from './ModelLogger';
+import { ModelLogger } from './ModelLogger.js';
 
 export const EmailLogger = new ModelLogger(Email, {
     skipKeys: ['json', 'text', 'status', 'userId', 'createdAt', 'updatedAt', 'deletedAt', 'recipientFilter', 'emailRecipientsCount', 'otherRecipientsCount', 'succeededCount', 'softFailedCount', 'failedCount', 'membersCount', 'hardBouncesCount', 'softBouncesCount', 'spamComplaintsCount', 'recipientsStatus', 'recipientsErrors', 'emailErrors', 'sentAt'],

package/src/audit-logs/EmailTemplateLogger.ts

@@ -1,6 +1,6 @@
 import { EmailTemplate } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.EmailTemplateAdded,
     updated: AuditLogType.EmailTemplateEdited,

package/src/audit-logs/EventLogger.ts

@@ -1,5 +1,5 @@
 import { Event } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const EventLogger = new ModelLogger(Event, {

package/src/audit-logs/GroupLogger.ts

@@ -1,6 +1,6 @@
 import { Group } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType, GroupType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.GroupAdded,

package/src/audit-logs/MemberLogger.ts

@@ -1,5 +1,5 @@
 import { Member } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const MemberLogger = new ModelLogger(Member, {

package/src/audit-logs/MemberPlatformMembershipLogger.ts

@@ -1,7 +1,7 @@
 import { Member, MemberPlatformMembership, Platform } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.MemberPlatformMembershipAdded,

package/src/audit-logs/MemberResponsibilityRecordLogger.ts

@@ -1,6 +1,6 @@
 import { Group, Member, MemberResponsibilityRecord, Organization, Platform } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.MemberResponsibilityRecordAdded,

package/src/audit-logs/ModelLogger.ts

@@ -2,8 +2,8 @@ import { Model, ModelEvent } from '@simonbackx/simple-database';
 import { AuditLog } from '@stamhoofd/models';
 import { ObjectDiffer } from '@stamhoofd/object-differ';
 import { AuditLogPatchItem, AuditLogPatchItemType, AuditLogReplacement, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
-import { ContextInstance } from '../helpers/Context';
-import { AuditLogService } from '../services/AuditLogService';
+import { ContextInstance } from '../helpers/Context.js';
+import { AuditLogService } from '../services/AuditLogService.js';
 
 export type ModelEventLogOptions<D> = {
     type: AuditLogType;
@@ -33,11 +33,11 @@ export type ModelLoggerOptions<M extends Model, D = undefined> = {
 
 const ModelEventsMap = new WeakMap<Model, { events: AuditLog[] }>();
 
-export function getDefaultGenerator(types: DefaultLogOptionsType): EventOptionsGenerator<Model, undefined> {
-    return (event: ModelEvent<Model>) => {
+export function getDefaultGenerator<M extends Model = Model>(types: DefaultLogOptionsType): EventOptionsGenerator<M, { model: M }> {
+    return (event: ModelEvent<M>) => {
         if (event.type === 'created') {
             if (types.created) {
-                return { type: types.created, data: undefined };
+                return { type: types.created, data: { model: event.model } };
             }
             return;
         }
@@ -54,7 +54,7 @@ export function getDefaultGenerator(types: DefaultLogOptionsType): EventOptionsG
                     };
 
                     if (types.deleted) {
-                        return { type: types.deleted, data: undefined };
+                        return { type: types.deleted, data: { model: event.model } };
                     }
                 }
             }
@@ -67,19 +67,19 @@ export function getDefaultGenerator(types: DefaultLogOptionsType): EventOptionsG
                         // Merge into create event
                         const events = ModelEventsMap.get(event.model)?.events;
                         if (events && events.length > 0) {
-                            mergeInto = events[0];
+                            mergeInto = events.find(e => e.type === types.created);
                         }
                     }
                 }
 
-                return { type: types.updated, generatePatchList: true, data: undefined, mergeInto };
+                return { type: types.updated, generatePatchList: true, data: { model: event.model }, mergeInto };
             }
             return;
         }
 
         if (event.type === 'deleted') {
             if (types.deleted) {
-                return { type: types.deleted, data: undefined };
+                return { type: types.deleted, data: { model: event.model } };
             }
             return;
         }
@@ -110,9 +110,9 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
     }
 
     async logEvent(event: ModelEvent<M>) {
+        const log = new AuditLog();
         try {
             const context = ContextInstance.optional;
-            const log = new AuditLog();
             let settings = AuditLogService.getContext();
             let userId = settings?.userId !== undefined ? settings?.userId : (context?.optionalAuth?.user?.id ?? settings?.fallbackUserId ?? null);
 
@@ -130,6 +130,11 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
                 }
             }
 
+            const options = await this.optionsGenerator(event);
+
+            if (!options) {
+                return false;
+            }
             log.userId = userId;
 
             log.organizationId = context?.organization?.id ?? settings?.fallbackOrganizationId ?? null;
@@ -149,12 +154,6 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
                 log.source = AuditLogSource.System;
             }
 
-            const options = await this.optionsGenerator(event);
-
-            if (!options) {
-                return false;
-            }
-
             log.type = options.type;
             log.objectId = options.objectId ?? event.model.getPrimaryKey()?.toString() ?? null;
             log.replacements = this.createReplacements ? this.createReplacements(event.model as M, options) : new Map();
@@ -197,7 +196,6 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
                     }
                 }
                 else {
-                    console.log('No changes');
                     return false;
                 }
             }
@@ -233,16 +231,26 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
                 return await options.mergeInto.save();
             }
 
+            try {
+                log.validate();
+            }
+            catch (e) {
+                console.error('AuditLog dit not pass validation', log);
+            }
+
             const saved = await log.save();
 
             // Assign to map
+            const d = [...(ModelEventsMap.get(event.model)?.events ?? []), log];
+
             ModelEventsMap.set(event.model, {
-                events: [...(ModelEventsMap.get(event.model)?.events ?? []), log],
+                // Limit length of d to 1 - we only use the first event
+                events: d.slice(0, 1),
             });
             return saved;
         }
         catch (e) {
-            console.error('Failed to save log', e);
+            console.error('Failed to save log', e, log);
         }
         return false;
     };

package/src/audit-logs/OrderLogger.ts

@@ -1,6 +1,6 @@
 import { Order, Webshop } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType, OrderStatus } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.OrderAdded,

package/src/audit-logs/OrganizationLogger.ts

@@ -1,10 +1,10 @@
 import { Organization } from '@stamhoofd/models';
-import { AuditLogType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 export const OrganizationLogger = new ModelLogger(Organization, {
     skipKeys: ['searchIndex', 'serverMeta'],
-    optionsGenerator: getDefaultGenerator({
+    optionsGenerator: getDefaultGenerator<Organization>({
         created: AuditLogType.OrganizationAdded,
         updated: AuditLogType.OrganizationEdited,
         deleted: AuditLogType.OrganizationDeleted,
@@ -12,5 +12,25 @@ export const OrganizationLogger = new ModelLogger(Organization, {
 
     postProcess(event, options, log) {
         log.organizationId = event.model.id;
+
+        if (log.type === AuditLogType.OrganizationDeleted) {
+            // Never belongs to an organization - could cause constraint errors
+            log.organizationId = null;
+        }
+
+        if (log.type === AuditLogType.OrganizationAdded) {
+            // Should only be visible in the admin panel
+            log.organizationId = null;
+        }
+    },
+
+    createReplacements: (model, options) => {
+        return new Map([
+            ['org', AuditLogReplacement.create({
+                id: options.data.model.id,
+                value: options.data.model.name,
+                type: AuditLogReplacementType.Organization,
+            })],
+        ]);
     },
 });

package/src/audit-logs/OrganizationRegistrationPeriodLogger.ts

@@ -1,5 +1,5 @@
 import { Organization, OrganizationRegistrationPeriod, RegistrationPeriod } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogPatchItem, AuditLogPatchItemType, AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 const defaultGenerator = getDefaultGenerator({

package/src/audit-logs/PaymentLogger.ts

@@ -1,7 +1,7 @@
 import { Payment } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType, PaymentMethod, PaymentMethodHelper, PaymentStatusHelper } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 export const PaymentLogger = new ModelLogger(Payment, {
     skipKeys: ['transferFee'],

package/src/audit-logs/PlatformLogger.ts

@@ -1,5 +1,5 @@
 import { Platform } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogType } from '@stamhoofd/structures';
 
 export const PlatformLogger = new ModelLogger(Platform, {

package/src/audit-logs/RegistrationLogger.ts

@@ -1,5 +1,5 @@
 import { Group, Member, Registration } from '@stamhoofd/models';
-import { ModelLogger } from './ModelLogger';
+import { ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const RegistrationLogger = new ModelLogger(Registration, {

package/src/audit-logs/RegistrationPeriodLogger.ts

@@ -1,5 +1,5 @@
 import { RegistrationPeriod } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const RegistrationPeriodLogger = new ModelLogger(RegistrationPeriod, {

package/src/audit-logs/StripeAccountLogger.ts

@@ -1,6 +1,6 @@
 import { StripeAccount } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.StripeAccountAdded,

package/src/audit-logs/UserLogger.ts

@@ -1,6 +1,6 @@
 import { User } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 
 const defaultGenerator = getDefaultGenerator({
     created: AuditLogType.UserAdded,

package/src/audit-logs/WebshopLogger.ts

@@ -1,5 +1,5 @@
 import { Webshop } from '@stamhoofd/models';
-import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger.js';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 const defaultGenerator = getDefaultGenerator({

package/src/audit-logs/init.ts

@@ -0,0 +1,40 @@
+import { DocumentTemplateLogger } from './DocumentTemplateLogger.js';
+import { EmailAddressLogger } from './EmailAddressLogger.js';
+import { EmailLogger } from './EmailLogger.js';
+import { EmailTemplateLogger } from './EmailTemplateLogger.js';
+import { EventLogger } from './EventLogger.js';
+import { GroupLogger } from './GroupLogger.js';
+import { MemberLogger } from './MemberLogger.js';
+import { MemberPlatformMembershipLogger } from './MemberPlatformMembershipLogger.js';
+import { MemberResponsibilityRecordLogger } from './MemberResponsibilityRecordLogger.js';
+import { OrderLogger } from './OrderLogger.js';
+import { OrganizationLogger } from './OrganizationLogger.js';
+import { OrganizationRegistrationPeriodLogger } from './OrganizationRegistrationPeriodLogger.js';
+import { PaymentLogger } from './PaymentLogger.js';
+import { PlatformLogger } from './PlatformLogger.js';
+import { RegistrationLogger } from './RegistrationLogger.js';
+import { RegistrationPeriodLogger } from './RegistrationPeriodLogger.js';
+import { StripeAccountLogger } from './StripeAccountLogger.js';
+import { UserLogger } from './UserLogger.js';
+import { WebshopLogger } from './WebshopLogger.js';
+import { modelLogDefinitions } from '../services/AuditLogService.js';
+
+modelLogDefinitions.set(RegistrationLogger.model, RegistrationLogger);
+modelLogDefinitions.set(GroupLogger.model, GroupLogger);
+modelLogDefinitions.set(OrganizationLogger.model, OrganizationLogger);
+modelLogDefinitions.set(PlatformLogger.model, PlatformLogger);
+modelLogDefinitions.set(EventLogger.model, EventLogger);
+modelLogDefinitions.set(RegistrationPeriodLogger.model, RegistrationPeriodLogger);
+modelLogDefinitions.set(OrganizationRegistrationPeriodLogger.model, OrganizationRegistrationPeriodLogger);
+modelLogDefinitions.set(StripeAccountLogger.model, StripeAccountLogger);
+modelLogDefinitions.set(MemberLogger.model, MemberLogger);
+modelLogDefinitions.set(WebshopLogger.model, WebshopLogger);
+modelLogDefinitions.set(OrderLogger.model, OrderLogger);
+modelLogDefinitions.set(PaymentLogger.model, PaymentLogger);
+modelLogDefinitions.set(MemberPlatformMembershipLogger.model, MemberPlatformMembershipLogger);
+modelLogDefinitions.set(MemberResponsibilityRecordLogger.model, MemberResponsibilityRecordLogger);
+modelLogDefinitions.set(DocumentTemplateLogger.model, DocumentTemplateLogger);
+modelLogDefinitions.set(EmailLogger.model, EmailLogger);
+modelLogDefinitions.set(EmailTemplateLogger.model, EmailTemplateLogger);
+modelLogDefinitions.set(EmailAddressLogger.model, EmailAddressLogger);
+modelLogDefinitions.set(UserLogger.model, UserLogger);

package/src/boot.ts

@@ -16,13 +16,12 @@ import { SetupStepUpdater } from './helpers/SetupStepUpdater.js';
 import { ContextMiddleware } from './middleware/ContextMiddleware.js';
 import { AuditLogService } from './services/AuditLogService.js';
 import { BalanceItemService } from './services/BalanceItemService.js';
+import { CpuService } from './services/CpuService.js';
 import { DocumentService } from './services/DocumentService.js';
 import { FileSignService } from './services/FileSignService.js';
 import { PlatformMembershipService } from './services/PlatformMembershipService.js';
 import { UitpasService } from './services/uitpas/UitpasService.js';
 import { UniqueUserService } from './services/UniqueUserService.js';
-import { CpuService } from './services/CpuService.js';
-import { SQLLogger } from '@stamhoofd/sql';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -149,8 +148,8 @@ export const boot = async (options: { killProcess: boolean }) => {
         CpuService.startMonitoring();
     }
     else if (STAMHOOFD.environment === 'development') {
-        SQLLogger.slowQueryThresholdMs = 200;
-        SQLLogger.explainAllAndLogInefficient = true;
+        const { loadDebugFunctions } = await import('./debug.js');
+        loadDebugFunctions({ routerServer });
     }
 
     if (routerServer.server) {
@@ -248,7 +247,10 @@ export const boot = async (options: { killProcess: boolean }) => {
     // Register crons
     await import('./crons.js');
 
+    // Audit logs
+    await import('./audit-logs/init.js');
     AuditLogService.listen();
+
     PlatformMembershipService.listen();
     DocumentService.listen();
     SetupStepUpdater.listen();

package/src/crons/amazon-ses.ts

@@ -8,7 +8,7 @@ import { registerCron } from '@stamhoofd/crons';
 import { Email, EmailAddress } from '@stamhoofd/email';
 import { AuditLog, EmailRecipient, Organization } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
-import { ForwardHandler } from '../helpers/ForwardHandler';
+import { ForwardHandler } from '../helpers/ForwardHandler.js';
 import { Email as EmailModel } from '@stamhoofd/models';
 
 registerCron('checkComplaints', checkComplaints);

package/src/crons/balance-emails.ts

@@ -2,7 +2,7 @@ import { registerCron } from '@stamhoofd/crons';
 import { CachedBalance, Email, EmailRecipient, Organization, User } from '@stamhoofd/models';
 import { IterableSQLSelect, readDynamicSQLExpression, SQL, SQLCalculation, SQLPlusSign } from '@stamhoofd/sql';
 import { EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailTemplateType, OrganizationEmail, ReceivableBalanceType, StamhoofdFilter } from '@stamhoofd/structures';
-import { ContextInstance } from '../helpers/Context';
+import { ContextInstance } from '../helpers/Context.js';
 
 registerCron('balanceEmails', balanceEmails);
 

package/src/crons/clearExcelCache.test.ts

@@ -1,6 +1,6 @@
 import { Dirent } from 'fs';
 import fs from 'fs/promises';
-import { clearExcelCacheHelper } from './clearExcelCache';
+import { clearExcelCacheHelper } from './clearExcelCache.js';
 
 const testPath = '/Users/user/project/backend/app/api/.cache';
 jest.mock('fs/promises');

package/src/crons/delete-archived-data.ts

@@ -0,0 +1,47 @@
+/**
+ * We cannot keep deletedAt data forever. We only keep it that way to debug things or be able to easily restore data.
+ * After 1 month of deletion, we should delete it permanently.
+ */
+
+import { registerCron } from '@stamhoofd/crons';
+import { Group } from '@stamhoofd/models';
+
+let lastRunDate: number | null = null;
+const keepDeletedDataForDays = 30 * 24 * 60 * 60 * 1000; // 30 days in milliseconds
+
+registerCron('delete-archived-data', deleteArchivedData);
+
+function shouldRun() {
+    const now = new Date();
+
+    if (now.getDate() === lastRunDate) {
+        return false;
+    }
+
+    const hour = now.getHours();
+
+    // between 4 and 5 AM - except in development
+    if (hour !== 4 && STAMHOOFD.environment !== 'development') {
+        return false;
+    }
+
+    return true;
+}
+
+async function deleteArchivedData() {
+    if (!shouldRun()) {
+        return;
+    }
+
+    const now = new Date();
+    lastRunDate = now.getDate();
+
+    console.log('Deleting archived data...');
+
+    const result = await Group.delete()
+        .where('deletedAt', '<', new Date(now.getTime() - keepDeletedDataForDays))
+        .delete();
+    console.log('Deleted groups:', result.affectedRows);
+
+    // For now, we don't delete orders yet (can 'fuck' up pagination because deleted orders are still used in the frontend to remove cached orders)
+}

package/src/crons/endFunctionsOfUsersWithoutRegistration.ts

@@ -1,5 +1,5 @@
 import { registerCron } from '@stamhoofd/crons';
-import { FlagMomentCleanup } from '../helpers/FlagMomentCleanup';
+import { FlagMomentCleanup } from '../helpers/FlagMomentCleanup.js';
 import { Platform, RegistrationPeriod } from '@stamhoofd/models';
 
 // Only delete responsibilities when the server is running during a month change.

package/src/crons/index.ts

@@ -4,3 +4,4 @@ import './endFunctionsOfUsersWithoutRegistration.js';
 import './update-cached-balances.js';
 import './balance-emails.js';
 import './delete-old-email-drafts.js';
+import './delete-archived-data.js';

package/src/crons.ts

@@ -4,9 +4,9 @@ import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/struct
 import { Formatter } from '@stamhoofd/utility';
 import { SQL } from '@stamhoofd/sql';
 import { registerCron } from '@stamhoofd/crons';
-import { checkSettlements } from './helpers/CheckSettlements';
-import { PaymentService } from './services/PaymentService';
-import { RegistrationService } from './services/RegistrationService';
+import { checkSettlements } from './helpers/CheckSettlements.js';
+import { PaymentService } from './services/PaymentService.js';
+import { RegistrationService } from './services/RegistrationService.js';
 
 let lastDNSCheck: Date | null = null;
 let lastDNSId = '';