@stamhoofd/backend 2.32.3 → 2.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.32.3",
+    "version": "2.33.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -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.3",
-        "@stamhoofd/backend-middleware": "2.32.3",
-        "@stamhoofd/email": "2.32.3",
-        "@stamhoofd/models": "2.32.3",
-        "@stamhoofd/queues": "2.32.3",
-        "@stamhoofd/sql": "2.32.3",
-        "@stamhoofd/structures": "2.32.3",
-        "@stamhoofd/utility": "2.32.3",
+        "@stamhoofd/backend-i18n": "2.33.0",
+        "@stamhoofd/backend-middleware": "2.33.0",
+        "@stamhoofd/email": "2.33.0",
+        "@stamhoofd/models": "2.33.0",
+        "@stamhoofd/queues": "2.33.0",
+        "@stamhoofd/sql": "2.33.0",
+        "@stamhoofd/structures": "2.33.0",
+        "@stamhoofd/utility": "2.33.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": "698e4a84d10af7aed4c8e0ee58cad155b420480b"
+    "gitHead": "d274ebed63137db804e33e858100c452309855da"
 }

package/src/endpoints/auth/VerifyEmailEndpoint.ts

@@ -76,7 +76,7 @@ export class VerifyEmailEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: "email_in_use",
                     message: "This e-mail is already in use, we cannot set it",
-                    human: "We kunnen het e-mailadres van deze gebruiker niet instellen naar "+code.email+", omdat die al in gebruik is. Waarschijnlijk heb je meerdere accounts. Probeer met dat e-mailadres in te loggen of contacteer ons ("+request.$t("shared.emails.general")+") als we de gebruikers moeten combineren tot één gebruiker."
+                    human: "We kunnen het e-mailadres van deze gebruiker niet instellen naar "+code.email+", omdat die al in gebruik is. Waarschijnlijk heb je meerdere accounts. Probeer met dat e-mailadres in te loggen of contacteer ons ("+request.$t("59b85264-c4c3-4cf6-8923-9b43282b2787")+") als we de gebruikers moeten combineren tot één gebruiker."
                 })
             }
             throw e;

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();
+    }
 }

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

@@ -499,23 +499,21 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 throw Context.auth.error("Je hebt niet voldoende rechten om dit lid te verwijderen")
             }
 
-            throw Context.auth.error("Verwijderen van leden is tijdelijk uitgeschakeld.")
-
-            //await MemberUserSyncer.onDeleteMember(member)
-            //await User.deleteForDeletedMember(member.id)
-            //await BalanceItem.deleteForDeletedMember(member.id)
-            //await member.delete()
-            //shouldUpdateSetupSteps = true
-//
-            //// Update occupancy of this member because we removed registrations
-            //const groupIds = member.registrations.flatMap(r => r.groupId)
-            //for (const id of groupIds) {
-            //    const group = await getGroup(id)
-            //    if (group) {
-            //        // We need to update this group occupancy because we moved one member away from it
-            //        updateGroups.set(group.id, group)
-            //    }
-            //}
+            await MemberUserSyncer.onDeleteMember(member)
+            await User.deleteForDeletedMember(member.id)
+            await BalanceItem.deleteForDeletedMember(member.id)
+            await member.delete()
+            shouldUpdateSetupSteps = true
+
+            // Update occupancy of this member because we removed registrations
+            const groupIds = member.registrations.flatMap(r => r.groupId)
+            for (const id of groupIds) {
+                const group = await getGroup(id)
+                if (group) {
+                    // We need to update this group occupancy because we moved one member away from it
+                    updateGroups.set(group.id, group)
+                }
+            }
         }
 
         await Member.updateOutstandingBalance(Formatter.uniqueArray(balanceItemMemberIds))

package/src/endpoints/global/payments/StripeWebhookEndpoint.ts

@@ -6,7 +6,6 @@ import { Organization, StripeAccount, StripeCheckoutSession, StripePaymentIntent
 
 import { StripeHelper } from '../../../helpers/StripeHelper';
 import { ExchangePaymentEndpoint } from '../../organization/shared/ExchangePaymentEndpoint';
-import { QueueHandler } from '@stamhoofd/queues';
 
 type Params = Record<string, never>;
 class Body extends AutoEncoder {

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

@@ -2,13 +2,13 @@ import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArra
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Document, Member, mergeTwoMembers, RateLimiter } from '@stamhoofd/models';
-import { MemberWithRegistrationsBlob, MembersBlob } from "@stamhoofd/structures";
+import { MemberDetails, MembersBlob, MemberWithRegistrationsBlob } from "@stamhoofd/structures";
 
+import { Email } from '@stamhoofd/email';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../helpers/Context';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
 import { PatchOrganizationMembersEndpoint } from '../../global/members/PatchOrganizationMembersEndpoint';
-import { Email } from '@stamhoofd/email';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = PatchableArrayAutoEncoder<MemberWithRegistrationsBlob>
@@ -60,6 +60,8 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
             struct.details.cleanData()
             member.details = struct.details
 
+            this.throwIfInvalidDetails(member.details);
+
             const duplicate = await this.checkDuplicate(member, struct.details.securityCode)
             if (duplicate) {
                 addedMembers.push(duplicate)
@@ -95,8 +97,10 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
                         field: "details"
                     })
                 }
+
                 member.details.patchOrPut(struct.details)
-                member.details.cleanData()
+                member.details.cleanData();
+                this.throwIfInvalidDetails(member.details);
             }
 
             if (!member.details) {
@@ -184,7 +188,7 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
                             code: "invalid_field",
                             field: 'details.securityCode',
                             message: "Invalid security code",
-                            human: Context.i18n.$t(`Deze beveiligingscode is ongeldig. Probeer het opnieuw of neem contact op met jouw vereniging om de juiste code te ontvangen.`),
+                            human: Context.i18n.$t('49753d6a-7ca4-4145-8024-0be05a9ab063'),
                             statusCode: 400
                         })
                     }
@@ -206,4 +210,22 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
             return duplicate
         }
     }
+
+    private throwIfInvalidDetails(details: MemberDetails) {
+        if(details.firstName.length < 2) {
+            throw new SimpleError({
+                code: "invalid_field",
+                message: "Voornaam is te kort",
+                field: "firstName"
+            });
+        }
+
+        if(details.lastName.length < 2) {
+            throw new SimpleError({
+                code: "invalid_field",
+                message: "Achternaam is te kort",
+                field: "lastName"
+            });
+        }
+    }
 }