@stamhoofd/backend 2.129.1 → 2.129.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.129.1",
+    "version": "2.129.2",
     "type": "module",
     "main": "./dist/index.js",
     "exports": {
@@ -57,20 +57,20 @@
         "@simonbackx/simple-endpoints": "1.21.1",
         "@simonbackx/simple-errors": "1.5.0",
         "@simonbackx/simple-logging": "1.0.1",
-        "@stamhoofd/backend-env": "2.129.1",
-        "@stamhoofd/backend-i18n": "2.129.1",
-        "@stamhoofd/backend-middleware": "2.129.1",
-        "@stamhoofd/crons": "2.129.1",
-        "@stamhoofd/email": "2.129.1",
-        "@stamhoofd/excel-writer": "2.129.1",
-        "@stamhoofd/logging": "2.129.1",
-        "@stamhoofd/models": "2.129.1",
-        "@stamhoofd/object-differ": "2.129.1",
-        "@stamhoofd/queues": "2.129.1",
-        "@stamhoofd/sql": "2.129.1",
-        "@stamhoofd/structures": "2.129.1",
-        "@stamhoofd/types": "2.129.1",
-        "@stamhoofd/utility": "2.129.1",
+        "@stamhoofd/backend-env": "2.129.2",
+        "@stamhoofd/backend-i18n": "2.129.2",
+        "@stamhoofd/backend-middleware": "2.129.2",
+        "@stamhoofd/crons": "2.129.2",
+        "@stamhoofd/email": "2.129.2",
+        "@stamhoofd/excel-writer": "2.129.2",
+        "@stamhoofd/logging": "2.129.2",
+        "@stamhoofd/models": "2.129.2",
+        "@stamhoofd/object-differ": "2.129.2",
+        "@stamhoofd/queues": "2.129.2",
+        "@stamhoofd/sql": "2.129.2",
+        "@stamhoofd/structures": "2.129.2",
+        "@stamhoofd/types": "2.129.2",
+        "@stamhoofd/utility": "2.129.2",
         "archiver": "7.0.1",
         "axios": "1.16.0",
         "base-x": "3.0.11",
@@ -91,7 +91,7 @@
         "stripe": "16.12.0"
     },
     "devDependencies": {
-        "@stamhoofd/test-utils": "2.129.1",
+        "@stamhoofd/test-utils": "2.129.2",
         "@types/cookie": "0.6.0",
         "@types/luxon": "3.7.1",
         "@types/mailparser": "3.4.6",
@@ -107,5 +107,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "fed4dfbbbb768c9d57c476b93a3a42dfac6dd69b"
+    "gitHead": "099a48481fdbd3d661793675ab9e2c24a594b130"
 }

package/src/crons/stripe-invoices.ts

@@ -44,6 +44,6 @@ async function createStripeInvoices() {
     const invoicer = new StripeInvoicer({
         secretKey: STAMHOOFD.STRIPE_SECRET_KEY,
     });
-    await invoicer.generateAllInvoices(membershipOrganization, { forceLast: Formatter.dateIso(today) === '2026-07-03' });
+    await invoicer.generateAllInvoices(membershipOrganization, { forceLast: Formatter.dateIso(today) === '2026-07-04' });
     lastStripeInvoice = new Date();
 }

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

@@ -7,7 +7,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import type { MemberWithUsersRegistrationsAndGroups, Registration } from '@stamhoofd/models';
 import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, Organization, Platform, RateLimiter, RegistrationPeriod, User } from '@stamhoofd/models';
 import type { MemberResponsibility, MembersBlob } from '@stamhoofd/structures';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, EmergencyContact, GroupType, MemberDetails, MemberWithRegistrationsBlob, Parent, PermissionLevel, PlatformMembershipTypeBehaviour, SetupStepType } from '@stamhoofd/structures';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, BooleanStatus, EmergencyContact, GroupType, MemberDetails, MemberWithRegistrationsBlob, Parent, PermissionLevel, PlatformMembershipTypeBehaviour, SetupStepType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
@@ -1110,6 +1110,15 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             // Merge data
             // NOTE: We use mergeTwoMembers instead of mergeMultipleMembers, because we should never safe 'member' , because that one does not exist in the database
             await mergeTwoMembers(duplicate, member);
+
+            // Make sure the user keeps access to this member
+            // const user = Context.user;
+
+            // const { userEmails, parentEmails } = MemberUserSyncer.getMemberAccessEmails(duplicate.details);
+            // if (user && !duplicate.details.calculatedParentsHaveAccess && parentEmails.includes(user.email.toLocaleLowerCase()) && !userEmails.includes(user.email.toLocaleLowerCase())) {
+            //    console.log('Setting parents have access to true to maintain access for parent that used security code');
+            //    duplicate.details.parentsHaveAccess = BooleanStatus.create({ value: true });
+            // }
             return duplicate;
         }
     }

