@stamhoofd/backend 2.77.1 → 2.77.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.77.1",
+    "version": "2.77.3",
     "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.1",
-        "@stamhoofd/backend-middleware": "2.77.1",
-        "@stamhoofd/email": "2.77.1",
-        "@stamhoofd/models": "2.77.1",
-        "@stamhoofd/queues": "2.77.1",
-        "@stamhoofd/sql": "2.77.1",
-        "@stamhoofd/structures": "2.77.1",
-        "@stamhoofd/utility": "2.77.1",
+        "@stamhoofd/backend-i18n": "2.77.3",
+        "@stamhoofd/backend-middleware": "2.77.3",
+        "@stamhoofd/email": "2.77.3",
+        "@stamhoofd/models": "2.77.3",
+        "@stamhoofd/queues": "2.77.3",
+        "@stamhoofd/sql": "2.77.3",
+        "@stamhoofd/structures": "2.77.3",
+        "@stamhoofd/utility": "2.77.3",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e6d9dce8ddfdfaf5380e98f3a0ffd113a3826955"
+    "gitHead": "73e6c9aec7a8e3feed99014f54fdae6890b346ce"
 }

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

@@ -492,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)
@@ -523,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);
@@ -672,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);
                 }

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/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -138,9 +138,18 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
                 // Apply payconiq patch
                 if (request.body.privateMeta.payconiqAccounts !== undefined) {
+                    const originalAccounts = organization.privateMeta.payconiqAccounts;
+
+                    // Ignore patches of payconiq accounts which contain a placeholder key
                     organization.privateMeta.payconiqAccounts = patchObject(organization.privateMeta.payconiqAccounts, cloneObject(request.body.privateMeta.payconiqAccounts as any));
 
                     for (const account of organization.privateMeta.payconiqAccounts) {
+                        if (account.apiKey === PayconiqAccount.placeholderApiKey) {
+                            // Reset back to original
+                            organization.privateMeta.payconiqAccounts = originalAccounts;
+                            break;
+                        }
+
                         if (account.merchantId === null) {
                             const payment = await PayconiqPayment.createTest(organization, account);
 

package/src/helpers/AuthenticatedStructures.ts

@@ -254,7 +254,7 @@ export class AuthenticatedStructures {
                 result = OrganizationStruct.create({
                     ...baseStruct,
                     period,
-                    privateMeta: organization.privateMeta,
+                    privateMeta: organization.privateMeta.removedPrivateKeys,
                     webshops: webshopPreviews.get(organization.id)?.sort((a, b) => Sorter.byDateValue(b.createdAt, a.createdAt)),
                 });
             }

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')),