@stamhoofd/models 2.4.0 → 2.6.0

package/dist/src/models/StripePaymentIntent.js

@@ -8,6 +8,10 @@ class StripePaymentIntent extends simple_database_1.Model {
     constructor() {
         super(...arguments);
         this.organizationId = null;
+        /**
+         * For direct charges, this should be set
+         */
+        this.accountId = null;
     }
 }
 exports.StripePaymentIntent = StripePaymentIntent;
@@ -28,4 +32,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: "string", nullable: true })
 ], StripePaymentIntent.prototype, "organizationId", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "string", nullable: true })
+], StripePaymentIntent.prototype, "accountId", void 0);
 //# sourceMappingURL=StripePaymentIntent.js.map

package/dist/src/models/StripePaymentIntent.js.map

@@ -1 +1 @@
-{"version":3,"file":"StripePaymentIntent.js","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":";;;;AAAA,iEAA2D;AAC3D,+BAAoC;AAEpC,MAAa,mBAAoB,SAAQ,uBAAK;IAA9C;;QAiBI,mBAAc,GAAkB,IAAI,CAAC;IACzC,CAAC;;AAlBD,kDAkBC;AAjBU,yBAAK,GAAG,wBAAwB,AAA3B,CAA4B;AAOxC;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;+CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2DACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DACN"}
+{"version":3,"file":"StripePaymentIntent.js","sourceRoot":"","sources":["../../../src/models/StripePaymentIntent.ts"],"names":[],"mappings":";;;;AAAA,iEAA2D;AAC3D,+BAAoC;AAEpC,MAAa,mBAAoB,SAAQ,uBAAK;IAA9C;;QAiBI,mBAAc,GAAkB,IAAI,CAAC;QAErC;;WAEG;QAEH,cAAS,GAAgB,IAAI,CAAA;IACjC,CAAC;;AAxBD,kDAwBC;AAvBU,yBAAK,GAAG,wBAAwB,AAA3B,CAA4B;AAOxC;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;+CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2DACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DACN;AAMrC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sDACd"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.4.0",
+    "version": "2.6.0",
     "main": "./dist/src/index.js",
     "types": "./dist/src/index.d.ts",
     "license": "UNLICENCED",
@@ -27,5 +27,5 @@
     "devDependencies": {
         "@simonbackx/simple-database": "1.24.0"
     },
-    "gitHead": "5313c328ca0e90544bf198bc6bebc90d7dced2aa"
+    "gitHead": "7a3f9f6c08058dc8b671befbfad73184afdc6d7c"
 }

package/src/migrations/1722269236-group-waitinglist-id.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `groups`
+ADD COLUMN `waitingListId` varchar(36) NULL AFTER `defaultAgeGroupId`;
+
+ALTER TABLE `groups` ADD FOREIGN KEY (`waitingListId`) REFERENCES `groups` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;

package/src/migrations/1722525785-balance-item-paying-organization-id.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `balance_items` ADD COLUMN `payingOrganizationId` varchar(36) NULL;
+ALTER TABLE `balance_items` ADD FOREIGN KEY (`payingOrganizationId`) REFERENCES `organizations` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;

package/src/migrations/1722525787-depending-balance-item.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `balance_items` ADD COLUMN `dependingBalanceItemId` varchar(36) NULL;
+ALTER TABLE `balance_items` ADD FOREIGN KEY (`dependingBalanceItemId`) REFERENCES `balance_items` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;

package/src/migrations/1722845608-registration-stock-reservations.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `registrations`
+ADD COLUMN `stockReservations` json NOT NULL DEFAULT ('{"value": [], "version": 0}');

package/src/migrations/1722845609-group-stock-reservations.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `groups`
+ADD COLUMN `stockReservations` json NOT NULL DEFAULT ('{"value": [], "version": 0}');

package/src/migrations/1722852362-stripe-intents-account-id.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `stripe_payment_intents`
+ADD COLUMN `accountId` varchar(100) NULL;

package/src/migrations/1722852363-stripe-checkout-sessions-account-id.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `stripe_checkout_sessions`
+ADD COLUMN `accountId` varchar(100) NULL;

package/src/models/BalanceItem.ts

