@stamhoofd/backend 2.61.0 → 2.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.61.0",
+    "version": "2.62.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.18.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.61.0",
-        "@stamhoofd/backend-middleware": "2.61.0",
-        "@stamhoofd/email": "2.61.0",
-        "@stamhoofd/models": "2.61.0",
-        "@stamhoofd/queues": "2.61.0",
-        "@stamhoofd/sql": "2.61.0",
-        "@stamhoofd/structures": "2.61.0",
-        "@stamhoofd/utility": "2.61.0",
+        "@stamhoofd/backend-i18n": "2.62.0",
+        "@stamhoofd/backend-middleware": "2.62.0",
+        "@stamhoofd/email": "2.62.0",
+        "@stamhoofd/models": "2.62.0",
+        "@stamhoofd/queues": "2.62.0",
+        "@stamhoofd/sql": "2.62.0",
+        "@stamhoofd/structures": "2.62.0",
+        "@stamhoofd/utility": "2.62.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3df41cac9090d5e99abdbc51e4a4a02e9ea1784a"
+    "gitHead": "e3d5890ed7cbd9774a2b917b758e2ff1a0613b6a"
 }

package/src/crons/postmark.ts

@@ -50,7 +50,7 @@ async function saveLog({ email, organization, type, subType, id, response, subje
 
 async function checkPostmarkBounces() {
     if (STAMHOOFD.environment !== 'production') {
-        // return;
+        return;
     }
 
     const token = STAMHOOFD.POSTMARK_SERVER_TOKEN;

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -1,9 +1,9 @@
 import { ArrayDecoder, AutoEncoderPatchType, Data, Decoder, PatchableArray, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, Order, Payment, Token, Webshop } from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Order, Payment, Webshop, WebshopCounter } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, PrivatePayment, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 import { AuditLogService } from '../../../../services/AuditLogService';
@@ -83,6 +83,8 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
             return new Response([]);
         }
 
+        let clearNumbers = false;
+
         // Need to happen in the queue because we are updating the webshop stock
         const orders = await QueueHandler.schedule('webshop-stock/' + request.params.id, async () => {
             const webshop = await Webshop.getByID(request.params.id);
@@ -244,6 +246,11 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
 
                 if (model.status === OrderStatus.Deleted) {
                     model.data.removePersonalData();
+
+                    if (model.number !== null) {
+                        model.number = Math.floor(Math.random() * 1000000000000) + 1000000000000;
+                    }
+                    clearNumbers = true;
                 }
 
                 if (model.status === OrderStatus.Deleted || model.status === OrderStatus.Canceled) {
@@ -298,6 +305,10 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
             return mapped;
         });
 
+        if (clearNumbers) {
+            WebshopCounter.resetNumbers(request.params.id);
+        }
+
         return new Response(
             await Order.getPrivateStructures(orders),
         );

package/src/helpers/AdminPermissionChecker.ts

@@ -211,7 +211,7 @@ export class AdminPermissionChecker {
     }
 
     async canAccessMember(member: MemberWithRegistrations, permissionLevel: PermissionLevel = PermissionLevel.Read) {
-        if (this.isUserManager(member) && permissionLevel !== PermissionLevel.Full) {
+        if (permissionLevel !== PermissionLevel.Full && this.isUserManager(member)) {
             return true;
         }
 
@@ -1107,13 +1107,22 @@ export class AdminPermissionChecker {
         const isSetFinancialSupportTrue = data.details.shouldApplyReducedPrice;
         const isUserManager = this.isUserManager(member);
 
-        if (data.details.securityCode !== undefined) {
+        if (data.details.securityCode !== undefined || data.details.trackingYear !== undefined) {
             const hasFullAccess = await this.canAccessMember(member, PermissionLevel.Full);
 
-            // can only be set to null, and only if can access member with full access
-            if (!hasFullAccess || data.details.securityCode !== null) {
-                // Unset silently
-                data.details.securityCode = undefined;
+            if (!hasFullAccess) {
+                if (data.details.securityCode !== undefined) {
+                    // can only be set to null, and only if can access member with full access
+                    if (data.details.securityCode !== null) {
+                        // Unset silently
+                        data.details.securityCode = undefined;
+                    }
+                }
+
+                if (data.details.trackingYear !== undefined) {
+                    // Unset silently
+                    data.details.trackingYear = undefined;
+                }
             }
         }
 

package/src/helpers/StripeHelper.ts

@@ -210,6 +210,14 @@ export class StripeHelper {
 
         const totalPrice = payment.price;
 
+        if (totalPrice < 50) {
+            throw new SimpleError({
+                code: 'minmum_amount',
+                message: 'The minimum amount for an online payment is € 0,50',
+                human: 'Het minimum bedrag voor een online betaling is € 0,50',
+            });
+        }
+
         let fee = 0;
         let directCharge = false;
         const vat = calculateVATPercentage(organization.address, organization.meta.VATNumber);

package/src/seeds/1733748412-update-deleted-order-numbers.ts

@@ -0,0 +1,109 @@
+import { Migration } from '@simonbackx/simple-database';
+import { logger } from '@simonbackx/simple-logging';
+import { Order, WebshopCounter } from '@stamhoofd/models';
+import { OrderStatus } from '@stamhoofd/structures';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let pages = 0;
+    let id: string = '';
+
+    // There is an issue with some deleted orders that can't be stringified anymore
+    let limit = 100;
+    let restoreLimitAt: number | null = null;
+
+    await logger.setContext({ tags: ['seed'] }, async () => {
+        while (true) {
+            try {
+                const orders = await Order.where({
+                    id: {
+                        value: id,
+                        sign: '>',
+                    },
+                    status: OrderStatus.Deleted,
+                }, { limit, sort: ['id'] });
+
+                if (orders.length === 0) {
+                    break;
+                }
+
+                pages++;
+                process.stdout.write('.');
+                if (pages % 100 === 0) {
+                    process.stdout.write('\n');
+                }
+
+                if (limit === 1 && restoreLimitAt && pages > restoreLimitAt) {
+                    limit = 100;
+                }
+
+                for (const order of orders) {
+                    c++;
+
+                    if (order.status === OrderStatus.Deleted) {
+                        order.data.removePersonalData();
+
+                        if (order.number !== null) {
+                            order.number = Math.floor(Math.random() * 1000000000000) + 1000000000000;
+                        }
+                        await order.save();
+                    }
+                }
+
+                if (orders.length < limit) {
+                    break;
+                }
+                id = orders[orders.length - 1].id;
+            }
+            catch (e) {
+                if (e.toString() && e.toString().includes('RangeError')) {
+                    console.error('Found decoding issue at ' + id);
+                    console.error(e);
+                    if (limit === 1) {
+                        // We found the causing order.
+
+                        const _orders = await Order.where({
+                            id: {
+                                value: id,
+                                sign: '>',
+                            },
+                            status: OrderStatus.Deleted,
+                        }, { limit: 1, sort: ['id'], select: 'id' });
+
+                        if (_orders.length === 1) {
+                            console.log('Found broken order: ' + _orders[0].id);
+                            console.log('Deleting order');
+                            // Delete
+                            await _orders[0].delete();
+                        }
+                        else {
+                            console.error('Could not find causing order');
+                            throw e;
+                        }
+                    }
+                    // Something wrong with an order
+                    // continue
+                    limit = 1;
+                    restoreLimitAt = pages + 100;
+                    continue;
+                }
+                console.error('Error at ' + id);
+                throw e;
+            }
+        }
+    });
+
+    console.log('Cleared ' + c + ' deleted orders');
+
+    // Clear all cached order numbers
+    WebshopCounter.clearAll();
+
+    // Do something here
+    return Promise.resolve();
+});