@stamhoofd/backend 2.32.4 → 2.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.32.4",
+    "version": "2.34.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -28,7 +28,7 @@
         "@types/node": "^18.11.17",
         "nock": "^13.5.1",
         "qs": "^6.11.2",
-        "sinon": "^17.0.1"
+        "sinon": "^18.0.0"
     },
     "dependencies": {
         "@mollie/api-client": "3.7.0",
@@ -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.32.4",
-        "@stamhoofd/backend-middleware": "2.32.4",
-        "@stamhoofd/email": "2.32.4",
-        "@stamhoofd/models": "2.32.4",
-        "@stamhoofd/queues": "2.32.4",
-        "@stamhoofd/sql": "2.32.4",
-        "@stamhoofd/structures": "2.32.4",
-        "@stamhoofd/utility": "2.32.4",
+        "@stamhoofd/backend-i18n": "2.34.0",
+        "@stamhoofd/backend-middleware": "2.34.0",
+        "@stamhoofd/email": "2.34.0",
+        "@stamhoofd/models": "2.34.0",
+        "@stamhoofd/queues": "2.34.0",
+        "@stamhoofd/sql": "2.34.0",
+        "@stamhoofd/structures": "2.34.0",
+        "@stamhoofd/utility": "2.34.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": "b3fb87740644d823bff02163b856477c3e7c45db"
+    "gitHead": "2ce5548bf6f6c61c6d321fe4073cc93686a166f0"
 }

package/src/endpoints/global/events/PatchEventsEndpoint.ts

@@ -63,7 +63,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                     human: 'Je kan geen activiteiten voor een specifieke organisatie aanmaken als je geen platform hoofdbeheerder bent',
                 })
             }
-
+            
             const eventOrganization = put.organizationId ? (await Organization.getByID(put.organizationId)) : null
             if (!eventOrganization && put.organizationId) {
                 throw new SimpleError({
@@ -79,8 +79,9 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             event.name = put.name
             event.startDate = put.startDate
             event.endDate = put.endDate
-            event.meta = put.meta
-            event.typeId = await PatchEventsEndpoint.validateEventType(put.typeId)
+            event.meta = put.meta;
+            const type = await PatchEventsEndpoint.getEventType(put.typeId);
+            event.typeId = type.id;
             event.meta.organizationCache = eventOrganization ? NamedObject.create({id: eventOrganization.id, name: eventOrganization.name}) : null
             await PatchEventsEndpoint.checkEventLimits(event)
 
@@ -110,6 +111,10 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 event.groupId = group.id
             }
 
+            if(type.isLocationRequired === true) {
+                PatchEventsEndpoint.throwIfAddressIsMissing(event);
+            }
+
             await event.save()
 
             events.push(event)
@@ -178,7 +183,12 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 }
             }
 
-            event.typeId = patch.typeId ? (await PatchEventsEndpoint.validateEventType(patch.typeId)) : event.typeId
+            const type = await PatchEventsEndpoint.getEventType(patch.typeId ?? event.typeId);
+
+            if(patch.typeId) {
+                event.typeId = type.id;
+            }
+
             await PatchEventsEndpoint.checkEventLimits(event)
 
             if (patch.group !== undefined) {
@@ -230,6 +240,10 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 }
             }
 
+            if(type.isLocationRequired === true) {
+                PatchEventsEndpoint.throwIfAddressIsMissing(event);
+            }
+
             await event.save()
 
             if (event.groupId) {
@@ -345,4 +359,19 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             }
         }
     }
+
+    private static throwIfAddressIsMissing(event: Event) {
+        const address = event.meta.location?.address;
+
+        if(!address) {
+            throw new SimpleError({
+                code: "invalid_field",
+                message: "Empty number",
+                human: "De locatie is verplicht voor deze soort activiteit.",
+                field: "event_required"
+            })
+        }
+
+        address.throwIfIncomplete();
+    }
 }