@stamhoofd/backend 2.113.0 → 2.114.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.113.0",
+    "version": "2.114.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -54,14 +54,14 @@
         "@simonbackx/simple-encoding": "2.23.1",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.113.0",
-        "@stamhoofd/backend-middleware": "2.113.0",
-        "@stamhoofd/email": "2.113.0",
-        "@stamhoofd/models": "2.113.0",
-        "@stamhoofd/queues": "2.113.0",
-        "@stamhoofd/sql": "2.113.0",
-        "@stamhoofd/structures": "2.113.0",
-        "@stamhoofd/utility": "2.113.0",
+        "@stamhoofd/backend-i18n": "2.114.0",
+        "@stamhoofd/backend-middleware": "2.114.0",
+        "@stamhoofd/email": "2.114.0",
+        "@stamhoofd/models": "2.114.0",
+        "@stamhoofd/queues": "2.114.0",
+        "@stamhoofd/sql": "2.114.0",
+        "@stamhoofd/structures": "2.114.0",
+        "@stamhoofd/utility": "2.114.0",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -79,5 +79,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e90b56b0e379e4bc7f7138cef336c267fb5e9bcf"
+    "gitHead": "89f437d82d2c21b1741c9c7efdbdafd6c8b98318"
 }

package/src/email-recipient-loaders/registrations.ts

@@ -1,8 +1,8 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
 import { EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, RegistrationsBlob, mergeFilters } from '@stamhoofd/structures';
-import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint';
-import { memberJoin } from '../sql-filters/registrations';
+import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
+import { memberJoin } from '../sql-filters/registrations.js';
 
 async function getRecipients(result: PaginatedResponse<RegistrationsBlob, LimitedFilteredRequest>, type: 'member' | 'parents' | 'unverified') {
     const recipients: EmailRecipient[] = [];
@@ -81,7 +81,7 @@ Email.recipientLoaders.set(EmailRecipientFilterType.RegistrationUnverified, {
         const q = (await GetRegistrationsEndpoint.buildQuery(query)).join(memberJoin);
 
         return await q.sum(
-            SQL.jsonLength(SQL.column('details'), '$.value.unverifiedEmails'),
+            SQL.jsonLength(SQL.column(Member.table, 'details'), '$.value.unverifiedEmails'),
         );
     },
 });

package/src/endpoints/global/email/CreateEmailEndpoint.ts

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { Email, Platform, RateLimiter } from '@stamhoofd/models';
 import { EmailPreview, EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 import { SimpleError } from '@simonbackx/simple-errors';
 
 type Params = Record<string, never>;
@@ -128,7 +128,7 @@ export class CreateEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         await model.save();
         await model.buildExampleRecipient();
-        model.updateCount();
+        await model.updateCount();
 
         if (request.body.status === EmailStatus.Sending || request.body.status === EmailStatus.Sent || request.body.status === EmailStatus.Queued) {
             if (!await Context.auth.canSendEmail(model)) {

package/src/endpoints/global/email/PatchEmailEndpoint.ts

@@ -1,10 +1,10 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { Email, Platform } from '@stamhoofd/models';
-import { EmailPreview, EmailStatus, Email as EmailStruct, PermissionLevel } from '@stamhoofd/structures';
+import { EmailPreview, EmailRecipientsStatus, EmailStatus, Email as EmailStruct, PermissionLevel } from '@stamhoofd/structures';
 
 import { AutoEncoderPatchType, Decoder, patchObject } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -124,6 +124,15 @@ export class PatchEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 });
             }
 
+            if (model.recipientsStatus === EmailRecipientsStatus.Created) {
+                throw new SimpleError({
+                    code: 'already_created',
+                    message: 'Recipients already created',
+                    human: $t(`457ecdaf-d1de-4136-9e82-682c18c5fa76`),
+                    statusCode: 400,
+                });
+            }
+
             model.recipientFilter = patchObject(model.recipientFilter, request.body.recipientFilter);
             rebuild = true;
         }
