@stamhoofd/backend 2.121.0 → 2.122.0

package/src/crons/transfer-fees.ts

@@ -0,0 +1,176 @@
+import { registerCron } from '@stamhoofd/crons';
+import { BalanceItem, Organization, Payment, Platform } from '@stamhoofd/models';
+import { SQL } from '@stamhoofd/sql';
+import type { PaymentProvider } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, getPaymentProviderName, PaymentMethod, PaymentStatus, TranslatedString } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
+import { BalanceItemService } from '../services/BalanceItemService.js';
+import { PaymentService } from '../services/PaymentService.js';
+import { VATService } from '../services/VATService.js';
+
+// Charge manual service fees every night
+registerCron('transfer-fees', chargeTransferFees);
+
+async function chargeTransferFees() {
+    if (STAMHOOFD.environment !== 'development' && (new Date().getHours() > 5 || new Date().getHours() < 2)) {
+        return;
+    }
+    const membershipOrganizationId = (await Platform.getShared()).membershipOrganizationId;
+    if (!membershipOrganizationId) {
+        return;
+    }
+
+    const membershipOrganization = await Organization.getByID(membershipOrganizationId, true);
+
+    // Succeeded payments
+    const payments = await Payment.select()
+        .where('status', PaymentStatus.Succeeded)
+        .where('transferFeeManual', '>', 0)
+        .where('transferFeeManualCharged', 0)
+        .where('createdAt', '<', STAMHOOFD.environment !== 'development' ? new Date() : Formatter.dateIso(new Date(Date.now() + 1000 * 60 * 60 * 24)))
+        .limit(200)
+        .orderBy('createdAt', 'ASC')
+        .fetch();
+
+    // Pending payments older than 14 days with method = Transfer or PointOfSale
+    const pendingPayments = await Payment.select()
+        .where('status', [PaymentStatus.Pending, PaymentStatus.Created])
+        .where('method', [PaymentMethod.Transfer, PaymentMethod.PointOfSale, PaymentMethod.Unknown])
+        .where('transferFeeManual', '>', 0)
+        .where('transferFeeManualCharged', 0)
+        .where('createdAt', '<', Formatter.dateIso(new Date(Date.now() - 1000 * 60 * 60 * 24 * 14)))
+        .limit(200)
+        .orderBy('createdAt', 'ASC')
+        .fetch();
+
+    const allPayments = [...payments, ...pendingPayments];
+
+    console.log('Found ' + allPayments.length + ' payments to charge service fees for');
+
+    const mappedToOrganizationId = new Map<string, Payment[]>();
+    for (const payment of allPayments) {
+        if (!payment.organizationId) {
+            console.warn('Payment without organizationId, skipping', payment.id);
+            continue;
+        }
+        if (!mappedToOrganizationId.has(payment.organizationId)) {
+            mappedToOrganizationId.set(payment.organizationId, []);
+        }
+        mappedToOrganizationId.get(payment.organizationId)!.push(payment);
+    }
+
+    for (const [organizationId, payments] of mappedToOrganizationId.entries()) {
+        const organization = await Organization.getByID(organizationId);
+        if (!organization) {
+            console.warn('Organization not found for ID', organizationId);
+            continue;
+        }
+
+        // Group payments by Formatter.dateNumber(p.createdAt)
+        const groupedPayments: Map<string, Payment[]> = new Map();
+        for (const payment of payments) {
+            const date = Formatter.dateNumber(payment.createdAt);
+            if (!groupedPayments.has(date)) {
+                groupedPayments.set(date, []);
+            }
+            groupedPayments.get(date)!.push(payment);
+        }
+
+        for (const [_, payments] of groupedPayments) {
+            const totalFees = payments.reduce((sum, payment) => sum + payment.transferFeeManual - payment.transferFeeManualCharged, 0);
+            const groupedByDate = new Map<string, Payment[]>();
+
+            for (const p of payments) {
+                const date = Formatter.dateNumber(p.createdAt);
+                const existing = groupedByDate.get(date);
+                if (existing) {
+                    existing.push(p);
+                } else {
+                    groupedByDate.set(date, [p]);
+                }
+            }
+
+            for (const [day, payments] of groupedByDate) {
+                const groupedByProvider = new Map<PaymentProvider | null, Payment[]>();
+
+                for (const p of payments) {
+                    const provider = p.provider;
+                    const existing = groupedByProvider.get(provider);
+                    if (existing) {
+                        existing.push(p);
+                    } else {
+                        groupedByProvider.set(provider, [p]);
+                    }
+                }
+
+                for (const [provider, payments] of groupedByProvider) {
+                    const date = new Date(Math.min(...payments.map(p => p.createdAt.getTime())));
+                    const startOfDay = Formatter.luxon(date).startOf('day').toJSDate();
+                    const endOfDay = Formatter.luxon(date).endOf('day').toJSDate();
+
+                    // Ms don't work when querying MySQL, they get lost
+                    startOfDay.setMilliseconds(0);
+                    endOfDay.setMilliseconds(0);
+
+                    const item = new BalanceItem();
+                    item.type = BalanceItemType.TransferFee;
+                    item.description = $t('%1Yq', { date: day });
+
+                    if (provider) {
+                        item.relations.set(BalanceItemRelationType.PaymentProvider, BalanceItemRelation.create({
+                            id: provider,
+                            name: TranslatedString.create(getPaymentProviderName(provider)),
+                        }));
+                    }
+
+                    item.payingOrganizationId = organization.id;
+                    item.organizationId = membershipOrganizationId;
+                    item.VATPercentage = 21;
+                    item.VATExcempt = VATService.getVATExcempt({
+                        company: organization.defaultCompanies[0] ?? null,
+                        sellingOrganization: membershipOrganization,
+                        type: 'services',
+                    });
+                    item.VATIncluded = false;
+                    item.quantity = 1;
+                    item.unitPrice = totalFees;
+                    item.createdAt = new Date();
+                    item.status = BalanceItemStatus.Due;
+                    item.startDate = startOfDay;
+                    item.endDate = endOfDay;
+
+                    // Check if we find an existing one
+                    const existingAll = await BalanceItem.select()
+                        .where('type', BalanceItemType.TransferFee)
+                        .where('organizationId', membershipOrganizationId)
+                        .where('VATPercentage', item.VATPercentage)
+                        .where('VATIncluded', item.VATIncluded)
+                        .where('VATExcempt', item.VATExcempt)
+                        .where('payingOrganizationId', organization.id)
+                        .where('status', BalanceItemStatus.Due)
+                        .where('startDate', startOfDay)
+                        .where('endDate', endOfDay)
+                        .fetch();
+                    const existing = provider ? existingAll.find(e => e.relations.get(BalanceItemRelationType.PaymentProvider)?.id === provider) : existingAll.find(e => !e.relations.has(BalanceItemRelationType.PaymentProvider));
+
+                    if (existing) {
+                        existing.unitPrice += totalFees;
+                        await existing.save();
+                        BalanceItemService.scheduleUpdate(existing);
+                    } else {
+                        await item.save();
+                        BalanceItemService.scheduleUpdate(item);
+                    }
+
+                    const { changedRows } = await Payment.update()
+                        .where('id', payments.map(p => p.id))
+                        .set('transferFeeManualCharged', SQL.column('transferFeeManual'))
+                        .update();
+                    if (changedRows !== payments.length) {
+                        console.error('Unexpected change in transferFeeManualCharged. Expected ' + payments.length + ', updated only ' + changedRows);
+                    }
+                }
+            }
+        }
+    }
+}

