@stamhoofd/backend 2.40.1 → 2.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.40.1",
+    "version": "2.42.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -9,7 +9,7 @@
     },
     "license": "UNLICENCED",
     "scripts": {
-        "dev": "echo 'Waiting for shared backend packages...' && wait-on ../../shared/env/dist/index.js && echo 'Start building backend API' && concurrently -r 'yarn build --watch --preserveWatchOutput' \"wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --watch .env.json --delay 1000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM\"",
+        "dev": "echo 'Waiting for shared backend packages...' && wait-on ../../shared/middleware/dist/index.js && echo 'Start building backend API' && concurrently -r 'yarn build --watch --preserveWatchOutput' \"wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --watch .env.json --delay 1000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM\"",
         "dev:backend": "yarn dev",
         "build": "rm -rf ./dist/src/migrations && rm -rf ./dist/src/seeds && tsc -b",
         "build:full": "yarn clear && yarn build",
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.40.1",
-        "@stamhoofd/backend-middleware": "2.40.1",
-        "@stamhoofd/email": "2.40.1",
-        "@stamhoofd/models": "2.40.1",
-        "@stamhoofd/queues": "2.40.1",
-        "@stamhoofd/sql": "2.40.1",
-        "@stamhoofd/structures": "2.40.1",
-        "@stamhoofd/utility": "2.40.1",
+        "@stamhoofd/backend-i18n": "2.42.0",
+        "@stamhoofd/backend-middleware": "2.42.0",
+        "@stamhoofd/email": "2.42.0",
+        "@stamhoofd/models": "2.42.0",
+        "@stamhoofd/queues": "2.42.0",
+        "@stamhoofd/sql": "2.42.0",
+        "@stamhoofd/structures": "2.42.0",
+        "@stamhoofd/utility": "2.42.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "31eb933097eb608655f755de9df912c21a420963"
+    "gitHead": "fa8a47af38cc79eecaf7934cd1b15d5b20fd3e2d"
 }

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

@@ -113,6 +113,10 @@ export class PatchPlatformEndpoint extends Endpoint<
                     if (d.defaultMembershipTypeId !== undefined) {
                         shouldUpdateMemberships = true;
                     }
+
+                    if (d.minimumRequiredMembers !== undefined) {
+                        shouldUpdateSetupSteps = true;
+                    }
                 }
             }
         }

package/src/endpoints/organization/dashboard/email/EmailEndpoint.ts

@@ -1,7 +1,6 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
 import { Email } from '@stamhoofd/email';
 import { getEmailBuilder, RateLimiter } from '@stamhoofd/models';
 import { EmailRequest, Recipient } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.ts

@@ -267,6 +267,11 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen');
         }
 
+        const previousProperties = {
+            deletedAt: model.deletedAt,
+            defaultAgeGroupId: model.defaultAgeGroupId,
+        };
+
         if (struct.settings) {
             struct.settings.period = undefined; // Not allowed to patch manually
             model.settings.patchOrPut(struct.settings);
@@ -376,7 +381,9 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             }
         }
 
-        await model.updateOccupancy();
+        await model.updateOccupancy({
+            previousProperties,
+        });
         await model.save();
 
         if (struct.deletedAt !== undefined || struct.defaultAgeGroupId !== undefined) {

package/src/sql-filters/members.ts

@@ -122,6 +122,14 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
                     SQL.column('member_responsibility_records', 'groupId'),
                 ),
             )
+            .join(
+                SQL.leftJoin(
+                    SQL.table('organizations'),
+                ).where(
+                    SQL.column('organizations', 'id'),
+                    SQL.column('member_responsibility_records', 'organizationId'),
+                ),
+            )
             .where(
                 SQL.column('memberId'),
                 SQL.column('members', 'id'),
@@ -139,6 +147,7 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
                 id: createSQLColumnFilterCompiler(SQL.column('groups', 'id')),
                 defaultAgeGroupId: createSQLColumnFilterCompiler(SQL.column('groups', 'defaultAgeGroupId')),
             }),
+            organization: createSQLFilterNamespace(organizationFilterCompilers),
         },
     ),