@stamhoofd/backend 2.95.2 → 2.96.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.95.2",
+    "version": "2.96.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -45,14 +45,14 @@
         "@simonbackx/simple-encoding": "2.22.0",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.95.2",
-        "@stamhoofd/backend-middleware": "2.95.2",
-        "@stamhoofd/email": "2.95.2",
-        "@stamhoofd/models": "2.95.2",
-        "@stamhoofd/queues": "2.95.2",
-        "@stamhoofd/sql": "2.95.2",
-        "@stamhoofd/structures": "2.95.2",
-        "@stamhoofd/utility": "2.95.2",
+        "@stamhoofd/backend-i18n": "2.96.0",
+        "@stamhoofd/backend-middleware": "2.96.0",
+        "@stamhoofd/email": "2.96.0",
+        "@stamhoofd/models": "2.96.0",
+        "@stamhoofd/queues": "2.96.0",
+        "@stamhoofd/sql": "2.96.0",
+        "@stamhoofd/structures": "2.96.0",
+        "@stamhoofd/utility": "2.96.0",
         "archiver": "^7.0.1",
         "axios": "^1.8.2",
         "cookie": "^0.7.0",
@@ -70,5 +70,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "395db4d4c0866e0908e80f4c8cf8980f0862ef53"
+    "gitHead": "370bebc6a70f9771fe22c33a9d2bc49a6ca83fe4"
 }

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

@@ -123,7 +123,8 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
             .setMaxExecutionTime(15 * 1000)
             .from(
                 SQL.table('registrations'),
-            );
+            )
+            .where('registeredAt', '!=', null);
 
         if (scopeFilter) {
             query.where(await compileToSQLFilter(scopeFilter, filterCompilers));

package/src/endpoints/organization/dashboard/users/GetOrganizationAdminsEndpoint.ts

@@ -27,7 +27,7 @@ export class GetOrganizationAdminsEndpoint extends Endpoint<Params, Query, Body,
         await Context.authenticate();
 
         // Fast throw first (more in depth checking for patches later)
-        if (!await Context.auth.canManageAdmins(organization.id)) {
+        if (!await Context.auth.hasFullAccess(organization.id)) {
             throw Context.auth.error();
         }
 

package/src/excel-loaders/members.ts

@@ -9,6 +9,14 @@ import { Context } from '../helpers/Context';
 import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 
 export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
+    {
+        id: 'id',
+        name: $t(`29360811-3663-496c-8d8f-c9fdf9467a74`),
+        width: 40,
+        getValue: ({ patchedMember: object }: PlatformMember) => ({
+            value: object.id,
+        }),
+    },
     {
         id: 'memberNumber',
         name: $t(`cc1cf4a7-0bd2-4fa7-8ff2-0a12470a738d`),
@@ -134,60 +142,6 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
             value: object.details.notes,
         }),
     },
