@stamhoofd/backend 2.120.0 → 2.120.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.120.0",
+    "version": "2.120.1",
     "type": "module",
     "main": "./dist/index.js",
     "exports": {
@@ -65,14 +65,14 @@
         "@simonbackx/simple-encoding": "2.26.5",
         "@simonbackx/simple-endpoints": "1.21.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.120.0",
-        "@stamhoofd/backend-middleware": "2.120.0",
-        "@stamhoofd/email": "2.120.0",
-        "@stamhoofd/models": "2.120.0",
-        "@stamhoofd/queues": "2.120.0",
-        "@stamhoofd/sql": "2.120.0",
-        "@stamhoofd/structures": "2.120.0",
-        "@stamhoofd/utility": "2.120.0",
+        "@stamhoofd/backend-i18n": "2.120.1",
+        "@stamhoofd/backend-middleware": "2.120.1",
+        "@stamhoofd/email": "2.120.1",
+        "@stamhoofd/models": "2.120.1",
+        "@stamhoofd/queues": "2.120.1",
+        "@stamhoofd/sql": "2.120.1",
+        "@stamhoofd/structures": "2.120.1",
+        "@stamhoofd/utility": "2.120.1",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -90,5 +90,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f38f79c15ce16b0c8c14743ff3eb61feda5a18d4"
+    "gitHead": "00f65fc28d68feb86c30789784181a8954d638d7"
 }

package/src/boot.ts

@@ -5,6 +5,7 @@ import { Email } from '@stamhoofd/email';
 import { loadLogger } from '@stamhoofd/logging';
 import { Version } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
+import { checkReadOnly } from '@stamhoofd/crons';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { startCrons, stopCrons, waitForCrons } from '@stamhoofd/crons';
@@ -24,6 +25,7 @@ import { PlatformMembershipService } from './services/PlatformMembershipService.
 import { UitpasService } from './services/uitpas/UitpasService.js';
 import { UniqueUserService } from './services/UniqueUserService.js';
 import { AutoEncoder } from '@simonbackx/simple-encoding';
+import { StyledText } from '@simonbackx/simple-logging';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -47,11 +49,17 @@ if (new Date().getTimezoneOffset() !== 0) {
 }
 
 const seeds = async (options: {shutdown: () => Promise<void>}) => {
+    if (await checkReadOnly()) {
+        console.error(new StyledText(`[SEEDS] `).addClass('migration', 'tag'), new StyledText('MySQL is in read-only mode: Seeds are disabled.').addClass('error'));
+        return;
+    }
+
     try {
         // Internal
         await AuditLogService.disable(async () => {
             if (!await Migration.runAll(import.meta.dirname + '/seeds')) {
-                console.error('Seeds failed!')
+                console.error(new StyledText(`[SEEDS] `).addClass('migration', 'tag'), new StyledText('Seeds failed!').addClass('error'));
+
                 if (STAMHOOFD.environment === 'test' || STAMHOOFD.environment === 'development') {
                     await options.shutdown();
                 }

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -65,7 +65,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Member number already in use',
-                human: $t('Dit lidnummer is al in gebruik'),
+                human: $t('%1Oe'),
                 field: 'details.memberNumber',
             });
         }
@@ -1031,7 +1031,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 code: 'known_member_missing_rights',
                 message: 'Creating known member without sufficient access rights',
                 // different message for userMode organization because security codes are not available in that mode
-                human: $t(`{member} is al gekend in ons systeem, maar jouw e-mailadres niet. Neem contact op met de vereniging.`, { member: member.details.firstName }),
+                human: $t(`%1Oz`, { member: member.details.firstName }),
                 statusCode: 400,
             });
         }

package/src/endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.ts

@@ -2,10 +2,10 @@ 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 { Member, MemberPlatformMembership, Organization } from '@stamhoofd/models';
+import { BalanceItem, Member, MemberPlatformMembership, Organization } from '@stamhoofd/models';
 import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import type { CountFilteredRequest, StamhoofdFilter } from '@stamhoofd/structures';
