@stamhoofd/backend 2.77.0 → 2.77.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.77.0",
+    "version": "2.77.2",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.20.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.77.0",
-        "@stamhoofd/backend-middleware": "2.77.0",
-        "@stamhoofd/email": "2.77.0",
-        "@stamhoofd/models": "2.77.0",
-        "@stamhoofd/queues": "2.77.0",
-        "@stamhoofd/sql": "2.77.0",
-        "@stamhoofd/structures": "2.77.0",
-        "@stamhoofd/utility": "2.77.0",
+        "@stamhoofd/backend-i18n": "2.77.2",
+        "@stamhoofd/backend-middleware": "2.77.2",
+        "@stamhoofd/email": "2.77.2",
+        "@stamhoofd/models": "2.77.2",
+        "@stamhoofd/queues": "2.77.2",
+        "@stamhoofd/sql": "2.77.2",
+        "@stamhoofd/structures": "2.77.2",
+        "@stamhoofd/utility": "2.77.2",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "209036d412e24fefe961eeeeaa5a8618297bfcd7"
+    "gitHead": "8106bfebe63c39050eb31749e0c65ea9ddae08d7"
 }

package/src/endpoints/global/audit-logs/GetAuditLogsEndpoint.ts

@@ -42,9 +42,18 @@ export class GetAuditLogsEndpoint extends Endpoint<Params, Query, Body, Response
             if (!await Context.auth.hasFullAccess(organization.id)) {
                 throw Context.auth.error();
             }
-            scopeFilter = {
-                organizationId: organization.id,
-            };
+            if (!Context.auth.hasPlatformFullAccess()) {
+                scopeFilter = {
+                    organizationId: organization.id,
+                };
+            } else {
+                if (!q.filter || typeof q.filter !== 'object' || !('objectId' in q.filter)) {
+                    scopeFilter = {
+                        organizationId: organization.id,
+                    };
+                }
+                
+            }
         }
         else {
             if (!Context.auth.hasPlatformFullAccess()) {

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

@@ -2,8 +2,8 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
-import { GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
+import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
@@ -17,6 +17,7 @@ import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
 import { RegistrationService } from '../../../services/RegistrationService';
 import { shouldCheckIfMemberIsDuplicateForPatch, shouldCheckIfMemberIsDuplicateForPut } from './shouldCheckIfMemberIsDuplicate';
+import { AuditLogService } from '../../../services/AuditLogService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -491,7 +492,22 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     });
                 }
 
-                // Check duplicate memberships
+                const membership = new MemberPlatformMembership();
+                membership.id = put.id;
+                membership.memberId = member.id;
+                membership.membershipTypeId = put.membershipTypeId;
+                membership.organizationId = put.organizationId;
+                membership.periodId = put.periodId;
+
+                membership.startDate = put.startDate;
+                membership.endDate = put.endDate;
+                membership.expireDate = put.expireDate;
+                membership.locked = false;
+
+                // Correct price and dates
+                await membership.calculatePrice(member);
+
+                // Check duplicate memberships after correcting the dates
                 const existing = await MemberPlatformMembership.select()
                     .where('memberId', member.id)
                     .where('membershipTypeId', put.membershipTypeId)
@@ -522,19 +538,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     });
                 }
 
-                const membership = new MemberPlatformMembership();
-                membership.id = put.id;
-                membership.memberId = member.id;
-                membership.membershipTypeId = put.membershipTypeId;
-                membership.organizationId = put.organizationId;
-                membership.periodId = put.periodId;
-
-                membership.startDate = new Date(Math.max(Date.now(), put.startDate.getTime()));
-                membership.endDate = put.endDate;
-                membership.expireDate = put.expireDate;
-                membership.locked = false;
-
-                await membership.calculatePrice(member);
+                // Save if okay
                 await membership.save();
 
                 updateMembershipMemberIds.add(member.id);
