@stamhoofd/models 2.83.4 → 2.84.0

package/src/models/Organization.ts

@@ -4,9 +4,9 @@ import { I18n } from '@stamhoofd/backend-i18n';
 import { EmailInterfaceRecipient } from '@stamhoofd/email';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Address, Country, DNSRecordStatus, EmailTemplateType, Language, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, 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';
+
+import { CreateEmailIdentityCommand, DeleteEmailIdentityCommand, GetEmailIdentityCommand, GetEmailIdentityCommandOutput, PutEmailIdentityFeedbackAttributesCommand, PutEmailIdentityMailFromAttributesCommand, SESv2Client } from '@aws-sdk/client-sesv2';
+
 import { v4 as uuidv4 } from 'uuid';
 
 import { QueueHandler } from '@stamhoofd/queues';
@@ -480,28 +480,27 @@ export class Organization extends QueryableModel {
             return;
         }
 
-        const sesv2 = new SES();
+        const client = new SESv2Client({});
 
         // Check if mail identitiy already exists..
-        let exists = false;
-        let existing: PromiseResult<SES.GetEmailIdentityResponse, AWSError> | undefined = undefined;
         try {
-            existing = await sesv2.getEmailIdentity({
+            const cmd = new GetEmailIdentityCommand({
                 EmailIdentity: mailDomain,
-            }).promise();
-            exists = true;
+            });
+            const result = await client.send(cmd);
 
-            // Check if DKIM keys are the same
-            if (existing.VerifiedForSendingStatus === true) {
+            if (result.VerifiedForSendingStatus === true) {
                 console.log('Cant delete AWS mail idenitiy @' + this.id + ' for ' + mailDomain + ': already validated and might be in use by other organizations');
                 return;
             }
 
-            console.log('Deleting AWS mail idenitiy @' + this.id + ' for ' + mailDomain);
+            console.log('Deleting AWS mail identity @' + this.id + ' for ' + mailDomain);
 
-            await sesv2.deleteEmailIdentity({
+            const deleteCmd = new DeleteEmailIdentityCommand({
                 EmailIdentity: mailDomain,
-            }).promise();
+            });
+
+            await client.send(deleteCmd);
             console.log('Deleted AWS mail idenitiy @' + this.id + ' for ' + this.privateMeta.mailDomain);
         }
         catch (e) {
@@ -531,16 +530,18 @@ export class Organization extends QueryableModel {
             return;
         }
 
-        const sesv2 = new SES();
+        const client = new SESv2Client({});
         const expectedConfigurationSetName = Formatter.slug(STAMHOOFD.platformName + '-domains');
 
         // Check if mail identitiy already exists..
         let exists = false;
-        let existing: PromiseResult<SES.GetEmailIdentityResponse, AWSError> | undefined = undefined;
+        let existing: GetEmailIdentityCommandOutput | undefined = undefined;
         try {
-            existing = await sesv2.getEmailIdentity({
+            const cmd = new GetEmailIdentityCommand({
                 EmailIdentity: this.privateMeta.mailDomain,
-            }).promise();
+            });
+
+            existing = await client.send(cmd);
             exists = true;
 
             console.log('AWS mail idenitiy exists already: just checking the verification status in AWS @' + this.id);
@@ -560,9 +561,11 @@ export class Organization extends QueryableModel {
 
             if (existing.VerifiedForSendingStatus !== true && existing.DkimAttributes?.Status === 'FAILED') {
                 console.error('AWS failed to verify DKIM records. Triggering a forced recheck @' + this.id);
-                await sesv2.deleteEmailIdentity({
+
+                const deleteCmd = new DeleteEmailIdentityCommand({
                     EmailIdentity: this.privateMeta.mailDomain,
-                }).promise();
+                });
+                await client.send(deleteCmd);
 
                 // Recreate it immediately
                 exists = false;
@@ -575,7 +578,7 @@ export class Organization extends QueryableModel {
         if (!exists) {
             console.log('Creating email identity in AWS SES...');
 
-            const result = await sesv2.createEmailIdentity({
+            const cmd = new CreateEmailIdentityCommand({
                 EmailIdentity: this.privateMeta.mailDomain,
                 ConfigurationSetName: expectedConfigurationSetName,
                 DkimSigningAttributes: {
@@ -592,27 +595,32 @@ export class Organization extends QueryableModel {
                         Value: STAMHOOFD.environment ?? 'Unknown',
                     },
                 ],
+            });
 
-            }).promise();
+            const result = await client.send(cmd);
             this.privateMeta.mailDomainActive = result.VerifiedForSendingStatus ?? false;
 
             // Disable email forwarding of bounces and complaints
             // We handle this now with the configuration set
-            await sesv2.putEmailIdentityFeedbackAttributes({
+            const putFeedbackCmd = new PutEmailIdentityFeedbackAttributesCommand({
                 EmailIdentity: this.privateMeta.mailDomain,
                 EmailForwardingEnabled: false,
-            }).promise();
+            });
+
+            await client.send(putFeedbackCmd);
         }
 
         if (this.privateMeta.mailFromDomain && (!exists || (existing && (!existing.MailFromAttributes || existing.MailFromAttributes.MailFromDomain !== this.privateMeta.mailFromDomain)))) {
             // Also set a from domain, to fix SPF
             console.log('Setting mail from domain: ' + this.privateMeta.mailFromDomain + ' for ' + this.id);
-            const params = {
+
+            const cmd = new PutEmailIdentityMailFromAttributesCommand({
                 EmailIdentity: this.privateMeta.mailDomain,
                 BehaviorOnMxFailure: 'USE_DEFAULT_VALUE',
                 MailFromDomain: this.privateMeta.mailFromDomain,
-            };
-            await sesv2.putEmailIdentityMailFromAttributes(params).promise();
+            });
+
+            await client.send(cmd);
         }
     }
 

package/src/models/PayconiqPayment.ts

@@ -161,7 +161,13 @@ export class PayconiqPayment extends QueryableModel {
     private static request(method: string, path: string, data = {}, auth: string | null = null, testMode: boolean): Promise<any> {
         return new Promise((resolve, reject) => {
             const jsonData = JSON.stringify(data);
-            const hostname = !testMode ? 'api.payconiq.com' : 'api.ext.payconiq.com';
+
+            // Payconiq switches to Wero on 2025-09-21
+            const isWero = Date.now() > new Date('2025-09-21T02:00:00+02:00').getTime();
+            let hostname = !testMode ? 'api.payconiq.com' : 'api.ext.payconiq.com';
+            if (isWero) {
+                hostname = !testMode ? 'merchant.api.bancontact.net' : 'merchant.api.preprod.bancontact.net';
+            }
             const base = 'https://' + hostname;
 
             // Log all communication

package/src/models/Platform.ts

@@ -89,6 +89,11 @@ export class Platform extends QueryableModel {
     }
 
     static async getShared(): Promise<Readonly<Platform> & { save: never }> {
+        if (this.shared) {
+            // Skip queue if possible (performance optimization)
+            return this.shared as any;
+        }
+
         return QueueHandler.schedule('Platform.getShared', async () => {
             if (this.shared) {
                 return this.shared;
@@ -141,9 +146,7 @@ export class Platform extends QueryableModel {
             this.sharedStruct = null;
             this.sharedPrivateStruct = null;
         });
-        await QueueHandler.schedule('Platform.getShared', async () => {
-            this.shared = null;
-        });
+        this.shared = null;
     }
 
     async save() {

package/src/models/Registration.ts

@@ -1,5 +1,5 @@
 import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import { EmailTemplateType, GroupPrice, PaymentMethod, PaymentMethodHelper, Recipient, RecordAnswer, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, Replacement, StockReservation } from '@stamhoofd/structures';
+import { AppliedRegistrationDiscount, EmailTemplateType, GroupPrice, PaymentMethod, PaymentMethodHelper, Recipient, RecordAnswer, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, Replacement, StockReservation } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -130,9 +130,21 @@ export class Registration extends QueryableModel {
     /**
      * Set to null if no reservations are made, to help faster querying
      */
-    @column({ type: 'json', decoder: new ArrayDecoder(StockReservation), nullable: true })
+    @column({ type: 'json', decoder: new ArrayDecoder(StockReservation) })
     stockReservations: StockReservation[] = [];
 
+    /**
+     * Cached value for calculation of discounts of other registrations (based on the single-source-of-truth stored in balance items)
+     *
+     * Discounts that were applied to this registration.
+     * Note that these discounts are saved in separate balance items and
+     * are not included in the price.
+     *
+     * Reason is that discounts can change after you've been registered
+     */
+    @column({ type: 'json', decoder: new MapDecoder(StringDecoder, AppliedRegistrationDiscount) })
+    discounts = new Map<string, AppliedRegistrationDiscount>();
+
     static group: ManyToOneRelation<'group', import('./Group').Group>;
 
     getStructure(this: Registration & { group: import('./Group').Group }) {

package/src/models/User.ts

@@ -1,6 +1,6 @@
 import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
 import { EmailInterfaceRecipient } from '@stamhoofd/email';
-import { QueryableModel, SQL, SQLJSONValue } from '@stamhoofd/sql';
+import { QueryableModel, SQL, SQLJSONNull } from '@stamhoofd/sql';
 import { LoginProviderType, NewUser, Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from '@stamhoofd/structures';
 import argon2 from 'argon2';
 import { v4 as uuidv4 } from 'uuid';
@@ -125,7 +125,7 @@ export class User extends QueryableModel {
             .where(
                 SQL.jsonValue(SQL.column('permissions'), '$.value.globalPermissions'),
                 '!=',
-                new SQLJSONValue(null),
+                SQLJSONNull,
             )
             .where('id', '!=', '1');