@@ -168,10 +177,7 @@ export class PatchEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
         if (rebuild) {
             await model.buildExampleRecipient();
-
-            // Force null - because we have stale data
-            model.emailRecipientsCount = null;
-            model.updateCount();
+            await model.updateCount();
         }
 
         if (request.body.status === EmailStatus.Sending || request.body.status === EmailStatus.Sent || request.body.status === EmailStatus.Queued) {

package/src/helpers/CheckSettlements.ts

@@ -2,7 +2,7 @@ import { MolliePayment, MollieToken, Order, Organization, PayconiqPayment, Payme
 import { Settlement } from '@stamhoofd/structures';
 import axios from 'axios';
 
-import { StripePayoutChecker } from './StripePayoutChecker';
+import { StripePayoutChecker } from './StripePayoutChecker.js';
 
 type MollieSettlement = {
     id: string;
@@ -179,7 +179,7 @@ async function updateSettlement(token: string, settlement: MollieSettlement, fro
                         id: settlement.id,
                         reference: settlement.reference,
                         settledAt: new Date(settlement.settledAt),
-                        amount: Math.round(parseFloat(settlement.amount.value) * 100),
+                        amount: Math.round(parseFloat(settlement.amount.value) * 100) * 100,
                     });
                     const saved = await payment.save();
 

package/src/helpers/StripePayoutChecker.ts

@@ -171,8 +171,8 @@ export class StripePayoutChecker {
             return;
         }
 
-        if (payment.price !== balanceItem.amount) {
-            console.log('Amount mismatch for payment ' + payment.id + ': ' + payment.price + ' !== ' + balanceItem.amount);
+        if (payment.price !== balanceItem.amount * 100) {
+            console.log('Amount mismatch for payment ' + payment.id + ': ' + payment.price + ' !== ' + (balanceItem.amount * 100));
             return;
         }
 
@@ -180,13 +180,13 @@ export class StripePayoutChecker {
             id: payout.id,
             reference: payout.statement_descriptor ?? '',
             settledAt: new Date(payout.arrival_date * 1000),
-            amount: payout.amount,
+            amount: payout.amount * 100,
             // Set only if application fee is witheld
-            fee: totalFees,
+            fee: totalFees * 100,
         });
 
         payment.settlement = settlement;
-        payment.transferFee = totalFees - payment.serviceFeePayout;
+        payment.transferFee = totalFees * 100 - payment.serviceFeePayout;
 
         // Force an updatedAt timestamp of the related order
         // Mark order as 'updated', or the frontend won't pull in the updates

package/src/seeds/1769088653-uitpas-status.ts

@@ -91,14 +91,9 @@ async function migrateMember(member: Member) {
             if (error.hasCode('https://api.publiq.be/probs/uitpas/pass-not-found') || error.hasCode('https://api.publiq.be/probs/uitpas/invalid-uitpas-number')) {
                 console.log(`Uitpas number ${member.details.uitpasNumberDetails?.uitpasNumber} is not known by the uitpas api for member with id ${member.id}.`);
 
-                // set updated at
-                if (member.details.uitpasNumberDetails) {
-                    member.details.uitpasNumberDetails.socialTariff = UitpasSocialTariff.create({
-                        status: UitpasSocialTariffStatus.Unknown,
-                    });
-                }
-
-                // remove review
+                // remove the uitpas number
+                member.details.uitpasNumberDetails = null;
+                member.details.cleanData();
                 member.details.reviewTimes.removeReview('uitpasNumber');
                 await member.save();
 
@@ -113,6 +108,9 @@ async function migrateMember(member: Member) {
                 // remove the uitpas number
                 member.details.uitpasNumberDetails = null;
                 member.details.cleanData();
+
+                // remove review
+                member.details.reviewTimes.removeReview('uitpasNumber');
                 await member.save();
 
                 // do not throw

package/src/sql-filters/members.ts

@@ -68,34 +68,20 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         type: SQLValueType.String,
         nullable: false,
     }),
+    'details.uitpasNumberDetails.socialTariff.status': createColumnFilter({
+        expression: SQL.jsonExtract(SQL.column(membersTable, 'details'), '$.value.uitpasNumberDetails.socialTariff.status'),
+        type: SQLValueType.JSONString,
+        nullable: true,
+        checkPermission: async () => {
+            await throwIfNoFinancialReadAccess();
+        },
+    }),
     'details.requiresFinancialSupport': createColumnFilter({
         expression: SQL.jsonExtract(SQL.column(membersTable, 'details'), '$.value.requiresFinancialSupport.value'),
         type: SQLValueType.JSONBoolean,
         nullable: true,
         checkPermission: async () => {
-            const organization = Context.organization;
-            if (!organization) {
-                if (!Context.auth.hasPlatformFullAccess()) {
-                    throw new SimpleError({
-                        code: 'permission_denied',
-                        message: 'No permissions for financial support filter.',
-                        human: $t(`64d658fa-0727-4924-9448-b243fe8e10a1`),
-                        statusCode: 400,
-                    });
-                }
-                return;
-            }
-
-            const permissions = await Context.auth.getOrganizationPermissions(organization);
-
-            if (!permissions || !permissions.hasAccessRight(AccessRight.MemberReadFinancialData)) {
-                throw new SimpleError({
-                    code: 'permission_denied',
-                    message: 'No permissions for financial support filter (organization scope).',
-                    human: $t(`64d658fa-0727-4924-9448-b243fe8e10a1`),
-                    statusCode: 400,
-                });
-            }
+            await throwIfNoFinancialReadAccess();
         },
     }),
     'email': createColumnFilter({
@@ -512,3 +498,29 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         ),
     },
 };
+
+async function throwIfNoFinancialReadAccess() {
+    const organization = Context.organization;
+    if (!organization) {
+        if (!Context.auth.hasPlatformFullAccess()) {
+            throw new SimpleError({
+                code: 'permission_denied',
+                message: 'No permissions for financial support filter.',
+                human: $t(`64d658fa-0727-4924-9448-b243fe8e10a1`),
+                statusCode: 400,
+            });
+        }
+        return;
+    }
+
+    const permissions = await Context.auth.getOrganizationPermissions(organization);
+
+    if (!permissions || !permissions.hasAccessRight(AccessRight.MemberReadFinancialData)) {
+        throw new SimpleError({
+            code: 'permission_denied',
+            message: 'No permissions for financial support filter (organization scope).',
+            human: $t(`64d658fa-0727-4924-9448-b243fe8e10a1`),
+            statusCode: 400,
+        });
+    }
+}