@stamhoofd/models 2.1.1 → 2.2.0

package/src/migrations/1720080975-convert-charset.sql

@@ -0,0 +1,87 @@
+set foreign_key_checks=0; 
+ALTER TABLE `_members_users` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `_members_users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `balance_item_payments` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `balance_item_payments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `balance_items` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `balance_items` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `buckaroo_payments` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `buckaroo_payments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `cities` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `cities` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `document_templates` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `document_templates` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `documents` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `documents` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_addresses` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_addresses` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_templates` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_templates` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_verification_codes` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_verification_codes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `groups` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `groups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `images` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `images` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `members` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `members` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `migrations` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `migrations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `mollie_payments` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `mollie_payments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `mollie_tokens` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `mollie_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `organization_registration_periods` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `organization_registration_periods` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `organizations` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `organizations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `password_tokens` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `password_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `payconiq_payments` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `payconiq_payments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `payments` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `payments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `platform` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `platform` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `postal_codes` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `postal_codes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `provinces` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `provinces` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `register_codes` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `register_codes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `registration_periods` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `registration_periods` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `registrations` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `registrations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_credits` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_credits` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_invoices` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_invoices` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_packages` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_packages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_pending_invoices` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stamhoofd_pending_invoices` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `streets` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `streets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_accounts` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_accounts` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_checkout_sessions` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_checkout_sessions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_payment_intents` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `stripe_payment_intents` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `tokens` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `used_register_codes` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `used_register_codes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `users` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_discount_codes` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_discount_codes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_orders` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_orders` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_tickets` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshop_tickets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshops` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `webshops` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+set foreign_key_checks=1; 

package/src/migrations/1720080976-responsibilities.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `member_responsibility_records` (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
+  `memberId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `organizationId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `responsibilityId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `startDate` datetime NOT NULL,
+  `endDate` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `responsibilityId` (`responsibilityId`) USING BTREE,
+  KEY `memberId,organizationId` (`memberId`,`organizationId`) USING BTREE,
+  KEY `organizationId` (`organizationId`),
+  CONSTRAINT `member_responsibility_records_ibfk_1` FOREIGN KEY (`memberId`) REFERENCES `members` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `member_responsibility_records_ibfk_2` FOREIGN KEY (`organizationId`) REFERENCES `organizations` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/migrations/1720088136-member-membership-types.sql