package/src/crons/update-cached-balances.ts

@@ -17,10 +17,10 @@ async function updateCachedBalances() {
      * Cached balances of member should be updated before the cached balances of the user
      * because the cached balances of the user are dependent on the cached balances of the member.
      */
-    .orderBy('objectType', 'ASC')
+        .orderBy('objectType', 'ASC')
     // minimize the number of queries when updating
-    .orderBy('organizationId', 'ASC')
-    .limit(100).fetch();
+        .orderBy('organizationId', 'ASC')
+        .limit(100).fetch();
 
     // Group by object type, next by organization id
     const grouped = new Map<ReceivableBalanceType, Map<string, CachedBalance[]>>();
@@ -51,7 +51,7 @@ async function updateCachedBalances() {
         const bIsMember = b[0] === ReceivableBalanceType.member;
         if (aIsMember && !bIsMember) return -1;
         if (!aIsMember && bIsMember) return 1;
-        return 0; 
+        return 0;
     });
 
     for (const [objectType, organizationMap] of objectTypeMemberFirst) {

package/src/crons.ts

@@ -1,9 +1,8 @@
 import { Database } from '@simonbackx/simple-database';
+import { registerCron } from '@stamhoofd/crons';
 import { Group, Organization, Payment, Registration, STPackage, Webshop } from '@stamhoofd/models';
-import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
 import { SQL } from '@stamhoofd/sql';
-import { registerCron } from '@stamhoofd/crons';
+import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
 import { checkSettlements } from './helpers/CheckSettlements.js';
 import { PaymentService } from './services/PaymentService.js';
 import { RegistrationService } from './services/RegistrationService.js';
@@ -41,8 +40,7 @@ async function checkDNS() {
         }
         try {
             await organization.updateDNSRecords();
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -229,8 +227,7 @@ async function doCheckPayments(payments: Payment[]) {
                     await PaymentService.pollStatus(payment.id, organization);
                     continue;
                 }
-            }
-            else {
+            } else {
                 // deprecated
             }
 
@@ -240,8 +237,7 @@ async function doCheckPayments(payments: Payment[]) {
                 payment.status = PaymentStatus.Failed;
                 await payment.save();
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -303,8 +299,7 @@ async function checkFailedBuckarooPayments() {
                     continue;
                 }
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -312,8 +307,7 @@ async function checkFailedBuckarooPayments() {
     if (payments.length === 0) {
         didCheckBuckaroo = true;
         lastBuckarooId = '';
-    }
-    else {
+    } else {
         lastBuckarooId = payments[payments.length - 1].id;
     }
 }
@@ -361,56 +355,6 @@ async function checkReservedUntil() {
     }
 }
 
-let lastDripCheck: Date | null = null;
-let lastDripId = '';
-async function checkDrips() {
-    if (STAMHOOFD.environment === 'development') {
-        return;
-    }
-
-    if (STAMHOOFD.userMode === 'platform') {
-        return;
-    }
-
-    if (lastDripCheck && lastDripCheck > new Date(new Date().getTime() - 6 * 60 * 60 * 1000)) {
-        console.log('Skip Drip check');
-        return;
-    }
-
-    // Only send emails between 8:00 - 18:00 CET
-    const CETTime = Formatter.timeIso(new Date());
-    if ((CETTime < '08:00' || CETTime > '18:00') && STAMHOOFD.environment === 'production') {
-        console.log('Skip Drip check: outside hours');
-        return;
-    }
-
-    const organizations = await Organization.where({ id: { sign: '>', value: lastDripId } }, {
-        limit: STAMHOOFD.environment === 'production' ? 30 : 100,
-        sort: ['id'],
-    });
-
-    if (organizations.length == 0) {
-        // Wait before starting again
-        lastDripId = '';
-        lastDripCheck = new Date();
-        return;
-    }
-
-    console.log('Checking drips...');
-
-    for (const organization of organizations) {
-        console.log(organization.name);
-        try {
-            await organization.checkDrips();
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-
-    lastDripId = organizations[organizations.length - 1].id;
-}
-
 registerCron('checkSettlements', checkSettlements);
 registerCron('checkExpirationEmails', checkExpirationEmails);
 registerCron('checkReservedUntil', checkReservedUntil);
@@ -419,7 +363,6 @@ registerCron('checkWebshopDNS', checkWebshopDNS);
 registerCron('checkPayments', checkPayments);
 registerCron('checkOldPayments', checkOldPayments);
 registerCron('checkOldDirectDebitPayments', checkOldDirectDebitPayments);
-registerCron('checkDrips', checkDrips);
 
 // Register other crons
 import './crons/index.js';

package/src/debug.ts

@@ -10,8 +10,10 @@ import { SQLLogger } from '@stamhoofd/sql';
 import { ContextInstance } from './helpers/Context.js';
 
 export function loadDebugFunctions({ routerServer }: { routerServer: RouterServer }) {
-    SQLLogger.slowQueryThresholdMs = 75;
-    SQLLogger.explainAllAndLogInefficient = true;
+    if (process.env.LOG_SLOW_QUERIES) {
+        SQLLogger.slowQueryThresholdMs = 75;
+        SQLLogger.explainAllAndLogInefficient = true;
+    }
 
     if (process.env.LOG_REQUEST_QUERIES) {
         loadRequestQueries({ routerServer });

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

@@ -1,6 +1,6 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { LimitedFilteredRequest} from '@stamhoofd/structures';
+import type { LimitedFilteredRequest } from '@stamhoofd/structures';
 import { EmailRecipient, EmailRecipientFilterType, PaginatedResponse, Replacement } from '@stamhoofd/structures';
 import { GetDocumentsEndpoint } from '../endpoints/organization/dashboard/documents/GetDocumentsEndpoint.js';
 

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

@@ -1,6 +1,6 @@
 import { Email } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { EmailRecipient, LimitedFilteredRequest, MembersBlob} from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, MembersBlob } from '@stamhoofd/structures';
 import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';
 

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

@@ -1,4 +1,4 @@
-import type { RecipientLoader} from '@stamhoofd/models';
+import type { RecipientLoader } from '@stamhoofd/models';
 import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Order, Organization, Payment, User, Webshop } from '@stamhoofd/models';
 import { compileToSQLFilter, SQL } from '@stamhoofd/sql';
 import type { LimitedFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
@@ -206,8 +206,7 @@ async function getRecipients(result: PaginatedResponse<PaymentGeneral[], Limited
         recipients.push(...await getUserRecipients(userIds, replacementOptions));
         recipients.push(...await getMemberRecipients(memberIds, replacementOptions));
         recipients.push(...await getOrderRecipients(orderIds, replacementOptions));
-    }
-    else {
+    } else {
         recipients.push(...await getOrganizationRecipients(organizationIds, replacementOptions, subFilter));
     }
 
@@ -273,8 +272,7 @@ async function getMembersForOrganizations(organizationIds: string[], filter: Sta
         const membersForOrganization = result.get(organizationId);
         if (membersForOrganization) {
             membersForOrganization.push(member);
-        }
-        else {
+        } else {
             result.set(organizationId, [member]);
         }
     }
@@ -301,7 +299,7 @@ async function getOrganizationRecipients(ids: { organizationId: string; payment:
 
     if (subFilter === null) {
         // Use full admins instead
-        const admins = await User.getAdmins(allOrganizationIds, {verified: true});
+        const admins = await User.getAdmins(allOrganizationIds, { verified: true });
         for (const { organizationId, payment } of ids) {
             const organization = organizationMap.get(organizationId);
             if (!organization) {

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

@@ -1,6 +1,6 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { EmailRecipient, LimitedFilteredRequest, RegistrationsBlob} from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, RegistrationsBlob } from '@stamhoofd/structures';
 import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
 import { memberJoin } from '../sql-filters/registrations.js';

package/src/email-replacements/getEmailReplacementsForPayment.ts

@@ -1,5 +1,5 @@
 import { Order, Organization, Webshop } from '@stamhoofd/models';
-import type { BalanceItemPaymentsHtmlTableItem, PaymentGeneral} from '@stamhoofd/structures';
+import type { BalanceItemPaymentsHtmlTableItem, PaymentGeneral } from '@stamhoofd/structures';
 import { BalanceItemRelationType, BalanceItemType, getBalanceItemPaymentsHtmlTable, PaymentMethod, PaymentMethodHelper, Replacement, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { createOrderDataHTMLTable } from '../helpers/email-html-helpers.js';
@@ -106,8 +106,7 @@ export function getEmailReplacementsForPayment(payment: PaymentGeneral, options:
                 });
                 paymentUrl = 'https://' + webshopStruct.getUrl(organization) + '/order/' + (singleOrder.id);
             }
-        }
-        else {
+        } else {
             // Fallback (should not happen, but better than leaving {{orderUrl}} in place)
             orderUrlReplacement = Replacement.create({
                 token: 'orderUrl',
@@ -221,12 +220,10 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                                     webshop: webshop.meta.name,
                                     orderNumber: order.number ?? '',
                                 }));
-                            }
-                            else {
+                            } else {
                                 overviewContext.add(webshop.meta.name);
                             }
-                        }
-                        else {
+                        } else {
                             overviewContext.add($t('%1L0', {
                                 orderNumber: order.number ?? '',
                             }));
@@ -239,8 +236,7 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                 const memberName = balanceItem.relations.get(BalanceItemRelationType.Member)?.name.toString();
                 if (memberName) {
                     registrationMemberNames.add(memberName);
-                }
-                else {
+                } else {
                     overviewContext.add(balanceItem.itemTitle);
                 }
 

package/src/endpoints/admin/members/ChargeMembersEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';

package/src/endpoints/admin/memberships/ChargeMembershipsEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';

package/src/endpoints/admin/memberships/GetChargeMembershipsSummaryEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
@@ -107,8 +107,7 @@ export class GetChargeMembershipsSummaryEndpoint extends Endpoint<Params, Query,
 
         if (!trial) {
             query.where(noTrial);
-        }
-        else {
+        } else {
             query.whereNot(noTrial);
         }
 
@@ -174,8 +173,7 @@ export class GetChargeMembershipsSummaryEndpoint extends Endpoint<Params, Query,
 
         if (!trial) {
             query.where(trialQ);
-        }
-        else {
+        } else {
             query.whereNot(trialQ);
         }
 

package/src/endpoints/admin/organizations/ChargeOrganizationsEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest } from '@stamhoofd/structures';

package/src/endpoints/admin/organizations/GetOrganizationsCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/admin/organizations/GetOrganizationsEndpoint.ts

@@ -1,10 +1,10 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, Organization as OrganizationStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, Organization as OrganizationStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, PermissionLevel, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
@@ -76,9 +76,16 @@ export class GetOrganizationsEndpoint extends Endpoint<Params, Query, Body, Resp
 
             // todo: auto detect e-mailaddresses and search on admins
             searchFilter = {
-                name: {
-                    $contains: q.search,
-                },
+                $or: [
+                    {
+                        name: {
+                            $contains: q.search,
+                        },
+                    },
+                    {
+                        uri: q.search,
+                    },
+                ],
             };
 
             if (searchFilter) {
@@ -125,8 +132,7 @@ export class GetOrganizationsEndpoint extends Endpoint<Params, Query, Body, Resp
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',

package/src/endpoints/admin/organizations/PatchOrganizationsEndpoint.ts

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
@@ -133,8 +133,7 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
             if (STAMHOOFD.userMode === 'platform') {
                 const periodId = (await Platform.getShared()).periodIdIfPlatform;
                 organization.periodId = periodId;
-            }
-            else {
+            } else {
                 period = new RegistrationPeriod();
                 period.configureForNewOrganization();
                 await period.save();
@@ -147,8 +146,7 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
 
             try {
                 await organization.save();
-            }
-            catch (e) {
+            } catch (e) {
                 console.error(e);
                 throw new SimpleError({
                     code: 'creating_organization',

package/src/endpoints/admin/organizations/PatchPackagesEndpoint.test.ts

@@ -4,8 +4,8 @@ import { AccessRight, OrganizationPackagesStatus, STPackage, STPackageBundle, ST
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { initAdmin, initPlatformAdmin } from '../../../../tests/init/index.js';
+import { initMembershipOrganization } from '../../../../tests/init/initMembershipOrganization.js';
 import { PatchPackagesEndpoint } from './PatchPackagesEndpoint.js';
-import { PatchableArray } from '@simonbackx/simple-encoding';
 
 const baseUrl = `/organization/packages`;
 const endpoint = new PatchPackagesEndpoint();
@@ -15,6 +15,10 @@ describe('Endpoint.PatchPackagesEndpoint', () => {
         TestUtils.setEnvironment('userMode', 'organization');
     });
 
+    beforeAll(async () => {
+        await initMembershipOrganization();
+    });
+
     describe('Permission checking', () => {
         test('Cannot patch organization packages as finance director', async () => {
             const organization = await new OrganizationFactory({}).create();
@@ -39,7 +43,7 @@ describe('Endpoint.PatchPackagesEndpoint', () => {
                 path: baseUrl,
                 host: organization.getApiHost(),
                 body: OrganizationPackagesStatus.patch({
-                    
+
                 }),
                 headers: {
                     authorization: 'Bearer ' + adminToken.accessToken,
@@ -56,8 +60,8 @@ describe('Endpoint.PatchPackagesEndpoint', () => {
         const { adminToken } = await initPlatformAdmin();
 
         const patch = OrganizationPackagesStatus.patch({});
-        
-        const pack = STPackageBundleHelper.getCurrentPackage(STPackageBundle.Webshops, new Date())
+
+        const pack = STPackageBundleHelper.getCurrentPackage(STPackageBundle.Webshops, new Date());
         pack.validAt = new Date(); // ignored by backend for now
         patch.packages.addPut(pack);
 
@@ -96,10 +100,10 @@ describe('Endpoint.PatchPackagesEndpoint', () => {
 
         const patch = OrganizationPackagesStatus.patch({});
         const removeAt = new Date();
-        removeAt.setMilliseconds(0)
+        removeAt.setMilliseconds(0);
         patch.packages.addPatch(STPackage.patch({
             id: package1.id,
-            removeAt
+            removeAt,
         }));
 
         // Try to request all members at organization