@stamhoofd/backend 2.79.5 → 2.79.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.79.5",
+    "version": "2.79.7",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -38,14 +38,14 @@
         "@simonbackx/simple-encoding": "2.21.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.79.5",
-        "@stamhoofd/backend-middleware": "2.79.5",
-        "@stamhoofd/email": "2.79.5",
-        "@stamhoofd/models": "2.79.5",
-        "@stamhoofd/queues": "2.79.5",
-        "@stamhoofd/sql": "2.79.5",
-        "@stamhoofd/structures": "2.79.5",
-        "@stamhoofd/utility": "2.79.5",
+        "@stamhoofd/backend-i18n": "2.79.7",
+        "@stamhoofd/backend-middleware": "2.79.7",
+        "@stamhoofd/email": "2.79.7",
+        "@stamhoofd/models": "2.79.7",
+        "@stamhoofd/queues": "2.79.7",
+        "@stamhoofd/sql": "2.79.7",
+        "@stamhoofd/structures": "2.79.7",
+        "@stamhoofd/utility": "2.79.7",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d48b5e7157491c9a62c43c572958785eea132f48"
+    "gitHead": "d8675cbc91c2fcdcc6bbd3b3925ccd8063b15522"
 }

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

@@ -2213,7 +2213,7 @@ describe('Endpoint.RegisterMembers', () => {
             // #endregion
 
             // #region act and assert
-            await expect(async () => await post(body, organization, token)).rejects.toThrow(new RegExp('Je hebt geen toegangsrechten om deze inschrijving te verwijderen'));
+            await expect(async () => await post(body, organization, token)).rejects.toThrow(/No permission to delete this registration/);
             // #endregion
         });
 
@@ -2343,7 +2343,7 @@ describe('Endpoint.RegisterMembers', () => {
 
             // #region act and assert
             await post(body1, organization, token);
-            await expect(async () => await post(body2, organization, token)).rejects.toThrow(new RegExp('Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw'));
+            await expect(async () => await post(body2, organization, token)).rejects.toThrow(/No permission to delete this registration/);
             // #endregion
         });
     });

package/src/endpoints/global/registration/RegisterMembersEndpoint.ts

@@ -400,7 +400,8 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (!await Context.auth.canAccessRegistration(existingRegistration, PermissionLevel.Write)) {
                 throw new SimpleError({
                     code: 'forbidden',
-                    message: 'Je hebt geen toegangsrechten om deze inschrijving te verwijderen.',
+                    message: 'No permission to delete this registration',
+                    human: 'Je hebt geen toegangsrechten om deze inschrijving te verwijderen.',
                     statusCode: 403,
                 });
             }
@@ -408,7 +409,8 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (existingRegistration.deactivatedAt || !existingRegistration.registeredAt) {
                 throw new SimpleError({
                     code: 'invalid_data',
-                    message: 'Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw.',
+                    message: 'Cannot delete inactive registration',
+                    human: 'Oeps, één of meerdere inschrijvingen die je probeert te verwijderen was al verwijderd. Herlaad de pagina en probeer opnieuw.',
                 });
             }
 
@@ -455,41 +457,9 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             balanceItem.organizationId = organization.id;
 
             // Who is responsible for payment?
-            let balanceItem2: BalanceItem | null = null;
             if (registration.payingOrganizationId) {
-                // Create a separate balance item for this meber to pay back the paying organization
-                // this is not yet associated with a payment but will be added to the outstanding balance of the member
-
+                // We no longer also charge the member. This has been removed, ref STA-288
                 balanceItem.payingOrganizationId = registration.payingOrganizationId;
-
-                balanceItem2 = new BalanceItem();
-
-                // NOTE: we don't connect the registrationId here
-                // because otherwise the total price and pricePaid for the registration would be incorrect
-                // balanceItem2.registrationId = registration.id;
-
-                balanceItem2.unitPrice = unitPrice;
-                balanceItem2.amount = amount ?? 1;
-                balanceItem2.description = description;
-                balanceItem2.relations = relations;
-                balanceItem2.type = type;
-
-                // Who needs to receive this money?
-                balanceItem2.organizationId = registration.payingOrganizationId;
-
-                // Who is responsible for payment?
-                balanceItem2.memberId = registration.memberId;
-
-                if (registration.trialUntil) {
-                    balanceItem2.dueAt = registration.trialUntil;
-                }
-
-                // If the paying organization hasn't paid yet, this should be hidden and move to pending as soon as the paying organization has paid
-                balanceItem2.status = BalanceItemStatus.Hidden;
-                await balanceItem2.save();
-
-                // do not add to createdBalanceItems array because we don't want to add this to the payment if we create a payment
-                unrelatedCreatedBalanceItems.push(balanceItem2);
             }
             else {
                 balanceItem.memberId = registration.memberId;
@@ -499,9 +469,6 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             balanceItem.status = BalanceItemStatus.Hidden;
             balanceItem.pricePaid = 0;
 
-            // Connect the 'pay back' balance item to this balance item. As soon as this balance item is paid, we'll mark the other one as pending so the outstanding balance for the member increases
-            balanceItem.dependingBalanceItemId = balanceItem2?.id ?? null;
-
             if (registration.trialUntil) {
                 balanceItem.dueAt = registration.trialUntil;
             }

package/src/helpers/AdminPermissionChecker.ts

@@ -344,6 +344,11 @@ export class AdminPermissionChecker {
      * Note: only checks admin permissions. Users that 'own' this member can also access it but that does not use the AdminPermissionChecker
      */
     async canAccessRegistration(registration: Registration, permissionLevel: PermissionLevel = PermissionLevel.Read) {
+        if (registration.deactivatedAt || !registration.registeredAt) {
+            // No full access: cannot access deactivated registrations
+            return false;
+        }
+
         const organizationPermissions = await this.getOrganizationPermissions(registration.organizationId);
 
         if (!organizationPermissions) {
@@ -355,11 +360,6 @@ export class AdminPermissionChecker {
             return true;
         }
 
-        if (registration.deactivatedAt || !registration.registeredAt) {
-            // No full access: cannot access deactivated registrations
-            return false;
-        }
-
         const allGroups = await this.getOrganizationGroups(registration.organizationId);
         const group = allGroups.find(g => g.id === registration.groupId);
         if (!group || group.deletedAt) {

package/src/helpers/AuthenticatedStructures.ts

@@ -391,7 +391,7 @@ export class AuthenticatedStructures {
         const organizations = new Map<string, Organization>();
 
         const registrationIds = Formatter.uniqueArray(members.flatMap(m => m.registrations.map(r => r.id)));
-        const balances = await CachedBalance.getForObjects(registrationIds, Context.organization?.id ?? null);
+        const balances = await CachedBalance.getForObjects(registrationIds, null);
 
         if (includeUser) {
             for (const organizationId of includeUser.permissions?.organizationPermissions.keys() ?? []) {