@@ -671,7 +675,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         }
 
         if (updateMembershipsForOrganizations.size) {
-            QueueHandler.schedule('update-membership-prices', async () => {
+            QueueHandler.schedule('update-organization-membership-prices', async () => {
                 for (const id of updateMembershipsForOrganizations) {
                     await MembershipCharger.updatePrices(id);
                 }
@@ -794,6 +798,29 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
 
             // Grant temporary access to this member without needing to enter the security code again
             await Context.auth.temporarilyGrantMemberAccess(member, PermissionLevel.Write);
+
+            const log = new AuditLog();
+
+            // a member has multiple organizations, so this is difficult to determine - for now it is only visible in the admin panel
+            log.organizationId = member.organizationId; 
+            
+            log.type = AuditLogType.MemberSecurityCodeUsed;
+            log.source = AuditLogSource.Anonymous;
+
+            if (Context.user) {
+                log.userId = Context.user.id;
+                log.source = AuditLogSource.User;
+            }
+
+            log.objectId = member.id;
+            log.replacements = new Map([
+                ['m', AuditLogReplacement.create({
+                    value: member.details.name,
+                    type: AuditLogReplacementType.Member,
+                    id: member.id,
+                })],
+            ]);
+            await log.save();
         }
         else {
             throw new SimpleError({

package/src/endpoints/global/platform/PatchPlatformEnpoint.ts

@@ -213,7 +213,10 @@ export class PatchPlatformEndpoint extends Endpoint<
         if (shouldUpdateMemberships) {
             if (!QueueHandler.isRunning('update-membership-prices')) {
                 QueueHandler.schedule('update-membership-prices', async () => {
+                    // Update all membership prices (required to update temporary memberships)
                     await MembershipCharger.updatePrices();
+
+                    // Update memberships of all members (note: this only updates non-day memberships)
                     await PlatformMembershipService.updateAll();
                 }).catch(console.error);
             }

package/src/endpoints/global/registration/PatchUserMembersEndpoint.test.ts

@@ -87,6 +87,7 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
             expect(member.details.lastName).toBe(lastName);
             expect(member.details.birthDay).toEqual(existingMember.details.birthDay);
             expect(member.details.email).toBe('anewemail@example.com'); // this has been merged
+            expect(member.details.alternativeEmails).toHaveLength(0);
         });
 
         test('A duplicate member with existing registrations returns those registrations after a merge', async () => {
@@ -96,6 +97,7 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
                 firstName,
                 lastName,
                 securityCode: 'ABC-123',
+                email: 'original@example.com',
                 parents: [
                     Parent.create({
                         firstName: 'Jane',
@@ -146,7 +148,8 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
             expect(member.details.firstName).toBe(firstName);
             expect(member.details.lastName).toBe(lastName);
             expect(member.details.birthDay).toEqual(existingMember.details.birthDay);
-            expect(member.details.email).toBe('anewemail@example.com'); // this has been merged
+            expect(member.details.email).toBe('original@example.com'); // this has been merged
+            expect(member.details.alternativeEmails).toEqual(['anewemail@example.com']); // this has been merged
 
             // Check the registration is still there
             expect(member.registrations.length).toBe(1);

package/src/services/PlatformMembershipService.ts

@@ -164,7 +164,6 @@ export class PlatformMembershipService {
                 // Every (not-locked) period can have a generated membership
                 for (const period of periods) {
                     const registrations = me.registrations.filter(r => r.group.periodId === period.id && r.registeredAt && !r.deactivatedAt);
-                    const now = new Date();
 
                     const defaultMemberships = registrations.flatMap((r) => {
                         if (!r.group.defaultAgeGroupId) {
@@ -248,12 +247,26 @@ export class PlatformMembershipService {
 
                     const shouldApplyReducedPrice = me.details.shouldApplyReducedPrice;
 
+                    // We'll by default give this member the most cheap membership it can get, and if the price is the same, the membership associated with the first registration
                     const cheapestMembership = defaultMembershipsWithOrganization.sort((a, b) => {
                         const tagIdsA = a.organization?.meta.tags ?? [];
                         const tagIdsB = b.organization?.meta.tags ?? [];
-                        const diff = a.membership.getPrice(period.id, a.registration.startDate ?? a.registration.registeredAt ?? now, tagIdsA, shouldApplyReducedPrice)! - b.membership.getPrice(period.id, a.registration.startDate ?? a.registration.registeredAt ?? now, tagIdsB, shouldApplyReducedPrice)!;
+                        const aPrice = a.membership.getPrice(
+                            period.id, 
+                            a.registration.startDate ?? a.registration.registeredAt ?? a.registration.createdAt, 
+                            tagIdsA, 
+                            shouldApplyReducedPrice
+                        ) ?? 10000000;
+                        const bPrice = b.membership.getPrice(
+                            period.id, 
+                            b.registration.startDate ?? b.registration.registeredAt ?? b.registration.createdAt, 
+                            tagIdsB, 
+                            shouldApplyReducedPrice
+                        ) ?? 10000000;
+
+                        const diff = aPrice - bPrice;
                         if (diff === 0) {
-                            return Sorter.byDateValue(b.registration.startDate ?? b.registration.createdAt, a.registration.startDate ?? a.registration.createdAt);
+                            return Sorter.byDateValue(b.registration.startDate ?? b.registration.registeredAt ?? b.registration.createdAt, a.registration.startDate ?? a.registration.registeredAt ?? a.registration.createdAt);
                         }
                         return diff;
                     })[0];
@@ -264,6 +277,7 @@ export class PlatformMembershipService {
                     }
 
                     // Check if already have the same membership
+                    // if that is the case, we'll keep that one and update the price + dates if the organization matches the cheapest/earliest membership
                     let didFind = false;
                     for (const m of activeMemberships) {
                         if (m.membershipTypeId === cheapestMembership.membership.id && m.organizationId === cheapestMembership.registration.organizationId) {
@@ -303,6 +317,8 @@ export class PlatformMembershipService {
                     membership.membershipTypeId = cheapestMembership.membership.id;
                     membership.organizationId = cheapestMembership.registration.organizationId;
                     membership.periodId = period.id;
+
+                    // Note: the dates will get modified in the price calculation
                     membership.startDate = periodConfig.startDate;
                     membership.endDate = periodConfig.endDate;
                     membership.expireDate = periodConfig.expireDate;

package/src/sql-filters/members.ts

@@ -257,6 +257,7 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
             organizationId: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'organizationId')),
             periodId: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'periodId')),
             price: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'price')),
+            priceWithoutDiscount: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'priceWithoutDiscount')),
             startDate: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'startDate')),
             endDate: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'endDate')),
             expireDate: createSQLColumnFilterCompiler(SQL.column('member_platform_memberships', 'expireDate')),