@@ -18,15 +18,22 @@ export class BalanceItem extends Model {
     })
     id!: string;
 
+    // Receiving organization
+    
     @column({ type: "string" })
     organizationId: string
 
+    // Payer: memberId, userId or payingOrganizationId
+
     @column({ type: "string", nullable: true })
     memberId: string | null = null;
 
     @column({ type: "string", nullable: true })
     userId: string | null = null;
 
+    @column({ type: "string", nullable: true })
+    payingOrganizationId: string | null = null;
+
     /**
      * The registration ID that is linked to this balance item
      */
@@ -39,6 +46,14 @@ export class BalanceItem extends Model {
     @column({ type: "string", nullable: true })
     orderId: string | null = null;
 
+    /**
+     * The depending balance item ID that is linked to this balance item
+     * -> as soon as this balance item is paid, we'll mark this balance item as pending if it is still hidden
+     * -> allows for a pay back system where one user needs to pay back a different user
+     */
+    @column({ type: "string", nullable: true })
+    dependingBalanceItemId: string | null = null;
+
     @column({ type: "string" })
     description = "";
 
@@ -92,6 +107,12 @@ export class BalanceItem extends Model {
 
     async markPaid(payment: Payment, organization: Organization) {
         // status and pricePaid changes are handled inside balanceitempayment
+        if (this.dependingBalanceItemId) {
+            const depending = await BalanceItem.getByID(this.dependingBalanceItemId)
+            if (depending && depending.status === BalanceItemStatus.Hidden) {
+                await BalanceItem.reactivateItems([depending])
+            }
+        }
 
         // If registration
         if (this.registrationId) {
@@ -100,7 +121,7 @@ export class BalanceItem extends Model {
 
             if (registration) {
                 // 1. Mark registration as being valid
-                if (registration.registeredAt === null) {
+                if (registration.registeredAt === null || registration.deactivatedAt) {
                     await registration.markValid()
 
                     const {Group} = await import("./Group");
@@ -137,6 +158,28 @@ export class BalanceItem extends Model {
                 }
             }
         }
+
+        // Do we have a different connected balance item?
+        // Make it visible if this one is paid
+        if (this.dependingBalanceItemId) {
+            const depending = await BalanceItem.getByID(this.dependingBalanceItemId)
+            if (depending) {
+                if (this.status === BalanceItemStatus.Hidden) {
+                    depending.status = BalanceItemStatus.Pending
+                    await depending.save()
+
+                    if (depending.memberId) {
+                        const {Member} = await import("./Member");
+                        await Member.updateOutstandingBalance([depending.memberId])
+                    }
+
+                    if (depending.registrationId) {
+                        const {Registration} = await import("./Registration");
+                        await Registration.updateOutstandingBalance([depending.registrationId], depending.organizationId)
+                    }
+                }
+            }
+        }
     }
 
     async undoPaid(payment: Payment, organization: Organization) {
@@ -178,76 +221,52 @@ export class BalanceItem extends Model {
     }
 
     updateStatus() {
-        this.status = this.pricePaid >= this.price ? BalanceItemStatus.Paid : BalanceItemStatus.Pending;
+        this.status = this.pricePaid >= this.price ? BalanceItemStatus.Paid : (this.pricePaid > 0 ? BalanceItemStatus.Pending : (this.status === BalanceItemStatus.Hidden ? BalanceItemStatus.Hidden : BalanceItemStatus.Pending));
     }
 
     static async deleteItems(items: BalanceItem[]) {
-        const {payments} = await BalanceItem.loadPayments(items)
+        const {balanceItemPayments} = await BalanceItem.loadPayments(items)
 
-        // Load all balance items
-        const {balanceItems, balanceItemPayments: allBalanceItemPayments} = await Payment.loadBalanceItems(payments)
-        for (const payment of payments) {
-            if (payment.status === PaymentStatus.Succeeded) {
-                continue;
-            }
-            if (!(payment.method === PaymentMethod.PointOfSale || payment.method === PaymentMethod.Transfer || payment.method === PaymentMethod.Unknown)) {
-                continue;
-            }
-            const bip = allBalanceItemPayments.filter(p => p.paymentId == payment.id)
-            const bis = balanceItems.filter(b => b.status !== BalanceItemStatus.Hidden && bip.find(p => p.balanceItemId == b.id))
-
-            const remainingAfterDelete = bis.filter(b => !items.find(i => i.id == b.id))
-            if (remainingAfterDelete.length == 0) {
-                // Delete payment
-                payment.status = PaymentStatus.Failed
-                payment._forceUpdatedAt = new Date(1900, 0, 1)
-                await payment.save()
-            }
-        }
+        // todo: in the future we could automatically delete payments that are not needed anymore and weren't paid yet -> to prevent leaving ghost payments
+        // for now, an admin can manually cancel those payments
+        let needsUpdate = false
 
         // Set other items to zero (the balance item payments keep the real price)
         for (const item of items) {
+            needsUpdate = needsUpdate || (item.price > 0 && item.status !== BalanceItemStatus.Hidden)
+
             // Don't change status of items that are already paid or are partially paid
             // Not using item.paidPrice, since this is cached
-            const bip = allBalanceItemPayments.filter(p => p.balanceItemId == item.id)
-            const relatedPayments = payments.filter(p => bip.find(b => b.paymentId == p.id))
+            const bip = balanceItemPayments.filter(p => p.balanceItemId == item.id)
 
-            if (relatedPayments.length === 0 || !relatedPayments.find(p => p.status === PaymentStatus.Succeeded)) {
-                // No paid payments associated with this item
+            if (bip.length === 0) {
+                // No payments associated with this item
                 item.status = BalanceItemStatus.Hidden
+                item.price = 0
+                await item.save()
+            } else {
+                item.price = 0
                 await item.save()
             }
         }
+
+        if (needsUpdate) {
+            await this.updateOutstanding(items)
+        }
     }
 
     static async reactivateItems(items: BalanceItem[]) {
-        // Set other items to zero (the balance item payments keep the real price)
+        let needsUpdate = false
         for (const item of items) {
             if (item.status === BalanceItemStatus.Hidden) {
                 item.status = BalanceItemStatus.Pending
+                needsUpdate = needsUpdate || item.price > 0
                 await item.save()
             }
         }
 
-        const {payments} = await BalanceItem.loadPayments(items)
-
-        // Load all balance items
-        const {balanceItems, balanceItemPayments: allBalanceItemPayments} = await Payment.loadBalanceItems(payments)
-        for (const payment of payments) {
-            if (payment.status !== PaymentStatus.Failed) {
-                continue;
-            }
-            if (!(payment.method === PaymentMethod.PointOfSale || payment.method === PaymentMethod.Transfer || payment.method === PaymentMethod.Unknown)) {
-                continue;
-            }
-            const bip = allBalanceItemPayments.filter(p => p.paymentId == payment.id)
-            const bis = balanceItems.filter(b => b.status !== BalanceItemStatus.Hidden && bip.find(p => p.balanceItemId == b.id))
-
-            if (bis.length > 0) {
-                // Undo failed
-                payment.status = PaymentStatus.Created
-                await payment.save()
-            }
+        if (needsUpdate) {
+            await this.updateOutstanding(items)
         }
     }
 
@@ -285,6 +304,18 @@ export class BalanceItem extends Model {
         }
     }
 
+    static async updateOutstanding(items: BalanceItem[], organizationId?: string) {
+        const Member = (await import('./Member')).Member;
+
+        // Update outstanding amount of related members and registrations
+        const memberIds: string[] = Formatter.uniqueArray(items.map(p => p.memberId).filter(id => id !== null)) as any
+        await Member.updateOutstandingBalance(memberIds)
+
+        const {Registration} = await import('./Registration');
+        const registrationIds: string[] = Formatter.uniqueArray(items.map(p => p.registrationId).filter(id => id !== null)) as any
+        await Registration.updateOutstandingBalance(registrationIds, organizationId)
+    }
+
     static async loadPayments(items: BalanceItem[]) {
         if (items.length == 0) {
             return {balanceItemPayments: [], payments: []}

package/src/models/DocumentTemplate.ts

@@ -426,7 +426,7 @@ export class DocumentTemplate extends Model {
 
             for (const groupDefinition of this.privateSettings.groups) {
                 // Get the registrations for this group with this cycle
-                const registrations = await Member.getRegistrationWithMembersForGroup(groupDefinition.groupId, groupDefinition.cycle)
+                const registrations = await Member.getRegistrationWithMembersForGroup(groupDefinition.groupId)
 
                 for (const registration of registrations) {
                     const document = await this.generateForRegistration(registration)

package/src/models/Event.ts

@@ -55,6 +55,9 @@ export class Event extends Model {
     })
     updatedAt: Date
 
+    /**
+     * @deprecated
+     */
     getStructure(group?: Group|null) {
         return EventStruct.create({
             ...this,
@@ -62,10 +65,38 @@ export class Event extends Model {
         })
     }
 
+    /**
+     * @deprecated
+     */
     getPrivateStructure(group?: Group|null) {
         return EventStruct.create({
             ...this,
             group: group ? group.getPrivateStructure() : null
         })
     }
+
+    async syncGroupRequirements(group: Group|null) {
+        if (!group) {
+            return;
+        }
+
+        group.settings.requireDefaultAgeGroupIds = this.meta.defaultAgeGroupIds ?? []
+        group.settings.requireGroupIds = this.meta.groupIds ?? []
+
+        if (this.organizationId) {
+            // This is a not-national event, so require the organization
+            group.settings.requireOrganizationIds = this.meta.organizationTagIds ?? []
+            group.settings.requireOrganizationTags = []
+            group.settings.requirePlatformMembershipOn = null
+        } else {
+            group.settings.requireOrganizationTags = this.meta.organizationTagIds ?? []
+
+            // Everyone can register
+            group.settings.requireOrganizationIds = []
+
+            // But they need a valid platform membership
+            group.settings.requirePlatformMembershipOn = this.endDate
+        }
+        await group.save()
+    }
 }

package/src/models/Group.ts

@@ -1,9 +1,11 @@
 import { column, Database, ManyToOneRelation, Model, OneToManyRelation } from '@simonbackx/simple-database';
-import { GroupCategory, GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType } from '@stamhoofd/structures';
+import { GroupCategory, GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType, StockReservation } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from "uuid";
 
 import { Formatter } from '@stamhoofd/utility';
 import { Member, MemberWithRegistrations, OrganizationRegistrationPeriod, Payment, Registration, User } from './';
+import { QueueHandler } from '@stamhoofd/queues';
+import { ArrayDecoder } from '@simonbackx/simple-encoding';
 
 if (Member === undefined) {
     throw new Error("Import Member is undefined")
@@ -42,6 +44,9 @@ export class Group extends Model {
     @column({ type: "string" })
     organizationId: string;
 
+    @column({ type: "string", nullable: true })
+    waitingListId: string | null = null
+
     @column({ type: "string" })
     periodId: string;
 
@@ -82,17 +87,20 @@ export class Group extends Model {
     })
     deletedAt: Date | 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
-     */
     @column({ type: "string" })
     status = GroupStatus.Open;
 
+    /**
+     * Editing this field is only allowed when running inside the QueueHandler
+     */
+    @column({ type: "json", decoder: new ArrayDecoder(StockReservation) })
+    stockReservations: StockReservation[] = []
+
     static async getAll(organizationId: string, periodId: string|null, active = true) {
         const w: any = periodId ? {periodId} : {}
         if (active) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            return await Group.where({ organizationId, deletedAt: null, ...w, status: {sign: '!=', value: GroupStatus.Archived} })
+            return await Group.where({ organizationId, deletedAt: null, ...w })
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         return await Group.where({ organizationId, ...w })
@@ -186,10 +194,16 @@ export class Group extends Model {
 
     }
 
+    /**
+     * @deprecated
+     */
     getStructure() {
         return GroupStruct.create({ ...this, privateSettings: null })
     }
 
+    /**
+     * @deprecated
+     */
     getPrivateStructure() {
         return GroupStruct.create(this)
     }
@@ -207,18 +221,13 @@ export class Group extends Model {
 
     async updateOccupancy() {
         this.settings.registeredMembers = await Group.getCount(
-            "groupId = ? and cycle = ? and waitingList = 0 and registeredAt is not null",
-            [this.id, this.cycle]
+            "groupId = ? and registeredAt is not null AND deactivatedAt is null",
+            [this.id]
         )
 
         this.settings.reservedMembers = await Group.getCount(
-            "groupId = ? and cycle = ? and ((waitingList = 0 and registeredAt is null AND reservedUntil >= ?) OR (waitingList = 1 and canRegister = 1))",
-            [this.id, this.cycle, new Date()]
-        )
-
-        this.settings.waitingListSize = await Group.getCount(
-            "groupId = ? and cycle = ? and waitingList = 1",
-            [this.id, this.cycle, new Date()]
+            "groupId = ? and registeredAt is null AND (canRegister = 1 OR reservedUntil >= ?)",
+            [this.id, new Date()]
         )
     }
 
@@ -253,6 +262,14 @@ export class Group extends Model {
         }
 
         for (const group of allGroups) {
+            if (group.periodId !== period.periodId) {
+                continue
+            }
+
+            if (group.type !== GroupType.Membership) {
+                continue
+            }
+
             if (!reachable.get(group.id) && group.deletedAt === null) {
                 console.log("Deleting unreachable group "+group.id+" from organization "+organizationId + " org period "+period.id)
                 group.deletedAt = new Date()
@@ -263,6 +280,28 @@ export class Group extends Model {
         }
     }
 
+    static async applyStockReservations(groupId: string, addStockReservations: StockReservation[], free = false) {
+        await QueueHandler.schedule('group-stock-update-'+groupId, async () => {
+            const updatedGroup = await Group.getByID(groupId)
+            if (!updatedGroup) {
+                throw new Error("Expected group")
+            }
+
+            if (!free) {
+                updatedGroup.stockReservations = StockReservation.added(updatedGroup.stockReservations, addStockReservations)
+            } else {
+                updatedGroup.stockReservations = StockReservation.removed(updatedGroup.stockReservations, addStockReservations)
+            }
+            await updatedGroup.save()
+        })
+
+    }
+
+    static async freeStockReservations(groupId: string, reservations: StockReservation[]) {
+        return await this.applyStockReservations(groupId, reservations, true)
+    }
+
+
 }
 
 Registration.group = new ManyToOneRelation(Group, "group")

package/src/models/Member.ts

@@ -1,6 +1,6 @@
 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, GroupStatus } from '@stamhoofd/structures';
+import { Member as MemberStruct, MemberDetails, MemberWithRegistrationsBlob, RegistrationWithMember as RegistrationWithMemberStruct, User as UserStruct, GroupStatus, TinyMember } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from "uuid";
 
@@ -144,7 +144,7 @@ export class Member extends Model {
         }
         let query = `SELECT ${Member.getDefaultSelect()}, ${Registration.getDefaultSelect()} from \`${Member.table}\`\n`;
         
-        query += `JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`waitingList\` = 1)\n`
+        query += `JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`canRegister\` = 1)\n`
 
         // We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
         query += `where \`${Registration.table}\`.\`${Registration.primary.name}\` IN (?)`
@@ -177,15 +177,15 @@ export class Member extends Model {
     /**
      * Fetch all registrations with members with their corresponding (valid) registrations
      */
-    static async getRegistrationWithMembersForGroup(groupId: string, cycle: number): Promise<RegistrationWithMember[]> {
+    static async getRegistrationWithMembersForGroup(groupId: string): Promise<RegistrationWithMember[]> {
         let query = `SELECT ${Member.getDefaultSelect()}, ${Registration.getDefaultSelect()} from \`${Member.table}\`\n`;
         
-        query += `JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`waitingList\` = 1)\n`
+        query += `JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`canRegister\` = 1)\n`
 
         // We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
-        query += `where \`${Registration.table}\`.\`groupId\` = ? AND \`${Registration.table}\`.\`cycle\` = ?`
+        query += `where \`${Registration.table}\`.\`groupId\` = ?`
 
-        const [results] = await Database.select(query, [groupId, cycle])
+        const [results] = await Database.select(query, [groupId])
         const registrations: RegistrationWithMember[] = []
 
          // In the future we might add a 'reverse' method on manytoone relation, instead of defining the new relation. But then we need to store 2 model types in the many to one relation.
@@ -261,7 +261,7 @@ export class Member extends Model {
             return []
         }
         let query = `SELECT ${Member.getDefaultSelect()}, ${Registration.getDefaultSelect()}, ${User.getDefaultSelect()}  from \`${Member.table}\`\n`;
-        query += `LEFT JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`waitingList\` = 1)\n`
+        query += `LEFT JOIN \`${Registration.table}\` ON \`${Registration.table}\`.\`${Member.registrations.foreignKey}\` = \`${Member.table}\`.\`${Member.primary.name}\` AND (\`${Registration.table}\`.\`registeredAt\` is not null OR \`${Registration.table}\`.\`canRegister\` = 1)\n`
         query += Member.users.joinQuery(Member.table, User.table)+"\n"
 
         // We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
@@ -380,7 +380,11 @@ export class Member extends Model {
         return RegistrationWithMemberStruct.create({
             ...registration.getStructure(),
             cycle: registration.cycle,
-            member: MemberStruct.create(registration.member),
+            member: TinyMember.create({
+                id: registration.member.id,
+                firstName: registration.member.firstName,
+                lastName: registration.member.lastName,
+            }),
         })
     }
 
@@ -415,10 +419,9 @@ export class Member extends Model {
     }
 
     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 registrations = this.registrations.filter(r => r.group.periodId == platform.periodId && r.registeredAt && !r.deactivatedAt)
 
             const defaultMemberships = registrations.flatMap(r => {
                 if (!r.group.defaultAgeGroupId) {

package/src/models/Order.ts

@@ -875,7 +875,7 @@ export class Order extends Model {
         const template = templates[0]
 
         let recipient = (await this.getStructure()).getRecipient(
-            await this.webshop.organization.getStructure({emptyGroups: true}), 
+            this.webshop.organization.getBaseStructure(), 
             WebshopPreview.create(this.webshop)
         )
 
@@ -1027,4 +1027,4 @@ export class Order extends Model {
             }
         }
     }
-}
+}

package/src/models/Organization.ts

@@ -264,14 +264,9 @@ export class Organization extends Model {
         return this.id+"." + defaultDomain;
     }
 
-    async getPeriod({emptyGroups} = {emptyGroups: false}) {
+    async getPeriod() {
         const oPeriods = await OrganizationRegistrationPeriod.where({ periodId: this.periodId, organizationId: this.id }, {limit: 1})
-        const period = await RegistrationPeriod.getByID(this.periodId)
-
-        if (!period) {
-            throw new Error("Period not found")
-        }
-
+        
         let oPeriod: OrganizationRegistrationPeriod;
         if (oPeriods.length == 0) {
             // Automatically create a period
@@ -293,19 +288,12 @@ export class Organization extends Model {
         } else {
             oPeriod = oPeriods[0];
         }
-        const groups = emptyGroups ? [] : (await (await import("./Group")).Group.getAll(this.id, this.periodId))
 
-        return {
-            organizationPeriod: oPeriod,
-            period,
-            groups
-        }
+        return oPeriod
     }
 
-    async getStructure({emptyGroups} = {emptyGroups: false}): Promise<OrganizationStruct> {
-        const {groups, organizationPeriod, period} = await this.getPeriod({emptyGroups})
-
-        const struct = OrganizationStruct.create({
+    getBaseStructure(): OrganizationStruct {
+        return OrganizationStruct.create({
             id: this.id,
             name: this.name,
             meta: this.meta,
@@ -313,25 +301,8 @@ export class Organization extends Model {
             registerDomain: this.registerDomain,
             uri: this.uri,
             website: this.website,
-            groups: groups.map(g => g.getStructure()),
             createdAt: this.createdAt,
-            period: organizationPeriod.getStructure(period, groups)
         })
-
-        if (this.meta.modules.disableActivities) {
-            // Only show groups that are in a given category
-            struct.groups = struct.categoryTree.categories[0]?.groups ?? []
-        }
-
-        if (emptyGroups) {
-            // Reduce data
-            struct.meta = struct.meta.clone()
-            struct.meta.categories = []
-            struct.meta.recordsConfiguration = OrganizationRecordsConfiguration.create({})
-
-        }
-
-        return struct
     }
 
     async updateDNSRecords() {