@@ -0,0 +1,23 @@
+CREATE TABLE `member_platform_memberships` (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
+  `memberId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `membershipTypeId` varchar(36) NOT NULL,
+  `organizationId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `periodId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `startDate` datetime NOT NULL,
+  `endDate` datetime NOT NULL,
+  `invoiceItemDetailId` varchar(36) DEFAULT '',
+  `invoiceId` varchar(36) DEFAULT '',
+  `price` int NOT NULL DEFAULT '0',
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `memberId` (`memberId`),
+  KEY `organizationId` (`organizationId`),
+  KEY `periodId` (`periodId`),
+  KEY `invoiceId` (`invoiceId`),
+  CONSTRAINT `member_platform_memberships_ibfk_1` FOREIGN KEY (`memberId`) REFERENCES `members` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `member_platform_memberships_ibfk_2` FOREIGN KEY (`organizationId`) REFERENCES `organizations` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `member_platform_memberships_ibfk_3` FOREIGN KEY (`periodId`) REFERENCES `registration_periods` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `member_platform_memberships_ibfk_4` FOREIGN KEY (`invoiceId`) REFERENCES `stamhoofd_invoices` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/migrations/1720088137-member-membership-types-expire-date.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `expireDate` datetime NULL AFTER `endDate`;

package/src/migrations/1720444931-organization-active.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `organizations`
+ADD COLUMN `active` tinyint(1) NOT NULL DEFAULT '1';

package/src/models/Group.ts

@@ -42,6 +42,9 @@ export class Group extends Model {
     @column({ type: "string" })
     periodId: string;
 
+    @column({ type: "string", nullable: true })
+    defaultAgeGroupId: string | null = null
+
     /**
      * Every time a new registration period starts, this number increases. This is used to mark all older registrations as 'out of date' automatically
      */

package/src/models/Member.ts

@@ -1,10 +1,11 @@
 import { column, Database, ManyToManyRelation, ManyToOneRelation, Model, OneToManyRelation } from '@simonbackx/simple-database';
 import { SQL } from "@stamhoofd/sql";
 import { Member as MemberStruct, MemberDetails, MemberWithRegistrationsBlob, RegistrationWithMember as RegistrationWithMemberStruct, User as UserStruct } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
+import { Formatter, Sorter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from "uuid";
 
-import { Group, Payment, Registration, User } from './';
+import { Group, MemberPlatformMembership, Payment, Platform, Registration, User } from './';
+import { QueueHandler } from '@stamhoofd/queues';
 export type MemberWithRegistrations = Member & { 
     users: User[], 
     registrations: (Registration & {group: Group})[] 
@@ -383,4 +384,87 @@ export class Member extends Model {
             member: MemberStruct.create(registration.member),
         })
     }
+
+    async updateMemberships(this: MemberWithRegistrations) {
+        console.log('Updating memberships for member: ' + this.id)
+        return await QueueHandler.schedule('updateMemberships-' + this.id, async () => {
+            const platform = await Platform.getShared()
+            const registrations = this.registrations.filter(r => r.group.periodId == platform.periodId && !r.waitingList && r.registeredAt && !r.deactivatedAt)
+
+            const defaultMemberships = registrations.flatMap(r => {
+                if (!r.group.defaultAgeGroupId) {
+                    return []
+                }
+                const defaultAgeGroup = platform.config.defaultAgeGroups.find(g => g.id == r.group.defaultAgeGroupId)
+                if (!defaultAgeGroup || !defaultAgeGroup.defaultMembershipTypeId) {
+                    return []
+                }
+
+                const defaultMembership  = platform.config.membershipTypes.find(m => m.id == defaultAgeGroup.defaultMembershipTypeId)
+                if (!defaultMembership) {
+                    return []
+                }
+
+                return [{
+                    registration: r,
+                    membership: defaultMembership,
+                }]
+            })
+            // Get active memberships for this member
+            const memberships = await MemberPlatformMembership.where({memberId: this.id, periodId: platform.periodId })
+            const now = new Date()
+            const activeMemberships = memberships.filter(m => m.startDate <= now && m.endDate >= now)
+
+            if (defaultMemberships.length == 0) {
+                // Stop all active memberships
+                for (const membership of activeMemberships) {
+                    if (!membership.invoiceId && !membership.invoiceItemDetailId) {
+                        console.log('Removing membership because no longer registered member and not yet invoiced for: ' + this.id + ' - membership ' + membership.id)
+                        await membership.delete()
+                    }
+                }
+
+                console.log('Skipping automatic membership for: ' + this.id, ' - no default memberships found')
+                return
+            }
+
+
+            if (activeMemberships.length) {
+                // Skip automatic additions
+                console.log('Skipping automatic membership for: ' + this.id, ' - already has active memberships')
+                return
+            }
+
+            // Add the cheapest available membership
+            const cheapestMembership = defaultMemberships.sort(({membership: a, registration: ar}, {membership: b, registration: br}) => {
+                const diff = a.getPrice(platform.periodId, now)!.price - b.getPrice(platform.periodId, now)!.price
+                if (diff == 0) {
+                    return Sorter.byDateValue(br.createdAt, ar.createdAt)
+                }
+                return diff
+            })[0]
+            if (!cheapestMembership) {
+                throw new Error("No membership found")
+            }
+
+            const periodConfig = cheapestMembership.membership.periods.get(platform.periodId)
+            if (!periodConfig) {
+                throw new Error("Period config not found")
+            }
+
+            console.log('Creating automatic membership for: ' + this.id + ' - membership type ' + cheapestMembership.membership.id)
+            const membership = new MemberPlatformMembership();
+            membership.memberId = this.id
+            membership.membershipTypeId = cheapestMembership.membership.id
+            membership.organizationId = cheapestMembership.registration.organizationId
+            membership.periodId = platform.periodId
+
+            membership.startDate = periodConfig.startDate
+            membership.endDate = periodConfig.endDate
+            membership.expireDate = periodConfig.expireDate
+
+            await membership.calculatePrice()
+            await membership.save()
+        });
+    }
 }

package/src/models/MemberPlatformMembership.ts

@@ -0,0 +1,122 @@
+
+import { column, Model } from "@simonbackx/simple-database";
+import { v4 as uuidv4 } from "uuid";
+import { Platform } from "./Platform";
+import { PlatformMembershipTypeBehaviour } from "@stamhoofd/structures";
+import { SimpleError } from "@simonbackx/simple-errors";
+import { Formatter } from "@stamhoofd/utility";
+
+export class MemberPlatformMembership extends Model {
+    static table = "member_platform_memberships";
+
+    // Columns
+    @column({
+        primary: true, type: "string", beforeSave(value) {
+            return value ?? uuidv4();
+        }
+    })
+    id!: string;
+
+    @column({ type: "string" })
+    memberId: string;
+
+    @column({ type: "string" })
+    membershipTypeId: string;
+
+    @column({ type: "string" })
+    organizationId: string;
+
+    @column({ type: "string" })
+    periodId: string;
+
+    @column({ type: "date" })
+    startDate: Date;
+
+    @column({ type: "date" })
+    endDate: Date;
+
+    @column({ type: "date", nullable: true})
+    expireDate: Date | null = null;
+
+    @column({ type: "string", nullable: true })
+    invoiceItemDetailId: string | null = null;
+
+    @column({ type: "string", nullable: true })
+    invoiceId: string | null = null;
+
+    @column({ type: "integer" })
+    price = 0;
+
+    @column({
+        type: "datetime", beforeSave(old?: any) {
+            if (old !== undefined) {
+                return old;
+            }
+            const date = new Date()
+            date.setMilliseconds(0)
+            return date
+        }
+    })
+    createdAt: Date
+
+    @column({
+        type: "datetime", beforeSave() {
+            const date = new Date()
+            date.setMilliseconds(0)
+            return date
+        },
+        skipUpdate: true
+    })
+    updatedAt: Date
+
+
+    async calculatePrice() {
+        if (this.invoiceId || this.invoiceItemDetailId) {
+            return;
+        }
+
+        const platform = await Platform.getShared();
+        const membershipType = platform.config.membershipTypes.find(m => m.id == this.membershipTypeId);
+
+        if (!membershipType) {
+            throw new SimpleError({
+                code: 'invalid_membership_type',
+                message: 'Uknown membership type',
+                human: 'Deze aansluiting is niet (meer) beschikbaar'
+            })
+        }
+
+        const periodConfig = membershipType.periods.get(this.periodId)
+
+        if (!periodConfig) {
+            throw new SimpleError({
+                code: 'period_unavailable',
+                message: 'Membership not available for this period',
+                human: 'Deze aansluiting is nog niet beschikbaar voor dit werkjaar'
+            })
+        }
+
+        const priceConfig = periodConfig.getPriceForDate(membershipType.behaviour === PlatformMembershipTypeBehaviour.Days ? this.startDate : (this.createdAt ?? new Date()));
+        
+
+        if (membershipType.behaviour === PlatformMembershipTypeBehaviour.Days) {
+            // Make sure time is equal between start and end date
+            let startBrussels = Formatter.luxon(this.startDate);
+            let endBrussels = Formatter.luxon(this.endDate);
+            startBrussels = startBrussels.set({hour: 0, minute: 0, second: 0, millisecond: 0});
+            endBrussels = endBrussels.set({hour: 23, minute: 59, second: 59, millisecond: 0});
+            this.startDate = startBrussels.toJSDate();
+            this.endDate = endBrussels.toJSDate();
+
+            this.expireDate = null
+
+            const days = Math.round((this.endDate.getTime() - this.startDate.getTime()) / (1000 * 60 * 60 * 24));
+            this.price = priceConfig.pricePerDay * days + priceConfig.price;
+        } else {
+            this.price = priceConfig.price;
+            this.startDate = periodConfig.startDate;
+            this.endDate = periodConfig.endDate;
+            this.expireDate = periodConfig.expireDate;
+        }
+    }
+}

package/src/models/Organization.ts

@@ -3,8 +3,7 @@ import { DecodedRequest } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { I18n } from "@stamhoofd/backend-i18n";
 import { Email, EmailInterfaceRecipient } from "@stamhoofd/email";
-import { OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Address, Country, DNSRecordStatus, EmailTemplateType, Organization as OrganizationStruct, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, OrganizationRecordsConfiguration, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from "@stamhoofd/structures";
-import { Formatter } from "@stamhoofd/utility";
+import { Address, Country, DNSRecordStatus, EmailTemplateType, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, OrganizationRecordsConfiguration, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from "@stamhoofd/structures";
 import { AWSError } from 'aws-sdk';
 import SES from 'aws-sdk/clients/sesv2';
 import { PromiseResult } from 'aws-sdk/lib/request';
@@ -95,6 +94,9 @@ export class Organization extends Model {
     })
     updatedAt: Date
 
+    @column({type: 'boolean'})
+    active = true;
+
     /**
      * Return default locale confiruation
      */
@@ -299,65 +301,6 @@ export class Organization extends Model {
         return struct
     }
 
-    async cleanCategories(groups: {id: string}[]) {
-        const reachable = new Map<string, boolean>()
-        const queue = [this.meta.rootCategoryId]
-        reachable.set(this.meta.rootCategoryId, true)
-        let shouldSave = false;
-
-        const usedGroupIds = new Set<string>()
-
-        while (queue.length > 0) {
-            const id = queue.shift()
-            if (!id) {
-                break
-            }
-
-            const category = this.meta.categories.find(c => c.id === id)
-            if (!category) {
-                continue
-            }
-
-            for (const i of category.categoryIds) {
-                if (!reachable.get(i)) {
-                    reachable.set(i, true)
-                    queue.push(i)
-                }
-            }
-
-            // Remove groupIds that no longer exist or are in a different category already
-            let filtered = category.groupIds.filter(id => !!groups.find(g => g.id === id) && !usedGroupIds.has(id))
-
-            // Remove duplicate groups
-            filtered = Formatter.uniqueArray(filtered)
-
-            if (filtered.length !== category.groupIds.length) {
-                shouldSave = true;
-                console.log("Deleted "+ (category.groupIds.length - filtered.length) +" group ids from category " + category.id + ", in organization "+this.id)
-                category.groupIds = filtered
-            }
-
-            for (const groupId of category.groupIds) {
-                usedGroupIds.add(groupId)
-            }
-        }
-
-        const reachableCategoryIds = [...reachable.keys()]
-
-        // Delete all categories that are not reachable anymore
-        const beforeCount = this.meta.categories.length;
-        this.meta.categories = this.meta.categories.filter(c => reachableCategoryIds.includes(c.id))
-
-        if (this.meta.categories.length !== beforeCount) {
-            console.log("Deleted "+ (beforeCount - this.meta.categories.length) +" categories from organization "+this.id)
-            await this.save()
-        } else {
-            if (shouldSave) {
-                await this.save()
-            }
-        }
-    }
-
     async updateDNSRecords() {
         const organization = this;
 

package/src/models/OrganizationRegistrationPeriod.ts

@@ -2,6 +2,7 @@ import { column, Model } from '@simonbackx/simple-database';
 import { Group as GroupStruct, OrganizationRegistrationPeriodSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from "uuid";
 import { Group, RegistrationPeriod } from '.';
+import { Formatter } from '@stamhoofd/utility';
 
 export class OrganizationRegistrationPeriod extends Model {
     static table = "organization_registration_periods";
@@ -51,4 +52,63 @@ export class OrganizationRegistrationPeriod extends Model {
             groups: groups.map(g => g.getStructure()).sort(GroupStruct.defaultSort)
         })
     }
+
+    async cleanCategories(groups: {id: string}[]) {
+        const reachable = new Map<string, boolean>()
+        const queue = [this.settings.rootCategoryId]
+        reachable.set(this.settings.rootCategoryId, true)
+        let shouldSave = false;
+
+        const usedGroupIds = new Set<string>()
+
+        while (queue.length > 0) {
+            const id = queue.shift()
+            if (!id) {
+                break
+            }
+
+            const category = this.settings.categories.find(c => c.id === id)
+            if (!category) {
+                continue
+            }
+
+            for (const i of category.categoryIds) {
+                if (!reachable.get(i)) {
+                    reachable.set(i, true)
+                    queue.push(i)
+                }
+            }
+
+            // Remove groupIds that no longer exist or are in a different category already
+            let filtered = category.groupIds.filter(id => !!groups.find(g => g.id === id) && !usedGroupIds.has(id))
+
+            // Remove duplicate groups
+            filtered = Formatter.uniqueArray(filtered)
+
+            if (filtered.length !== category.groupIds.length) {
+                shouldSave = true;
+                console.log("Deleted "+ (category.groupIds.length - filtered.length) +" group ids from category " + category.id + ", in organization period "+this.id)
+                category.groupIds = filtered
+            }
+
+            for (const groupId of category.groupIds) {
+                usedGroupIds.add(groupId)
+            }
+        }
+
+        const reachableCategoryIds = [...reachable.keys()]
+
+        // Delete all categories that are not reachable anymore
+        const beforeCount = this.settings.categories.length;
+        this.settings.categories = this.settings.categories.filter(c => reachableCategoryIds.includes(c.id))
+
+        if (this.settings.categories.length !== beforeCount) {
+            console.log("Deleted "+ (beforeCount - this.settings.categories.length) +" categories from organizaton period "+this.id)
+            await this.save()
+        } else {
+            if (shouldSave) {
+                await this.save()
+            }
+        }
+    }
 }

package/src/models/Payment.ts

@@ -144,17 +144,17 @@ export class Payment extends Model {
                     const registration = balanceItem?.registrationId && registrations.find(r => r.id === balanceItem.registrationId)
                     const member = balanceItem?.memberId ? members.find(r => r.id === balanceItem.memberId) : undefined
                     const order = balanceItem?.orderId && orders.find(r => r.id === balanceItem.orderId)
-                    const group = registration && groups.find(g => g.id === registration.groupId)
+                    const group = registration ? groups.find(g => g.id === registration.groupId) : null
 
-                    if (!group) {
-                        throw new Error("Group not found")
+                    if (registration && !group) {
+                        throw new Error("Group "+registration.groupId+" not found")
                     }
 
                     return BalanceItemPaymentDetailed.create({
                         ...item,
                         balanceItem: BalanceItemDetailed.create({
                             ...balanceItem,
-                            registration: registration ? registration.setRelation(Registration.group, group).getStructure() : null,
+                            registration: registration ? registration.setRelation(Registration.group, group!).getStructure() : null,
                             member: member ? MemberStruct.create(member) : null,
                             order: order ? OrderStruct.create({...order, payment: null}) : null
                         })

package/src/models/Platform.ts

@@ -69,6 +69,10 @@ export class Platform extends Model {
         });
     }
 
+    static clearCache() {
+        this.sharedStruct = null;
+    }
+
     async save() {
         Platform.sharedStruct = null
         return await super.save()

package/src/models/Registration.ts

@@ -167,8 +167,14 @@ export class Registration extends Model {
             await this.save();
             return false;
         }
+
+        if (this.waitingList && this.canRegister) {
+            this.waitingList = false
+        }
+        
         this.reservedUntil = null
         this.registeredAt = new Date()
+        this.canRegister = false
         await this.save();
 
         await this.sendEmailTemplate({

package/src/models/STInvoice.ts

@@ -305,6 +305,8 @@ export class STInvoice extends Model {
                 await code.reward()
             }
         }
+
+        // todo: link member_membership items to this newly created invoice
     }
 
     async assignNextNumber() {

package/src/models/index.ts

@@ -47,3 +47,4 @@ export * from "./MemberResponsibilityRecord"
 
 export * from "./OrganizationRegistrationPeriod"
 export * from "./RegistrationPeriod"
+export * from "./MemberPlatformMembership"