@stamhoofd/backend 2.120.6 → 2.122.0

package/tests/helpers/StripeMocker.ts

@@ -9,8 +9,9 @@ import { StripeHelper } from '../../src/helpers/StripeHelper.js';
 import { testServer } from './TestServer.js';
 import { resetNock } from './resetNock.js';
 
+export type PaymentIntent = { id: string; return_url?: string };
 export class StripeMocker {
-    paymentIntents: { id: string }[] = [];
+    paymentIntents: PaymentIntent[] = [];
     charges: { id: string }[] = [];
     #forceFailure = false;
 
@@ -73,7 +74,7 @@ export class StripeMocker {
                 }
 
                 if (resource === 'payment_intents') {
-                    return this.#createPaymentIntent();
+                    return this.#createPaymentIntent(body);
                 }
 
                 return [500];
@@ -105,11 +106,13 @@ export class StripeMocker {
         return [200, intent];
     }
 
-    #createPaymentIntent() {
+    #createPaymentIntent(body: string) {
+        const decoded = this.decodeBody(body) as { return_url?: string };
         const intent = {
             object: 'payment_intent',
             id: this.createId('pi'),
             status: 'requires_action',
+            return_url: decoded.return_url,
             next_action: {
                 redirect_to_url: {
                     url: 'https://paymenturl',
@@ -120,7 +123,7 @@ export class StripeMocker {
         return [200, intent];
     }
 
-    getLastIntent() {
+    getLastIntent(): PaymentIntent {
         return this.paymentIntents[this.paymentIntents.length - 1];
     }
 
@@ -206,11 +209,11 @@ export class StripeMocker {
         });
     }
 
-    async createStripeAccount(organizationId: string): Promise<StripeAccount> {
+    async createStripeAccount(organizationId: string, type: 'express' | 'standard' = 'express'): Promise<StripeAccount> {
         const account = new StripeAccount();
         account.organizationId = organizationId;
         account.accountId = this.createId('acct');
-        account.setMetaFromStripeAccount(defaultBlobData);
+        account.setMetaFromStripeAccount({ ...defaultBlobData, type });
         await account.save();
         return account;
     }

package/tests/helpers/index.ts

@@ -1 +1,5 @@
+export * from './MollieMocker.js';
+export * from './PayconiqMocker.js';
+export * from './StripeMocker.js';
 export * from './UitpasApiMocker.js';
+export * from '../../src/services/STPackageService.js';

package/tests/init/initAdmin.ts

@@ -1,6 +1,6 @@
-import type { Organization} from '@stamhoofd/models';
+import type { Organization } from '@stamhoofd/models';
 import { Token, UserFactory } from '@stamhoofd/models';
-import type { AccessRight} from '@stamhoofd/structures';
+import type { AccessRight } from '@stamhoofd/structures';
 import { PermissionLevel, PermissionRole, Permissions } from '@stamhoofd/structures';
 import { initPermissionRole } from './initPermissionRole.js';
 

package/tests/init/initBundleDiscount.ts

@@ -1,5 +1,5 @@
 import type { Group, OrganizationRegistrationPeriod } from '@stamhoofd/models';
-import type { GroupPrice} from '@stamhoofd/structures';
+import type { GroupPrice } from '@stamhoofd/structures';
 import { GroupPriceDiscountType, BundleDiscount, TranslatedString, GroupPriceDiscount, ReduceablePrice, BundleDiscountGroupPriceSettings } from '@stamhoofd/structures';
 
 function createBundleDiscount({

package/tests/init/initMembershipOrganization.ts

@@ -0,0 +1,13 @@
+import { Organization, OrganizationFactory, Platform } from '@stamhoofd/models';
+
+export async function initMembershipOrganization() {
+    const platform = await Platform.getForEditing();
+    if (platform.membershipOrganizationId) {
+        return await Organization.getByID(platform.membershipOrganizationId, true);
+    }
+
+    const membershipOrganization = await new OrganizationFactory({}).create();
+    platform.membershipOrganizationId = membershipOrganization.id;
+    await platform.save();
+    return membershipOrganization;
+}

package/tests/init/initPermissionRole.ts

@@ -1,6 +1,6 @@
-import type { Organization} from '@stamhoofd/models';
+import type { Organization } from '@stamhoofd/models';
 import { Platform } from '@stamhoofd/models';
-import type { AccessRight} from '@stamhoofd/structures';
+import type { AccessRight } from '@stamhoofd/structures';
 import { PermissionRoleDetailed } from '@stamhoofd/structures';
 
 export async function initPermissionRole(
@@ -14,8 +14,7 @@ export async function initPermissionRole(
     if (organization) {
         organization.privateMeta.roles.push(role);
         await organization.save();
-    }
-    else {
+    } else {
         const platform = await Platform.getForEditing();
         platform.privateConfig.roles.push(role);
         await platform.save();

package/tests/vitest.global.setup.ts

@@ -19,7 +19,7 @@ export async function setup() {
 
     const { Database } = await import('@simonbackx/simple-database');
 
-    const { run } = await import('../src/migrate.js');
+    const { run } = await import('../dist/src/migrate.js');
     await run();
 
     await Database.end();

package/vitest.config.js

@@ -8,6 +8,13 @@ export default defineConfig({
         globals: true,
         root: import.meta.dirname,
         isolate: true,
+        testTimeout: 10_000, // required for slow CI
         maxWorkers: 1, // For now we can't run parallel because all test files use the same database
+        coverage: {
+            provider: 'v8',
+            include: ['src/**'],
+            exclude: ['src/migrations/**'],
+            reporter: ['text', 'html', 'lcov'],
+        },
     },
 });

package/.nvmrc

@@ -1 +0,0 @@
-22

package/src/endpoints/global/billing/ActivatePackagesEndpoint.ts

@@ -1,216 +0,0 @@
-import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
-import { Endpoint, Response } from '@simonbackx/simple-endpoints';
-import { SimpleError } from '@simonbackx/simple-errors';
-import type { BalanceItem} from '@stamhoofd/models';
-import { Organization, Platform, STPackage } from '@stamhoofd/models';
-import { CheckoutResponse, PackageCheckout, Payment as PaymentStruct, STPackageBundleHelper, STPackageStruct } from '@stamhoofd/structures';
-import { Context } from '../../../helpers/Context.js';
-import { PaymentService } from '../../../services/PaymentService.js';
-import { STPackageService } from '../../../services/STPackageService.js';
-
-type Params = Record<string, never>;
-type Query = undefined;
-type Body = PackageCheckout;
-type ResponseBody = CheckoutResponse;
-
-export class ActivatePackagesEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
-    bodyDecoder = PackageCheckout as Decoder<Body>;
-
-    protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method !== 'POST') {
-            return [false];
-        }
-
-        const params = Endpoint.parseParameters(request.url, '/billing/activate-packages', {});
-
-        if (params) {
-            return [true, params as Params];
-        }
-        return [false];
-    }
-
-    async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
-        const { user } = await Context.authenticate();
-
-        // If the user has permission, we'll also search if he has access to the organization's key
-        if (!await Context.auth.canActivatePackages(organization.id)) {
-            throw Context.auth.error();
-        }
-        const checkout = request.body;
-
-        // Validate company
-        if (checkout.customer && checkout.customer.company) {
-            // Search company id
-            // this avoids needing to check the VAT number every time
-            const id = checkout.customer.company.id;
-            const foundCompany = organization.meta.companies.find(c => c.id === id);
-
-            if (!foundCompany) {
-                throw new SimpleError({
-                    code: 'invalid_data',
-                    message: $t(`%w1`),
-                });
-            }
-        }
-
-        const currentPackages = await STPackageService.getActivePackages(organization.id);
-
-        const packages: STPackageStruct[] = [];
-        const balanceItems: Map<BalanceItem, number> = new Map();
-        const models: STPackage[] = [];
-        let totalPrice = 0;
-
-        if (STAMHOOFD.userMode === 'organization') {
-            // Only allowed in organization mode
-            for (const bundle of request.body.purchases.packageBundles) {
-            // Renew after currently running packages
-                let date = new Date();
-
-                let skip = false;
-
-                // Do we have a collision? Make sure our package only start after the expiry date of existing packages
-                for (const currentPack of currentPackages) {
-                    if (!STPackageBundleHelper.isCombineable(bundle, STPackageStruct.create(currentPack))) {
-                        if (!STPackageBundleHelper.isStackable(bundle, STPackageStruct.create(currentPack))) {
-                        // WE skip silently
-                            console.error('Tried to activate non combineable, non stackable packages...');
-                            skip = true;
-                            continue;
-                        }
-                        if (currentPack.validUntil !== null) {
-                            const end = currentPack.validUntil;
-                            if (end > date) {
-                                date = end;
-                            }
-                        }
-                    }
-                }
-
-                if (skip) {
-                    continue;
-                }
-                packages.push(STPackageBundleHelper.getCurrentPackage(bundle, date));
-            }
-
-            // Add renewals
-            if (checkout.purchases.renewPackageIds.length > 0) {
-                for (const id of checkout.purchases.renewPackageIds) {
-                    const pack = currentPackages.find(c => c.id === id);
-                    if (!pack) {
-                        throw new SimpleError({
-                            code: 'not_found',
-                            message: 'Package not found',
-                            human: $t('%1L1'),
-                        });
-                    }
-
-                    // Renew
-                    const model = pack.createRenewed();
-
-                    const balanceItem = await STPackageService.chargePackage(model, undefined, checkout.customer ?? undefined);
-                    if (balanceItem) {
-                        totalPrice += balanceItem.priceWithVAT;
-                        balanceItems.set(balanceItem, balanceItem.priceWithVAT);
-                    }
-
-                    if (!request.body.proForma) {
-                        await model.save();
-                        await balanceItem?.save();
-                    }
-                    models.push(model);
-                }
-            }
-        }
-
-        // Create the real models for each package
-        // calculate the price for these packages and create a hidden balance item
-        for (const pack of packages) {
-            const model = new STPackage();
-            model.id = pack.id;
-            model.meta = pack.meta;
-            model.validUntil = pack.validUntil;
-            model.removeAt = pack.removeAt;
-
-            // Not yet valid / active (ignored until valid)
-            model.validAt = null;
-            model.organizationId = organization.id;
-
-            const balanceItem = await STPackageService.chargePackage(model, undefined, checkout.customer ?? undefined);
-            if (balanceItem) {
-                totalPrice += balanceItem.priceWithVAT;
-                balanceItems.set(balanceItem, balanceItem.priceWithVAT);
-            }
-
-            if (!request.body.proForma) {
-                await model.save();
-                await balanceItem?.save();
-            }
-
-            models.push(model);
-        }
-
-        // todo: Add pending items (balance items in request)
-
-        const membershipOrganizationId = (await Platform.getShared()).membershipOrganizationId;
-        if (!membershipOrganizationId) {
-            throw new SimpleError({
-                code: 'unavailable',
-                message: 'No membership organization id set on the platform',
-                human: 'Package purchases are currently unavailable',
-            });
-        }
-
-        const membershipOrganization = await Organization.getByID(membershipOrganizationId);
-        if (!membershipOrganization) {
-            throw new Error('Unexpected missing membershipOrganization');
-        }
-
-        const result = await PaymentService.createPayment({
-            balanceItems,
-            checkout,
-            user,
-            organization: membershipOrganization,
-            payingOrganization: organization,
-            serviceFeeType: 'system',
-        });
-
-        console.log('Created payment', result);
-
-        if (!result) {
-            // No payment needed
-            throw new SimpleError({
-                code: 'missing_data',
-                message: 'Checkout was empty',
-                human: $t('%1L2'),
-            });
-        }
-
-        if (!checkout.proForma) {
-            for (const pack of models) {
-                await pack.save();
-            }
-        }
-        else {
-            // Delete payment again
-            if (result) {
-                await result.payment.delete();
-                result.paymentUrl = null;
-                result.paymentQRCode = null;
-            }
-
-            for (const [item] of balanceItems) {
-                await item.delete();
-            }
-        }
-
-        const { payment, paymentUrl, paymentQRCode } = result;
-
-        return new Response(CheckoutResponse.create({
-            payment: payment ? PaymentStruct.create(payment) : null,
-            paymentUrl,
-            paymentQRCode,
-        }));
-    }
-}