package/src/helpers/MemberMerger.test.ts

@@ -778,5 +778,139 @@ describe('member merge', () => {
             expect(m1.details.email).toBe('example@example.com');
             expect(m1.details.alternativeEmails).toEqual([]);
         });
+
+        describe('Parents have access get merged', () => {
+            test('False other', () => {
+                const m1 = new Member();
+                const m2 = new Member();
+
+                const base = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                });
+
+                const other = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: false }),
+                });
+
+                m1.details = base.clone();
+                m2.details = other.clone();
+
+                mergeMemberDetails(m1, m2);
+
+                expect(m1.details.email).toBe('example@example.com');
+                expect(m1.details.parentsHaveAccess?.value).toEqual(false);
+            });
+            test('True other', () => {
+                const m1 = new Member();
+                const m2 = new Member();
+
+                const base = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                });
+
+                const other = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: true }),
+                });
+
+                m1.details = base.clone();
+                m2.details = other.clone();
+
+                mergeMemberDetails(m1, m2);
+
+                expect(m1.details.email).toBe('example@example.com');
+                expect(m1.details.parentsHaveAccess?.value).toEqual(true);
+            });
+
+            test('Both different other prefer newest other', () => {
+                const m1 = new Member();
+                const m2 = new Member();
+
+                const base = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: true, date: new Date(0) }),
+                });
+
+                const other = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: false, date: new Date(1) }),
+                });
+
+                m1.details = base.clone();
+                m2.details = other.clone();
+
+                mergeMemberDetails(m1, m2);
+
+                expect(m1.details.email).toBe('example@example.com');
+                expect(m1.details.parentsHaveAccess?.value).toEqual(false);
+            });
+
+            test('Both different other prefer newest base', () => {
+                const m1 = new Member();
+                const m2 = new Member();
+
+                const base = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: true, date: new Date(1) }),
+                });
+
+                const other = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: false, date: new Date(0) }),
+                });
+
+                m1.details = base.clone();
+                m2.details = other.clone();
+
+                mergeMemberDetails(m1, m2);
+
+                expect(m1.details.email).toBe('example@example.com');
+                expect(m1.details.parentsHaveAccess?.value).toEqual(true);
+            });
+
+            test('Both different other prefer newest base 2', () => {
+                const m1 = new Member();
+                const m2 = new Member();
+
+                const base = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: false, date: new Date(1) }),
+                });
+
+                const other = MemberDetails.create({
+                    email: 'example@example.com',
+                    firstName: 'John',
+                    lastName: 'Doe',
+                    parentsHaveAccess: BooleanStatus.create({ value: true, date: new Date(0) }),
+                });
+
+                m1.details = base.clone();
+                m2.details = other.clone();
+
+                mergeMemberDetails(m1, m2);
+
+                expect(m1.details.email).toBe('example@example.com');
+                expect(m1.details.parentsHaveAccess?.value).toEqual(false);
+            });
+        });
     });
 });

package/src/helpers/MemberMerger.ts

@@ -306,6 +306,12 @@ export function mergeMemberDetails(base: Member, other: Member): void {
         'dataPermissions',
     );
 
+    mergeBooleanStatusIfBaseNotSet(
+        baseDetails,
+        otherDetails,
+        'parentsHaveAccess',
+    );
+
     // address
     mergeAddress(baseDetails, otherDetails, baseDetails);
 

package/src/helpers/MemberUserSyncer.test.ts

@@ -693,7 +693,7 @@ describe('Helpers.MemberUserSyncer', () => {
             ]);
         });
 
-        test('Parents are removed if member turns 18', async () => {
+        test.skip('Parents are removed if member turns 18', async () => {
             const member = await new MemberFactory({
                 details: MemberDetails.create({
                     firstName: 'John',

package/src/helpers/MemberUserSyncer.ts

@@ -132,7 +132,8 @@ export class MemberUserSyncerStatic {
                             // This makes sure we don't inherit permissions and aren't counted as 'being' the member
                             await this.linkUser(user.email, member, true);
                         }
-                    } else if (!member.details.calculatedParentsHaveAccess && parentEmails.includes(user.email.toLocaleLowerCase()) && !userEmails.includes(user.email.toLocaleLowerCase())) {
+                    } else if (member.details.parentsHaveAccess?.value === false && parentEmails.includes(user.email.toLocaleLowerCase()) && !userEmails.includes(user.email.toLocaleLowerCase())) {
+                        // Only remove if manually set to false for now
                         await this.unlinkUser(user, member);
                     }
                 }