@stamhoofd/backend 2.6.0 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.6.0",
+    "version": "2.7.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -50,5 +50,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "7a3f9f6c08058dc8b671befbfad73184afdc6d7c"
+    "gitHead": "319a4de9fac39a31110cddbfa9a580d1b9c8f730"
 }

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

@@ -23,7 +23,7 @@ const filterCompilers: SQLFilterDefinitions = {
     startDate: createSQLColumnFilterCompiler('startDate'),
     endDate: createSQLColumnFilterCompiler('endDate'),
     groupIds: createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.groupIds'),
+        SQL.jsonValue(SQL.column('meta'), '$.value.groups[*].id'),
         undefined,
         true,
         true
@@ -35,7 +35,10 @@ const filterCompilers: SQLFilterDefinitions = {
         true
     ),
     organizationTagIds: createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.organizationTagIds')
+        SQL.jsonValue(SQL.column('meta'), '$.value.organizationTagIds'),
+        undefined,
+        true,
+        true
     )
 }
 

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

@@ -3,8 +3,8 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email, Member, MemberWithRegistrations, Platform } from '@stamhoofd/models';
-import { SQL, SQLAge, SQLConcat, SQLFilterDefinitions, SQLJSONValue, SQLOrderBy, SQLOrderByDirection, SQLScalar, SQLSortDefinitions, baseSQLFilterCompilers, compileToSQLFilter, compileToSQLSorter, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, createSQLFilterNamespace, createSQLRelationFilterCompiler, joinSQLQuery } from "@stamhoofd/sql";
-import { CountFilteredRequest, EmailRecipientFilterType, GroupStatus, LimitedFilteredRequest, MembersBlob, PaginatedResponse, PermissionLevel, StamhoofdFilter, getSortFilter, mergeFilters } from '@stamhoofd/structures';
+import { SQL, SQLAge, SQLConcat, SQLFilterDefinitions, SQLOrderBy, SQLOrderByDirection, SQLScalar, SQLSortDefinitions, baseSQLFilterCompilers, compileToSQLFilter, compileToSQLSorter, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, createSQLFilterNamespace, createSQLRelationFilterCompiler, joinSQLQuery } from "@stamhoofd/sql";
+import { CountFilteredRequest, EmailRecipientFilterType, LimitedFilteredRequest, MembersBlob, PaginatedResponse, PermissionLevel, StamhoofdFilter, getSortFilter, mergeFilters } from '@stamhoofd/structures';
 import { DataValidator, Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
@@ -36,6 +36,7 @@ Email.recipientLoaders.set(EmailRecipientFilterType.Members, {
         return await q.count();
     }
 });
+
 Email.recipientLoaders.set(EmailRecipientFilterType.MemberParents, {
     fetch: async (query: LimitedFilteredRequest) => {
         const result = await GetMembersEndpoint.buildData(query)
@@ -54,6 +55,24 @@ Email.recipientLoaders.set(EmailRecipientFilterType.MemberParents, {
     }
 });
 
+Email.recipientLoaders.set(EmailRecipientFilterType.MemberUnverified, {
+    fetch: async (query: LimitedFilteredRequest) => {
+        const result = await GetMembersEndpoint.buildData(query)
+
+        return new PaginatedResponse({
+            results: result.results.members.flatMap(m => m.getEmailRecipients(['unverified'])),
+            next: result.next
+        });
+    },
+
+    count: async (query: LimitedFilteredRequest) => {
+        const q = await GetMembersEndpoint.buildQuery(query)
+        return await q.sum(
+            SQL.jsonLength(SQL.column('details'), '$.value.unverifiedEmails')
+        );
+    }
+});
+
 const registrationFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
     "price": createSQLColumnFilterCompiler('price'),
@@ -378,9 +397,6 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                                 }
                             },
                             periodId: platform.periodId,
