@stamhoofd/models 2.83.5 → 2.84.0

package/src/models/BalanceItem.ts

@@ -116,6 +116,12 @@ export class BalanceItem extends QueryableModel {
     @column({ type: 'datetime', nullable: true })
     dueAt: Date | null = null;
 
+    /**
+     * Marking a balance item as 'paid' can have side effects. To prevent executing these side effects multiple times, we store it in here.
+     */
+    @column({ type: 'datetime', nullable: true })
+    paidAt: Date | null = null;
+
     @column({
         type: 'datetime', beforeSave(old?: any) {
             if (old !== undefined) {
@@ -142,6 +148,27 @@ export class BalanceItem extends QueryableModel {
         return this.unitPrice * this.amount;
     }
 
+    get isAfterDueDate() {
+        if (this.dueAt === null) {
+            return true;
+        }
+
+        const now = new Date();
+        now.setMilliseconds(0);
+        return this.dueAt <= now;
+    }
+
+    /**
+     * Note: cancelled balance items can also return 'true', because if they have pending/paid payments, they are still due with a negative price
+     */
+    get isDue() {
+        if (this.status === BalanceItemStatus.Hidden) {
+            return false;
+        }
+
+        return this.isAfterDueDate;
+    }
+
     get calculatedPriceOpen() {
         if (this.status !== BalanceItemStatus.Due) {
             return -this.pricePaid - this.pricePending;
@@ -197,7 +224,7 @@ export class BalanceItem extends QueryableModel {
 
                 // Refund the user
                 const cancellationFee = Math.round(item.price * options.cancellationFeePercentage / 10000);
-                if (cancellationFee > 0) {
+                if (cancellationFee !== 0) {
                     // Create a new item
                     const cancellationItem = await item.createCancellationItem(cancellationFee);
                     deletedItems.push(cancellationItem);
@@ -205,9 +232,9 @@ export class BalanceItem extends QueryableModel {
             }
         }
 
-        if (deletedItems.length) {
-            await this.updateOutstanding(deletedItems);
-        }
+        // if (deletedItems.length) {
+        //    await this.updateOutstanding(deletedItems);
+        // }
 
         return deletedItems;
     }
@@ -218,6 +245,7 @@ export class BalanceItem extends QueryableModel {
         item.memberId = this.memberId;
         item.userId = this.userId;
         item.payingOrganizationId = this.payingOrganizationId;
+        item.registrationId = this.registrationId;
 
         item.type = BalanceItemType.CancellationFee;
         item.relations = this.relations;
@@ -243,9 +271,9 @@ export class BalanceItem extends QueryableModel {
             }
         }
 
-        if (needsUpdate) {
-            await this.updateOutstanding(items);
-        }
+        // if (needsUpdate) {
+        //    await this.updateOutstanding(items);
+        // }
     }
 
     static async undoForDeletedOrders(orderIds: string[]) {
@@ -270,7 +298,10 @@ export class BalanceItem extends QueryableModel {
     }
 
     static async deleteForDeletedRegistration(registrationId: string, options?: { cancellationFeePercentage?: number }) {
-        const items = await BalanceItem.where({ registrationId });
+        const items = await BalanceItem.select()
+            .where('registrationId', registrationId)
+            .where('type', [BalanceItemType.Registration, BalanceItemType.RegistrationBundleDiscount])
+            .fetch();
         return await this.deleteItems(items, options);
     }
 
@@ -292,52 +323,6 @@ export class BalanceItem extends QueryableModel {
         };
     }
 
-    /**
-     * Update how many every object in the system owes or needs to be reimbursed
-     * and also updates the pricePaid/pricePending cached values in Balance items and members
-     */
-    static async updateOutstanding(items: BalanceItem[], additionalItems: { memberId: string; organizationId: string }[] = []) {
-        console.log('Update outstanding balance for', items.length, 'items');
-
-        await BalanceItem.updatePricePaid(items.map(i => i.id));
-
-        const organizationIds = Formatter.uniqueArray(items.map(p => p.organizationId));
-        for (const organizationId of organizationIds) {
-            const filteredItems = items.filter(i => i.organizationId === organizationId);
-            const filteredAdditionalItems = additionalItems.filter(i => i.organizationId === organizationId);
-
-            const memberIds = Formatter.uniqueArray(
-                [
-                    ...filteredItems.map(p => p.memberId).filter(id => id !== null),
-                    ...filteredAdditionalItems.map(i => i.memberId),
-                ],
-            );
-
-            await CachedBalance.updateForMembers(organizationId, memberIds);
-
-            let userIds = filteredItems.filter(p => p.userId !== null).map(p => p.userId!);
-
-            if (memberIds.length) {
-                // Now also include the userIds of the members
-                const userMemberIds = (await MemberUser.select().where('membersId', memberIds).fetch()).map(m => m.usersId);
-                userIds.push(...userMemberIds);
-            }
-            userIds = Formatter.uniqueArray(userIds);
-
-            await CachedBalance.updateForUsers(organizationId, userIds);
-
-            const organizationIds = Formatter.uniqueArray(filteredItems.map(p => p.payingOrganizationId).filter(id => id !== null));
-            await CachedBalance.updateForOrganizations(organizationId, organizationIds);
-
-            const registrationIds: string[] = Formatter.uniqueArray(filteredItems.map(p => p.registrationId).filter(id => id !== null));
-            await CachedBalance.updateForRegistrations(organizationId, registrationIds);
-
-            if (registrationIds.length) {
-                await Document.updateForRegistrations(registrationIds, organizationId);
-            }
-        }
-    }
-
     /**
      * Update the outstanding balance of multiple members in one go (or all members)
      */

package/src/models/CachedBalance.ts

@@ -229,6 +229,10 @@ export class CachedBalance extends QueryableModel {
             .where('dueAt', SQLWhereSign.Greater, dueOffset)
             .groupBy(SQL.column(columnName));
 
+        if (customWhere) {
+            dueQuery.where(customWhere);
+        }
+
         const dueResult = await dueQuery.fetch();
 
         const results: [string, { amountPaid: number; amountOpen: number; amountPending: number; nextDueAt: Date | null }][] = [];

package/src/models/Document.ts

@@ -74,12 +74,20 @@ export class Document extends QueryableModel {
             name: this.data.name,
             number: this.number,
             created_at: this.createdAt,
+            organization: {
+                name: organization.name,
+                companyName: organization.meta.companies[0]?.name || organization.name,
+                companyNumber: organization.meta.companies[0]?.companyNumber || null,
+                address: organization.address,
+                companyAddress: organization.meta.companies[0]?.address ?? organization.address,
+            },
         };
         const platformLogo = Platform.shared.config.logoDocuments ?? Platform.shared.config.horizontalLogo ?? Platform.shared.config.squareLogo;
         const organizationLogo = organization.meta.horizontalLogo ?? organization.meta.squareLogo;
 
         if (organizationLogo) {
             data['organization'] = {
+                ...data['organization'],
                 logo: organizationLogo.encode({ version: Version }) ?? null,
             };
         }
@@ -147,7 +155,7 @@ export class Document extends QueryableModel {
             if (member) {
                 const organizationIds = Formatter.uniqueArray(member.registrations.map(r => r.organizationId));
                 for (const organizationId of organizationIds) {
-                    await this.updateForRegistrations(member.registrations.filter(r => r.organizationId === organizationId).map(r => r.id), organizationId);
+                    await this.updateForRegistrations(member.registrations.filter(r => r.registeredAt && r.deactivatedAt === null && r.organizationId === organizationId).map(r => r.id), organizationId);
                 }
             }
         }

package/src/models/Email.test.ts

@@ -74,8 +74,8 @@ describe('Model.Email', () => {
         expect(model.recipientsStatus).toBe(EmailRecipientsStatus.Created);
         expect(model.recipientCount).toBe(2);
         expect(model.status).toBe(EmailStatus.Sent);
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0); // never tried to send any failed emails (whitelist)
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0); // never tried to send any failed emails (whitelist)
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -128,8 +128,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(2);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(1); // One retry
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(2);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(1); // One retry
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -181,8 +181,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(0);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(6); // Two retries for each recipient
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(6); // Two retries for each recipient
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -222,8 +222,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -236,7 +236,7 @@ describe('Model.Email', () => {
         ]);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('example@domain.be');
+        expect(await EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('example@domain.be');
     }, 15_000);
 
     it('Includes recipient names in mail header', async () => {
@@ -259,8 +259,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -275,7 +275,7 @@ describe('Model.Email', () => {
         ]);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('"John Von Doe" <example@domain.be>');
+        expect(await EmailMocker.broadcast.getSucceededEmail(0).to).toEqual('"John Von Doe" <example@domain.be>');
     }, 15_000);
 
     it('Skips invalid email addresses', async () => {
@@ -298,8 +298,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(0);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -341,8 +341,8 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Load recipietns
         const recipients = await EmailRecipient.select().where('emailId', model.id).fetch();
@@ -384,11 +384,11 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+        expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
             to: 'example@domain.be',
             from: '"My Platform" <info@my-platform.com>',
             replyTo: undefined,
@@ -425,11 +425,11 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+        expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
             to: 'example@domain.be',
             from: '"My Platform" <noreply@broadcast.my-platform.com>', // domain has changed here
             replyTo: '"My Platform" <info@other-platform.com>', // Reply to should be set
@@ -471,11 +471,11 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+        expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
             to: 'example@domain.be',
             from: '"My Platform" <noreply-uritest@broadcast.my-platform.com>', // domain has changed here
             replyTo: '"My Platform" <info@my-platform.com>', // Reply to should be set
@@ -519,11 +519,11 @@ describe('Model.Email', () => {
         expect(model.status).toBe(EmailStatus.Sent);
 
         // Both have succeeded
-        expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-        expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+        expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+        expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
         // Check to header
-        expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+        expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
             to: 'example@domain.be',
             from: '"My Platform" <info@my-platform.com>', // domain has changed here
             replyTo: undefined,
@@ -567,11 +567,11 @@ describe('Model.Email', () => {
             expect(model.status).toBe(EmailStatus.Sent);
 
             // Both have succeeded
-            expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-            expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+            expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+            expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
             // Check to header
-            expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
                 to: 'example@domain.be',
                 from: '"Custom Name" <noreply-' + organization.uri + '@broadcast.my-platform.com>',
                 replyTo: '"Custom Name" <custom@customdomain.com>', // domain has changed here
@@ -623,11 +623,11 @@ describe('Model.Email', () => {
             expect(model.status).toBe(EmailStatus.Sent);
 
             // Both have succeeded
-            expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-            expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+            expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+            expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
             // Check to header
-            expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
                 subject: `${brightYellow};${expectedContrastColor};${organization.name};${organization.name}`,
                 html: `${brightYellow};${expectedContrastColor};${organization.name};${organization.name}`,
                 text: `${brightYellow};${expectedContrastColor};${organization.name};${organization.name}`,
@@ -681,11 +681,11 @@ describe('Model.Email', () => {
             expect(model.status).toBe(EmailStatus.Sent);
 
             // Both have succeeded
-            expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-            expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+            expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+            expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
             // Check to header
-            expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
                 subject: `${brightBlue};${expectedContrastColor};${organization.name};Custom Name`,
                 html: `${brightBlue};${expectedContrastColor};${organization.name};Custom Name`,
                 text: `${brightBlue};${expectedContrastColor};${organization.name};Custom Name`,
@@ -731,11 +731,11 @@ describe('Model.Email', () => {
             expect(model.status).toBe(EmailStatus.Sent);
 
             // Both have succeeded
-            expect(EmailMocker.broadcast.getSucceededCount()).toBe(1);
-            expect(EmailMocker.broadcast.getFailedCount()).toBe(0);
+            expect(await EmailMocker.broadcast.getSucceededCount()).toBe(1);
+            expect(await EmailMocker.broadcast.getFailedCount()).toBe(0);
 
             // Check to header
-            expect(EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
+            expect(await EmailMocker.broadcast.getSucceededEmail(0)).toMatchObject({
                 subject: `${darkRed};${expectedContrastColor};${platform.config.name};${platform.config.name}`,
                 html: `${darkRed};${expectedContrastColor};${platform.config.name};${platform.config.name}`,
                 text: `${darkRed};${expectedContrastColor};${platform.config.name};${platform.config.name}`,

package/src/models/Email.ts

@@ -240,7 +240,7 @@ export class Email extends QueryableModel {
         await this.save();
 
         const id = this.id;
-        return await QueueHandler.schedule('send-email', async function (this: unknown) {
+        return await QueueHandler.schedule('send-email', async function (this: unknown, { abort }) {
             let upToDate = await Email.getByID(id);
             if (!upToDate) {
                 throw new SimpleError({
@@ -291,12 +291,14 @@ export class Email extends QueryableModel {
                 replyTo = null;
             }
 
+            abort.throwIfAborted();
             upToDate.status = EmailStatus.Sending;
             upToDate.sentAt = upToDate.sentAt ?? new Date();
             await upToDate.save();
 
             // Create recipients if not yet created
             await upToDate.buildRecipients();
+            abort.throwIfAborted();
 
             // Refresh model
             upToDate = await Email.getByID(id);
@@ -343,6 +345,7 @@ export class Email extends QueryableModel {
             });
 
             while (true) {
+                abort.throwIfAborted();
                 const data = await SQL.select()
                     .from('email_recipients')
                     .where('emailId', upToDate.id)
@@ -373,7 +376,6 @@ export class Email extends QueryableModel {
                     const promise = new Promise<void>((resolve) => {
                         promiseResolve = resolve;
                     });
-                    sendingPromises.push(promise);
 
                     const virtualRecipient = recipient.getRecipient();
 
@@ -423,8 +425,9 @@ export class Email extends QueryableModel {
                             callback(error).catch(console.error);
                         },
                     });
-
+                    abort.throwIfAborted(); // do not schedule if aborted
                     EmailClass.schedule(builder);
+                    sendingPromises.push(promise);
                 }
 
                 if (sendingPromises.length > 0) {
@@ -507,7 +510,7 @@ export class Email extends QueryableModel {
 
     async buildRecipients() {
         const id = this.id;
-        await QueueHandler.schedule('email-build-recipients-' + this.id, async function () {
+        await QueueHandler.schedule('email-build-recipients-' + this.id, async function ({ abort }) {
             const upToDate = await Email.getByID(id);
 
             if (!upToDate || !upToDate.id) {
@@ -522,6 +525,8 @@ export class Email extends QueryableModel {
                 return;
             }
 
+            abort.throwIfAborted();
+
             // If it is already creating -> something went wrong (e.g. server restart) and we can safely try again
 
             upToDate.recipientsStatus = EmailRecipientsStatus.Creating;
@@ -538,6 +543,8 @@ export class Email extends QueryableModel {
                     )
                     .where(SQL.column('emailId'), upToDate.id);
 
+                abort.throwIfAborted();
+
                 for (const subfilter of upToDate.recipientFilter.filters) {
                     // Create recipients
                     const loader = Email.recipientLoaders.get(subfilter.type);
@@ -554,6 +561,7 @@ export class Email extends QueryableModel {
                     });
 
                     while (request) {
+                        abort.throwIfAborted();
                         const response = await loader.fetch(request, subfilter.subfilter);
 
                         for (const item of response.results) {

package/src/models/Group.ts

@@ -97,13 +97,21 @@ export class Group extends QueryableModel {
     @column({ type: 'json', decoder: new ArrayDecoder(StockReservation) })
     stockReservations: StockReservation[] = [];
 
-    static async getAll(organizationId: string, periodId: string | null, active = true) {
-        const w: any = periodId ? { periodId } : {};
+    static async getAll(organizationId: string, periodId: string | null, active = true, types: GroupType[] = [GroupType.Membership]): Promise<Group[]> {
+        const query = Group.select()
+            .where('organizationId', organizationId);
+
         if (active) {
-            return await Group.where({ organizationId, deletedAt: null, ...w });
+            query.andWhere('deletedAt', null);
+        }
+
+        if (periodId) {
+            query.andWhere('periodId', periodId);
         }
 
-        return await Group.where({ organizationId, ...w });
+        query.andWhere('type', types);
+
+        return await query.fetch();
     }
 
     /**

package/src/models/Image.ts

@@ -1,9 +1,9 @@
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3'; // ES Modules import
 import { column } from '@simonbackx/simple-database';
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
 import { File, Resolution, ResolutionRequest } from '@stamhoofd/structures';
-import AWS from 'aws-sdk';
 import sharp from 'sharp';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -24,6 +24,23 @@ export class Image extends QueryableModel {
     @column({ type: 'datetime' })
     createdAt: Date = new Date();
 
+    static s3Client: S3Client | null = null;
+
+    static getS3Client(): S3Client {
+        if (!this.s3Client) {
+            this.s3Client = new S3Client({
+                forcePathStyle: false, // Configures to use subdomain/virtual calling format.
+                endpoint: 'https://' + STAMHOOFD.SPACES_ENDPOINT,
+                credentials: {
+                    accessKeyId: STAMHOOFD.SPACES_KEY,
+                    secretAccessKey: STAMHOOFD.SPACES_SECRET,
+                },
+                region: 'eu-west-1', // Not used, but required by the S3Client
+            });
+        }
+        return this.s3Client;
+    }
+
     static async create(fileContent: string | Buffer, type: string | undefined, resolutions: ResolutionRequest[], isPrivateFile: boolean = false, user: { id: string } | null = null): Promise<Image> {
         if (!STAMHOOFD.SPACES_BUCKET || !STAMHOOFD.SPACES_ENDPOINT || !STAMHOOFD.SPACES_KEY || !STAMHOOFD.SPACES_SECRET) {
             throw new SimpleError({
@@ -81,11 +98,7 @@ export class Image extends QueryableModel {
 
         const files = await Promise.all(promises);
 
-        const s3 = new AWS.S3({
-            endpoint: STAMHOOFD.SPACES_ENDPOINT,
-            accessKeyId: STAMHOOFD.SPACES_KEY,
-            secretAccessKey: STAMHOOFD.SPACES_SECRET,
-        });
+        const client = this.getS3Client();
 
         let prefix = (STAMHOOFD.SPACES_PREFIX ?? '');
         if (prefix.length > 0) {
@@ -112,15 +125,17 @@ export class Image extends QueryableModel {
             const fileId = uuidv4();
 
             const key = prefix + image.id + '/' + fileId + (!supportsTransparency ? '.jpg' : '.png');
-            const params = {
+            const cmd = new PutObjectCommand({
                 Bucket: STAMHOOFD.SPACES_BUCKET,
                 Key: key,
                 Body: f.data,
                 ContentType: !supportsTransparency ? 'image/jpeg' : 'image/png',
                 ACL: isPrivateFile ? 'private' : 'public-read',
-            };
+            });
 
-            uploadPromises.push(s3.putObject(params).promise());
+            uploadPromises.push(
+                client.send(cmd),
+            );
 
             const _file = new File({
                 id: fileId,
@@ -153,14 +168,6 @@ export class Image extends QueryableModel {
         const fileId = uuidv4();
         const uploadExt = fileType;
         const key = prefix + (STAMHOOFD.environment ?? 'development') + '/' + image.id + '/' + fileId + '.' + uploadExt;
-        const params = {
-            Bucket: STAMHOOFD.SPACES_BUCKET,
-            Key: key,
-            Body: fileContent,
-            ContentType: type ?? 'image/jpeg',
-            ACL: 'private',
-        };
-
         image.source = new File({
             id: fileId,
             server: 'https://' + STAMHOOFD.SPACES_BUCKET + '.' + STAMHOOFD.SPACES_ENDPOINT,
@@ -169,7 +176,14 @@ export class Image extends QueryableModel {
             // Don't set private here, as we don't allow to download this file
         });
 
-        uploadPromises.push(s3.putObject(params).promise());
+        const cmd = new PutObjectCommand({
+            Bucket: STAMHOOFD.SPACES_BUCKET,
+            Key: key,
+            Body: fileContent,
+            ContentType: type ?? 'image/jpeg',
+            ACL: 'private',
+        });
+        uploadPromises.push(client.send(cmd));
 
         await Promise.all(uploadPromises);
         await image.save();

package/src/models/Member.ts

@@ -1,6 +1,6 @@
 import { column, Database, ManyToManyRelation, ManyToOneRelation, OneToManyRelation } from '@simonbackx/simple-database';
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import { MemberDetails, NationalRegisterNumberOptOut, RegistrationWithMember as RegistrationWithMemberStruct, TinyMember } from '@stamhoofd/structures';
+import { MemberDetails, NationalRegisterNumberOptOut, RegistrationWithTinyMember, TinyMember } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -342,8 +342,8 @@ export class Member extends QueryableModel {
         return this.getBlobByIds(...(await this.getMemberIdsWithRegistrationForUser(user)));
     }
 
-    static getRegistrationWithMemberStructure(registration: RegistrationWithMember & { group: import('./Group').Group }): RegistrationWithMemberStruct {
-        return RegistrationWithMemberStruct.create({
+    static getRegistrationWithTinyMemberStructure(registration: RegistrationWithMember & { group: import('./Group').Group }): RegistrationWithTinyMember {
+        return RegistrationWithTinyMember.create({
             ...registration.getStructure(),
             cycle: registration.cycle,
             member: TinyMember.create({

package/src/models/MemberPlatformMembership.ts

@@ -366,7 +366,7 @@ export class MemberPlatformMembership extends QueryableModel {
                 balanceItem.unitPrice = this.price;
                 await balanceItem.save();
 
-                await BalanceItem.updateOutstanding([balanceItem]);
+                // await BalanceItem.updateOutstanding([balanceItem]);
             }
         }
     }