-import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PlatformMembershiMemberDetails, PlatformMembership, PlatformMembershipOrganizationDetails } from '@stamhoofd/structures';
+import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PlatformMembershipMemberDetails, PlatformMembership, PlatformMembershipOrganizationDetails } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { Context } from '../../../helpers/Context.js';
 import { platformMembershipFilterCompilers } from '../../../sql-filters/platform-memberships.js';
@@ -115,8 +115,11 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
 
         const memberIds = Formatter.uniqueArray(data.map(d => d.memberId));
         const organizationIds = Formatter.uniqueArray(data.map(d => d.organizationId));
+        const balanceItemIds = Formatter.uniqueArray(data.map(d => d.balanceItemId));
         const members = await Member.getByIDs(...memberIds);
         const organizations = await Organization.getByIDs(...organizationIds);
+        const balanceItems = await BalanceItem.getByIDs(...balanceItemIds)
+        const balanceItemStructures = await BalanceItem.getStructureWithPayments(balanceItems);
 
         const results: PlatformMembership[] = [];
 
@@ -126,7 +129,7 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Member not found',
-                    human: $t(`Het lid dat bij de aansluiting hoort is niet gevonden.`),
+                    human: $t(`%1Nz`),
                     statusCode: 404,
                 });
             }
@@ -136,14 +139,16 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Organization not found',
-                    human: $t(`De vereniging die bij de aansluiting hoort is niet gevonden.`),
+                    human: $t(`%1OX`),
                     statusCode: 404,
                 });
             }
 
+            const balanceItem = model.balanceItemId ? balanceItemStructures.find(o => o.id === model.balanceItemId) : null;
             results.push(PlatformMembership.create({
                 ...model,
-                member: PlatformMembershiMemberDetails.create(member),
+                balanceItem: balanceItem,
+                member: PlatformMembershipMemberDetails.create(member),
                 organization: PlatformMembershipOrganizationDetails.create(organization)
             }));
         }

package/src/endpoints/organization/dashboard/organization/SetOrganizationDomainEndpoint.ts

@@ -115,7 +115,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                         type: DNSRecordType.CNAME,
                         name: organization.privateMeta.mailFromDomain + '.',
                         // Use shops for mail domain, to allow reuse
-                        value: (STAMHOOFD.domains.webshopCname ?? STAMHOOFD.domains.registrationCname) + '.',
+                        value: (STAMHOOFD.domains.webshopCname ?? STAMHOOFD.domains.registrationCname[organization.address.country] ?? STAMHOOFD.domains.registrationCname['']) + '.',
                     }));
 
                     if (STAMHOOFD.domains.registration && organization.privateMeta.pendingRegisterDomain) {
@@ -123,7 +123,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                             type: DNSRecordType.CNAME,
                             name: organization.privateMeta.pendingRegisterDomain + '.',
                             // Use registration domain
-                            value: STAMHOOFD.domains.registrationCname + '.',
+                            value: (STAMHOOFD.domains.registrationCname[organization.address.country] ?? STAMHOOFD.domains.registrationCname['']) + '.',
                         }));
                     }
                 }
@@ -132,7 +132,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                         type: DNSRecordType.CNAME,
                         name: organization.privateMeta.mailFromDomain + '.',
                         // Use registration domain
-                        value: STAMHOOFD.domains.registrationCname + '.',
+                        value: (STAMHOOFD.domains.registrationCname[organization.address.country] ?? STAMHOOFD.domains.registrationCname['']) + '.',
                     }));
                 }
 

package/src/excel-loaders/event-notifications.ts