-                            registeredAt: {
-                                $neq: null
-                            },
                             group: {
                                 defaultAgeGroupId: {
                                     $neq: null
@@ -397,16 +413,26 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             const groups = await Context.auth.getAccessibleGroups(organization.id)
 
             if (groups === 'all') {
-                scopeFilter = {
-                    registrations: {
-                        $elemMatch: {
-                            organizationId: organization.id,
-                            registeredAt: {
-                                $neq: null
+                if (await Context.auth.hasFullAccess(organization.id)) {
+                    // Can access full history for now
+                    scopeFilter = {
+                        registrations: {
+                            $elemMatch: {
+                                organizationId: organization.id,
                             }
                         }
-                    }
-                };
+                    };
+                } else {
+                    // Can only access current period
+                    scopeFilter = {
+                        registrations: {
+                            $elemMatch: {
+                                organizationId: organization.id,
+                                periodId: organization.periodId,
+                            }
+                        }
+                    };
+                }
             } else {
                 scopeFilter = {
                     registrations: {
@@ -415,9 +441,6 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                             periodId: organization.periodId,
                             groupId: {
                                 $in: groups
-                            },
-                            registeredAt: {
-                                $neq: null
                             }
                         }
                     }

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

@@ -13,7 +13,6 @@ import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructure
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
 import { Context } from '../../../helpers/Context';
 import { StripeHelper } from '../../../helpers/StripeHelper';
-import { ExchangePaymentEndpoint } from '../../organization/shared/ExchangePaymentEndpoint';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = IDRegisterCheckout
@@ -424,7 +423,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             balanceItem.status = shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden
             await balanceItem.save();
 
-            items.push(balanceItem)
+            items.push(balanceItem);
         }
 
         if (checkout.cart.balanceItems.length && whoWillPayNow === 'nobody') {
@@ -471,9 +470,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             await BalanceItem.deleteForDeletedRegistration(existingRegistration.id)
             
             // Clear the registration
-            existingRegistration.deactivatedAt = new Date()
-            await existingRegistration.save()
-            existingRegistration.scheduleStockUpdate()
+            await existingRegistration.deactivate()
 
             const group = groups.find(g => g.id === existingRegistration.groupId)
             if (!group) {

package/src/helpers/AdminPermissionChecker.ts

@@ -916,6 +916,10 @@ export class AdminPermissionChecker {
         const isUserManager = this.isUserManager(member)
         if (isUserManager) {
             // For the user manager, we don't delete data, because when registering a new member, it doesn't have any organizations yet...
+
+            // Notes are not visible for the member.
+            data.details.notes = null;
+
             return data;
         }
 
@@ -955,48 +959,63 @@ export class AdminPermissionChecker {
             })
         }
 
-        if (data.details.recordAnswers) {
-            if (!(data.details.recordAnswers instanceof PatchMap)) {
-                throw new SimpleError({
-                    code: 'invalid_request',
-                    message: 'Cannot PUT recordAnswers',
-                    statusCode: 400
-                })
-            }
-            const isUserManager = this.isUserManager(member)
-            const records = isUserManager ? new Set() : await this.getAccessibleRecordSet(member, PermissionLevel.Write)
+        const hasRecordAnswers = !!data.details.recordAnswers;
+        const hasNotes = data.details.notes !== undefined;
 
-            for (const [key, value] of data.details.recordAnswers.entries()) {
-                let name: string | undefined = undefined
-                if (value) {
-                    if (value.isPatch()) {
-                        throw new SimpleError({
-                            code: 'invalid_request',
-                            message: 'Cannot PATCH a record answer object',
-                            statusCode: 400
-                        })
-                    }
+        if(hasRecordAnswers || hasNotes) {
+            const isUserManager = this.isUserManager(member);
 
-                    const id = value.settings.id
+            if (hasRecordAnswers) {
+                if (!(data.details.recordAnswers instanceof PatchMap)) {
+                    throw new SimpleError({
+                        code: 'invalid_request',
+                        message: 'Cannot PUT recordAnswers',
+                        statusCode: 400
+                    })
+                }
+                
+                const records = isUserManager ? new Set() : await this.getAccessibleRecordSet(member, PermissionLevel.Write)
+
+                for (const [key, value] of data.details.recordAnswers.entries()) {
+                    let name: string | undefined = undefined
+                    if (value) {
+                        if (value.isPatch()) {
+                            throw new SimpleError({
+                                code: 'invalid_request',
+                                message: 'Cannot PATCH a record answer object',
+                                statusCode: 400
+                            })
+                        }
+
+                        const id = value.settings.id
+
+                        if (id !== key) {
+                            throw new SimpleError({
+                                code: 'invalid_request',
+                                message: 'Record answer key does not match record id',
+                                statusCode: 400
+                            })
+                        }
+
+                        name = value.settings.name
+                    }
 
-                    if (id !== key) {
+                    if (!isUserManager && !records.has(key)) {
                         throw new SimpleError({
-                            code: 'invalid_request',
-                            message: 'Record answer key does not match record id',
+                            code: 'permission_denied',
+                            message: `Je hebt geen toegangsrechten om het antwoord op ${name ?? 'deze vraag'} aan te passen voor dit lid`,
                             statusCode: 400
                         })
                     }
-
-                    name = value.settings.name
                 }
+            }
 
-                if (!isUserManager && !records.has(key)) {
-                    throw new SimpleError({
-                        code: 'permission_denied',
-                        message: `Je hebt geen toegangsrechten om het antwoord op ${name ?? 'deze vraag'} aan te passen voor dit lid`,
-                        statusCode: 400
-                    })
-                }
+            if(hasNotes && isUserManager) {
+                throw new SimpleError({
+                    code: 'permission_denied',
+                    message: 'Cannot edit notes',
+                    statusCode: 400
+                })
             }
         }
 

package/src/helpers/MemberUserSyncer.ts

@@ -15,8 +15,8 @@ export class MemberUserSyncerStatic {
             userEmails.push(member.details.email)
         }
 
-        const uncategorizedEmails: string[] = member.details.uncategorizedEmails;
-        const parentAndUncategorizedEmails = member.details.parentsHaveAccess ? member.details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails).concat(uncategorizedEmails) : []
+        const unverifiedEmails: string[] = member.details.unverifiedEmails;
+        const parentAndUnverifiedEmails = member.details.parentsHaveAccess ? member.details.parents.flatMap(p => p.email ? [p.email, ...p.alternativeEmails] : p.alternativeEmails).concat(unverifiedEmails) : []
 
         // Make sure all these users have access to the member
         for (const email of userEmails) {
@@ -24,14 +24,14 @@ export class MemberUserSyncerStatic {
             await this.linkUser(email, member, false)
         }
 
-        for (const email of parentAndUncategorizedEmails) {
-            // Link parents and uncategorized emails
+        for (const email of parentAndUnverifiedEmails) {
+            // Link parents and unverified emails
             await this.linkUser(email, member, true)
         }
 
         // Remove access of users that are not in this list
         for (const user of member.users) {
-            if (!userEmails.includes(user.email) && !parentAndUncategorizedEmails.includes(user.email)) {
+            if (!userEmails.includes(user.email) && !parentAndUnverifiedEmails.includes(user.email)) {
                 await this.unlinkUser(user, member)
             }
         }