@stamhoofd/backend 2.21.2 → 2.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.21.2",
+    "version": "2.22.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.0",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.21.2",
-        "@stamhoofd/backend-middleware": "2.21.2",
-        "@stamhoofd/email": "2.21.2",
-        "@stamhoofd/models": "2.21.2",
-        "@stamhoofd/queues": "2.21.2",
-        "@stamhoofd/sql": "2.21.2",
-        "@stamhoofd/structures": "2.21.2",
-        "@stamhoofd/utility": "2.21.2",
+        "@stamhoofd/backend-i18n": "2.22.0",
+        "@stamhoofd/backend-middleware": "2.22.0",
+        "@stamhoofd/email": "2.22.0",
+        "@stamhoofd/models": "2.22.0",
+        "@stamhoofd/queues": "2.22.0",
+        "@stamhoofd/sql": "2.22.0",
+        "@stamhoofd/structures": "2.22.0",
+        "@stamhoofd/utility": "2.22.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "0a6775791c85979a66905925d0ccc332cff1e3d7"
+    "gitHead": "b3590dcb37d7f65be2663b11a6f025cf5f36a278"
 }

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -54,6 +54,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
         }
 
         const errors = new SimpleErrors()
+        let shouldUpdateSetupSteps = false;
 
         if (await Context.auth.hasFullAccess(organization.id)) {
             organization.name = request.body.name ?? organization.name
@@ -102,7 +103,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 organization.privateMeta.emails = request.body.privateMeta.emails.applyTo(organization.privateMeta.emails)
                 organization.privateMeta.premises = patchObject(organization.privateMeta.premises, request.body.privateMeta.premises);
                 if(request.body.privateMeta.premises) {
-                    await SetupStepUpdater.updateForOrganization(organization);
+                    shouldUpdateSetupSteps = true;
                 }
                 organization.privateMeta.roles = request.body.privateMeta.roles.applyTo(organization.privateMeta.roles)
                 organization.privateMeta.responsibilities = request.body.privateMeta.responsibilities.applyTo(organization.privateMeta.responsibilities)
@@ -215,6 +216,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             if (request.body.meta) {
                 if (request.body.meta.companies) {
                    await this.validateCompanies(organization, request.body.meta.companies)
+                   shouldUpdateSetupSteps = true
                 }
 
                 const savedPackages = organization.meta.packages
@@ -373,6 +375,11 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
         }    
 
         errors.throwIfNotEmpty()
+
+        if(shouldUpdateSetupSteps) {
+            await SetupStepUpdater.updateForOrganization(organization);
+        }
+        
         return new Response(await AuthenticatedStructures.organization(organization));
     }
 

package/src/helpers/SetupStepsUpdater.ts

@@ -21,7 +21,7 @@ export class SetupStepUpdater {
         SetupStepType,
         SetupStepOperation
     > = {
-        [SetupStepType.Functions]: this.updateStepFunctions,
+        [SetupStepType.Responsibilities]: this.updateStepResponsibilities,
         [SetupStepType.Companies]: this.updateStepCompanies,
         [SetupStepType.Groups]: this.updateStepGroups,
         [SetupStepType.Premises]: this.updateStepPremises,
@@ -218,13 +218,20 @@ export class SetupStepUpdater {
         _organization: Organization,
         _platform: PlatformStruct
     ) {
+        const totalSteps = 1;
+        let finishedSteps = 0;
+
+        if(_organization.meta.companies.length) {
+            finishedSteps = 1;
+        }
+
         setupSteps.update(SetupStepType.Companies, {
-            totalSteps: 0,
-            finishedSteps: 0,
+            totalSteps,
+            finishedSteps,
         });
     }
 
-    private static async updateStepFunctions(
+    private static async updateStepResponsibilities(
         setupSteps: SetupSteps,
         organization: Organization,
         platform: PlatformStruct
@@ -304,7 +311,7 @@ export class SetupStepUpdater {
             finishedSteps++;
         }
 
-        setupSteps.update(SetupStepType.Functions, {
+        setupSteps.update(SetupStepType.Responsibilities, {
             totalSteps,
             finishedSteps,
         });