-    {
-        id: 'organization',
-        name: $t(`afd7843d-f355-445b-a158-ddacf469a5b1`),
-        width: 40,
-        getValue: (member: PlatformMember) => {
-            const organizations = member.filterOrganizations({ currentPeriod: true, types: [GroupType.Membership] });
-            const str = Formatter.joinLast(organizations.map(o => o.name).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
-
-            return {
-                value: str,
-            };
-        },
-    },
-    {
-        id: 'uri',
-        name: $t(`27cfaf26-6b88-4ebc-a50a-627a9f0f9e64`),
-        width: 30,
-        getValue: (member: PlatformMember) => {
-            const organizations = member.filterOrganizations({ currentPeriod: true, types: [GroupType.Membership] });
-            const str = Formatter.joinLast(organizations.map(o => o.uri).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
-
-            return {
-                value: str,
-            };
-        },
-    },
-    {
-        id: 'group',
-        name: $t(`0c230001-c3be-4a8e-8eab-23dc3fd96e52`),
-        width: 40,
-        getValue: (member: PlatformMember) => {
-            const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
-            const str = Formatter.joinLast(Formatter.uniqueArray(groups.map(o => o.group.settings.name.toString())).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
-
-            return {
-                value: str,
-            };
-        },
-    },
-    {
-        id: 'defaultAgeGroup',
-        name: $t(`0ef2bbb3-0b3c-411a-8901-a454cff1f839`),
-        width: 40,
-        getValue: (member: PlatformMember) => {
-            const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
-            const defaultAgeGroupIds = Formatter.uniqueArray(groups.filter(o => o.group.defaultAgeGroupId));
-            const defaultAgeGroups = defaultAgeGroupIds.map(o => PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`6aeee253-beb2-4548-b60e-30836afcf2f0`));
-            const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
-
-            return {
-                value: str,
-            };
-        },
-    },
     {
         id: 'nationalRegisterNumber',
         name: $t(`00881b27-7501-4c56-98de-55618be2bf11`),
@@ -251,16 +205,61 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
     id: 'members',
     name: $t(`fb35c140-e936-4e91-aa92-ef4dfc59fb51`),
     columns: [
+        ...baseMemberColumns,
         {
-            id: 'id',
-            name: $t(`29360811-3663-496c-8d8f-c9fdf9467a74`),
+            id: 'organization',
+            name: $t(`afd7843d-f355-445b-a158-ddacf469a5b1`),
             width: 40,
-            getValue: ({ patchedMember: object }: PlatformMember) => ({
-                value: object.id,
-            }),
+            getValue: (member: PlatformMember) => {
+                const organizations = member.filterOrganizations({ currentPeriod: true, types: [GroupType.Membership] });
+                const str = Formatter.joinLast(organizations.map(o => o.name).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
+
+                return {
+                    value: str,
+                };
+            },
+        },
+        {
+            id: 'uri',
+            name: $t(`27cfaf26-6b88-4ebc-a50a-627a9f0f9e64`),
+            width: 30,
+            getValue: (member: PlatformMember) => {
+                const organizations = member.filterOrganizations({ currentPeriod: true, types: [GroupType.Membership] });
+                const str = Formatter.joinLast(organizations.map(o => o.uri).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
+
+                return {
+                    value: str,
+                };
+            },
         },
+        {
+            id: 'group',
+            name: $t(`0c230001-c3be-4a8e-8eab-23dc3fd96e52`),
+            width: 40,
+            getValue: (member: PlatformMember) => {
+                const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
+                const str = Formatter.joinLast(Formatter.uniqueArray(groups.map(o => o.group.settings.name.toString())).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
 
-        ...baseMemberColumns,
+                return {
+                    value: str,
+                };
+            },
+        },
+        {
+            id: 'defaultAgeGroup',
+            name: $t(`0ef2bbb3-0b3c-411a-8901-a454cff1f839`),
+            width: 40,
+            getValue: (member: PlatformMember) => {
+                const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
+                const defaultAgeGroupIds = Formatter.uniqueArray(groups.filter(o => o.group.defaultAgeGroupId));
+                const defaultAgeGroups = defaultAgeGroupIds.map(o => PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`6aeee253-beb2-4548-b60e-30836afcf2f0`));
+                const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' ' + $t(`c1843768-2bf4-42f2-baa4-42f49028463d`) + ' ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f');
+
+                return {
+                    value: str,
+                };
+            },
+        },
 
         // Registration records
         {

package/src/excel-loaders/registrations.ts

@@ -1,6 +1,6 @@
 import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import { ExcelExportType, LimitedFilteredRequest, PlatformMember, PlatformRegistration, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
+import { ExcelExportType, LimitedFilteredRequest, PlatformMember, PlatformRegistration, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint';
 import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
@@ -132,6 +132,52 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
             key: 'member',
             getPropertyValue: (registration: PlatformRegistration) => registration.member,
         })),
+        {
+            id: 'organization',
+            name: $t(`afd7843d-f355-445b-a158-ddacf469a5b1`),
+            width: 40,
+            getValue: (registration: PlatformRegistration) => {
+                return {
+                    value: registration.member.organizations.find(o => o.id === registration.organizationId)?.name ?? '',
+                };
+            },
+        },
+        {
+            id: 'uri',
+            name: $t(`27cfaf26-6b88-4ebc-a50a-627a9f0f9e64`),
+            width: 30,
+            getValue: (registration: PlatformRegistration) => {
+                return {
+                    value: registration.member.organizations.find(o => o.id === registration.organizationId)?.uri ?? '',
+                };
+            },
+        },
+        {
+            id: 'group',
+            name: $t(`0c230001-c3be-4a8e-8eab-23dc3fd96e52`),
+            width: 40,
+            getValue: (registration: PlatformRegistration) => {
+                return {
+                    value: registration.group.settings.name.toString(),
+                };
+            },
+        },
+        {
+            id: 'defaultAgeGroup',
+            name: $t(`0ef2bbb3-0b3c-411a-8901-a454cff1f839`),
+            width: 40,
+            getValue: (registration: PlatformRegistration) => {
+                const defaultAgeGroupId = registration.group.defaultAgeGroupId;
+                if (!defaultAgeGroupId) {
+                    return {
+                        value: '',
+                    };
+                }
+                return {
+                    value: PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === defaultAgeGroupId)?.name ?? $t(`6aeee253-beb2-4548-b60e-30836afcf2f0`),
+                };
+            },
+        },
     ],
 };
 

package/src/sql-filters/events.ts

@@ -54,12 +54,12 @@ export const eventFilterCompilers: SQLFilterDefinitions = {
     }),
     'minAge': createColumnFilter({
         expression: SQL.jsonValue(SQL.column('meta'), '$.value.minAge'),
-        type: SQLValueType.Number,
+        type: SQLValueType.JSONNumber,
         nullable: true,
     }),
     'maxAge': createColumnFilter({
         expression: SQL.jsonValue(SQL.column('meta'), '$.value.maxAge'),
-        type: SQLValueType.Number,
+        type: SQLValueType.JSONNumber,
         nullable: true,
     }),
     'meta.visible': createColumnFilter({

package/src/sql-filters/registrations.ts

@@ -1,10 +1,12 @@
-import { Member, Registration } from '@stamhoofd/models';
-import { baseSQLFilterCompilers, createJoinedRelationFilter, SQL, SQLFilterDefinitions } from '@stamhoofd/sql';
+import { Group, Member, Registration } from '@stamhoofd/models';
+import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
 import { baseRegistrationFilterCompilers } from './base-registration-filter-compilers';
 import { memberFilterCompilers } from './members';
 
 export const memberJoin = SQL.join(Member.table).where(SQL.column(Member.table, 'id'), SQL.column(Registration.table, 'memberId'));
 
+const groupJoin = SQL.join(Group.table).where(SQL.column(Group.table, 'id'), SQL.column(Registration.table, 'groupId'));
+
 export const registrationFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
     ...baseRegistrationFilterCompilers,
@@ -12,4 +14,40 @@ export const registrationFilterCompilers: SQLFilterDefinitions = {
         memberJoin,
         memberFilterCompilers,
     ),
+    group: createJoinedRelationFilter(
+        groupJoin,
+        {
+            ...baseSQLFilterCompilers,
+            id: createColumnFilter({
+                expression: SQL.column('groupId'),
+                type: SQLValueType.String,
+                nullable: false,
+            }),
+            type: createColumnFilter({
+                expression: SQL.column('groups', 'type'),
+                type: SQLValueType.String,
+                nullable: false,
+            }),
+            name: createColumnFilter({
+                expression: SQL.jsonValue(SQL.column('groups', 'settings'), '$.value.name'),
+                type: SQLValueType.JSONString,
+                nullable: false,
+            }),
+            status: createColumnFilter({
+                expression: SQL.column('groups', 'status'),
+                type: SQLValueType.String,
+                nullable: false,
+            }),
+            defaultAgeGroupId: createColumnFilter({
+                expression: SQL.column('groups', 'defaultAgeGroupId'),
+                type: SQLValueType.String,
+                nullable: true,
+            }),
+            deletedAt: createColumnFilter({
+                expression: SQL.column('groups', 'deletedAt'),
+                type: SQLValueType.Datetime,
+                nullable: true,
+            }),
+        },
+    ),
 };