@@ -38,7 +38,7 @@ const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
         },
         {
             id: 'organization.uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 30,
             getValue: (notification: EventNotification) => ({
                 value: notification.organization.uri,
@@ -67,7 +67,7 @@ const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
         },
         {
             id: 'startDate',
-            name: $t(`%7e`),
+            name: $t(`%1Of`),
             width: 20,
             getValue: (notification: EventNotification) => ({
                 value: notification.startDate,
@@ -80,7 +80,7 @@ const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
         },
         {
             id: 'endDate',
-            name: $t(`%wB`),
+            name: $t(`%1P8`),
             width: 20,
             getValue: (notification: EventNotification) => ({
                 value: notification.endDate,

package/src/excel-loaders/members.ts

@@ -154,7 +154,7 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
     },
     {
         id: 'membership',
-        name: $t(`%Wq`),
+        name: $t(`%1Ny`),
         width: 20,
         getValue: (member: PlatformMember) => {
             return {
@@ -177,7 +177,7 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
     },
     {
         id: 'uri',
-        name: $t(`%7C`),
+        name: $t(`%1O1`),
         width: 30,
         getValue: (member: PlatformMember) => {
             const organizations = member.filterOrganizations({ currentPeriod: true, types: [GroupType.Membership] });

package/src/excel-loaders/organizations.ts

@@ -41,7 +41,7 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
         },
         {
             id: 'uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 20,
             getValue: (object: Object) => ({
                 value: object.uri,
@@ -49,7 +49,7 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
         },
         {
             id: 'name',
-            name: $t(`%Gq`),
+            name: $t(`%1Os`),
             width: 50,
             getValue: (object: Object) => ({
                 value: object.name,
@@ -106,7 +106,7 @@ const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordW
         },
         {
             id: 'organization.uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 20,
             getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
                 value: object.organization.uri,
@@ -191,7 +191,7 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
         },
         {
             id: 'organization.uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 20,
             getValue: (object: PremiseWithOrganization) => ({
                 value: object.organization.uri,
@@ -207,7 +207,7 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
         },
         {
             id: 'premise.name',
-            name: $t(`%Gq`),
+            name: $t(`%1Os`),
             width: 20,
             getValue: (object: PremiseWithOrganization) => ({
                 value: object.premise.name,

package/src/excel-loaders/payments.ts

@@ -523,7 +523,7 @@ function getInvoiceColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
     return [
         {
             id: 'customer.name',
-            name: $t(`%Gq`),
+            name: $t(`%1Os`),
             width: 30,
             getValue: (object: PaymentGeneralWithStripeAccount) => {
                 return {

package/src/excel-loaders/platform-memberships.ts

@@ -20,7 +20,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'type',
-            name: $t('Type'),
+            name: $t('%1LP'),
             width: 40,
             getValue: (membership: PlatformMembership) => {
                 const membershipType = Platform.shared.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
@@ -30,7 +30,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'startDate',
-            name: $t('Startdatum'),
+            name: $t('%1Of'),
             width: 20,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -45,7 +45,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'endDate',
-            name: $t('Einddatum'),
+            name: $t('%1P8'),
             width: 20,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -60,7 +60,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'price',
-            name: $t('Prijs'),
+            name: $t('%1IP'),
             width: 10,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -75,7 +75,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'priceWithoutDiscount',
-            name:  $t(`Prijs zonder korting`),
+            name:  $t(`%1Nm`),
             width: 10,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -90,7 +90,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'trialUntil',
-            name: $t(`Einde proefperiode`),
+            name: $t(`%1PU`),
             width: 20,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -105,7 +105,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'freeAmount',
-            name: $t(`Dagen gratis`),
+            name: $t(`%1Oo`),
             width: 40,
             getValue: (membership: PlatformMembership) => ({
                 value: membership.freeAmount,
@@ -113,7 +113,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'createdAt',
-            name: $t(`Aanmaakdatum`),
+            name: $t(`%1Jc`),
             width: 20,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -128,7 +128,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'expireDate',
-            name: $t(`Vervaldatum`),
+            name: $t(`%1J7`),
             width: 20,
             getValue: (membership: PlatformMembership) => {
                 return {
@@ -141,10 +141,70 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
                 };
             },
         },
+        // balance item
+        {
+            id: 'balanceItem.createdAt',
+            name: $t(`%1OM`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.balanceItem?.createdAt ?? null,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'balanceItem.priceOpen',
+            name: $t('%1Ni'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.priceOpen ? ((membership.balanceItem?.priceOpen ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'balanceItem.pricePaid',
+            name: $t('%1OD'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.pricePaid ? ((membership.balanceItem?.pricePaid ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'balanceItem.pricePending',
+            name: $t('%1OL'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.pricePending ? ((membership.balanceItem?.pricePending ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+
         // member
         {
             id: 'member.memberNumber',
-            name: $t(`Lidnummer`),
+            name: $t(`%19j`),
             width: 20,
             getValue: (membership: PlatformMembership) => ({
                 value: membership.member.memberNumber,
@@ -152,7 +212,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'member.firstName',
-            name: $t(`Voornaam lid`),
+            name: $t(`%1O8`),
             width: 20,
             getValue:(membership: PlatformMembership) => ({
                 value: membership.member.firstName,
@@ -160,7 +220,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'member.lastName',
-            name: $t(`Achternaam lid`),
+            name: $t(`%1Or`),
             width: 20,
             getValue:(membership: PlatformMembership) => ({
                 value: membership.member.lastName,
@@ -169,7 +229,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         // organization
         {
             id: 'organization.name',
-            name: $t(`Naam vereniging`),
+            name: $t(`%1PW`),
             width: 20,
             getValue:(membership: PlatformMembership) => ({
                 value: membership.organization.name,
@@ -177,7 +237,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
         },
         {
             id: 'organization.uri',
-            name: $t(`Nummer vereniging`),
+            name: $t(`%1PZ`),
             width: 20,
             getValue:(membership: PlatformMembership) => ({
                 value: membership.organization.uri,

package/src/excel-loaders/receivable-balances.ts

@@ -146,7 +146,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'pricePending',
-            name: $t(`%wc`),
+            name: $t(`%1PL`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.pricePending / 1_0000,
@@ -252,7 +252,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 16,
             getValue: (object: ReceivableBalance) => ({
                 value: object.object.uri,
@@ -273,7 +273,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'amountPending',
-            name: $t(`%wc`),
+            name: $t(`%1PL`),
             width: 18,
             getValue: (object: ReceivableBalance) => ({
                 value: object.amountPending / 1_0000,

package/src/excel-loaders/registrations.ts

@@ -95,7 +95,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'startDate',
-            name: $t(`%7e`),
+            name: $t(`%1Of`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.startDate,
@@ -108,7 +108,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'endDate',
-            name: $t(`%wB`),
+            name: $t(`%1P8`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.endDate,
@@ -134,7 +134,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'organization',
-            name: $t('%5E'),
+            name: $t('%1PI'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
@@ -145,7 +145,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'uri',
-            name: $t('%7C'),
+            name: $t('%1O1'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
@@ -307,7 +307,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 30,
             getValue: (registration: PlatformRegistration) => {
                 return {

package/src/helpers/email-html-helpers.ts

@@ -18,7 +18,7 @@ export function createOrderDataHTMLTable(order: Order, webshop: Webshop): string
                 }
 
                 if (order.data.checkoutMethod?.type === CheckoutMethodType.OnSite) {
-                    return $t(`%TW`);
+                    return $t(`%8a`);
                 }
 
                 return $t(`%Us`);
@@ -56,7 +56,7 @@ export function createOrderDataHTMLTable(order: Order, webshop: Webshop): string
             value: order.data.timeSlot?.timeRangeString() ?? '',
         },
         {
-            title: $t(`%Gq`),
+            title: $t(`%1Os`),
             value: order.data.customer.name,
         },
         ...(order.data.customer.phone

package/src/sql-filters/platform-memberships.ts

@@ -46,6 +46,11 @@ export const platformMembershipFilterCompilers: SQLFilterDefinitions = {
         type: SQLValueType.Number,
         nullable: false,
     }),
+    price: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'price'),
+        type: SQLValueType.Number,
+        nullable: false,
+    }),
     organization: createExistsFilter(
         SQL.select()
             .from(SQL.table('organizations'))