@stamhoofd/backend 2.121.0 → 2.122.0

package/src/endpoints/global/email/PatchEmailEndpoint.ts

@@ -1,10 +1,10 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, Platform } from '@stamhoofd/models';
-import type { EmailPreview} from '@stamhoofd/structures';
+import type { EmailPreview } from '@stamhoofd/structures';
 import { EmailRecipientsStatus, EmailStatus, Email as EmailStruct, PermissionLevel } from '@stamhoofd/structures';
 
-import type { AutoEncoderPatchType, Decoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
 import { patchObject } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';
@@ -77,8 +77,7 @@ export class PatchEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 if (!await Context.auth.canAccessEmail(model, PermissionLevel.Write)) {
                     throw Context.auth.error();
                 }
-            }
-            else {
+            } else {
                 throw new SimpleError({
                     code: 'invalid_sender',
                     message: 'Sender not found',
@@ -86,16 +85,14 @@ export class PatchEmailEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     statusCode: 400,
                 });
             }
-        }
-        else if (model.senderId) {
+        } else if (model.senderId) {
             // Update data, to avoid sending from an old address
             const list = organization ? organization.privateMeta.emails : (await Platform.getShared()).privateConfig.emails;
             const sender = list.find(e => e.id === model.senderId);
             if (sender) {
                 model.fromAddress = sender.email;
                 model.fromName = sender.name;
-            }
-            else {
+            } else {
                 throw new SimpleError({
                     code: 'invalid_sender',
                     message: 'Sender not found',

package/src/endpoints/global/email-recipients/GetEmailRecipientsCountEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.test.ts

@@ -1,7 +1,7 @@
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint.js';
 import { AccessRight, EmailStatus, LimitedFilteredRequest, OrganizationEmail, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
-import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User } from '@stamhoofd/models';
 import { Email, EmailRecipient, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { Request } from '@simonbackx/simple-endpoints';
 import { testServer } from '../../../../tests/helpers/TestServer.js';

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.ts

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import type { CountFilteredRequest, EmailRecipient as EmailRecipientStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PermissionLevel } from '@stamhoofd/structures';

package/src/endpoints/global/email-recipients/RetryEmailRecipientEndpoint.ts

@@ -1,7 +1,7 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, EmailRecipient } from '@stamhoofd/models';
-import type { EmailRecipient as EmailRecipientStruct} from '@stamhoofd/structures';
+import type { EmailRecipient as EmailRecipientStruct } from '@stamhoofd/structures';
 import { EmailStatus, PermissionLevel } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';

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

@@ -1,5 +1,5 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

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

@@ -1,11 +1,11 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EventNotification } from '@stamhoofd/models';
-import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import type { SQLSortDefinitions } from '@stamhoofd/sql';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, EventNotification as EventNotificationStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, EventNotification as EventNotificationStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { AccessRight, LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';

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

@@ -1,11 +1,11 @@
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Event } from '@stamhoofd/models';
-import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import type { SQLSortDefinitions } from '@stamhoofd/sql';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, Event as EventStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, Event as EventStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';

package/src/endpoints/global/events/PatchEventNotificationsEndpoint.test.ts

@@ -1,12 +1,14 @@
 import { PatchableArray, PatchMap, patchObject } from '@simonbackx/simple-encoding';
-import type { Endpoint} from '@simonbackx/simple-endpoints';
+import type { Endpoint } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
 import { EmailMocker } from '@stamhoofd/email';
-import type { User} from '@stamhoofd/models';
-import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
-import { AccessRight, BaseOrganization, EmailTemplateType, Event, EventNotificationStatus, EventNotification as EventNotificationStruct, Permissions, PermissionsResourceType, RecordType, ResourcePermissions } from '@stamhoofd/structures';
+import type { User } from '@stamhoofd/models';
+import { AuditLog, EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import { AccessRight, AuditLogReplacementType, AuditLogType, BaseOrganization, EmailTemplateType, Event, EventNotificationStatus, EventNotification as EventNotificationStruct, Permissions, PermissionsResourceType, RecordType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
+import '../../../audit-logs/init.js';
+import { AuditLogService } from '../../../services/AuditLogService.js';
 import { PatchEventNotificationsEndpoint } from './PatchEventNotificationsEndpoint.js';
 
 const baseUrl = `/event-notifications`;
@@ -47,6 +49,7 @@ describe('Endpoint.PatchEventNotificationsEndpoint', () => {
     });
 
     beforeAll(async () => {
+        AuditLogService.listen();
         TestUtils.setEnvironment('userMode', 'platform');
         await new EmailTemplateFactory({
             type: EmailTemplateType.EventNotificationAccepted,
@@ -135,6 +138,19 @@ describe('Endpoint.PatchEventNotificationsEndpoint', () => {
             createdBy: expect.objectContaining({ id: user.id }),
             submittedBy: null,
         });
+
+        const log = await AuditLog.select()
+            .where('type', AuditLogType.EventNotificationAdded)
+            .where('objectId', result.body[0].id)
+            .first(true);
+
+        expect(log.organizationId).toBe(organization.id);
+        expect(log.userId).toBe(user.id);
+        expect(log.replacements.get('n')).toMatchObject({
+            id: result.body[0].id,
+            value: notificationType.title,
+            type: AuditLogReplacementType.EventNotification,
+        });
     });
 
     test('It throws when trying to create an event notification for an invalid event notification type id', async () => {
@@ -295,6 +311,26 @@ describe('Endpoint.PatchEventNotificationsEndpoint', () => {
                 text: expect.stringContaining(event.name),
             }),
         ]);
+
+        const log = await AuditLog.select()
+            .where('type', AuditLogType.EventNotificationEdited)
+            .where('objectId', eventNotification.id)
+            .first(true);
+
+        expect(log.organizationId).toBe(organization.id);
+        expect(log.userId).toBe(user.id);
+        expect(log.replacements.get('n')?.type).toBe(AuditLogReplacementType.EventNotification);
+        const statusPatch = log.patchList.find(item => item.key.toKey() === 'status');
+        expect(statusPatch?.oldValue).toMatchObject({
+            id: 'EventNotificationStatus',
+            value: EventNotificationStatus.Draft,
+            type: AuditLogReplacementType.Enum,
+        });
+        expect(statusPatch?.value).toMatchObject({
+            id: 'EventNotificationStatus',
+            value: EventNotificationStatus.Pending,
+            type: AuditLogReplacementType.Enum,
+        });
     });
 
     test('A normal user can move the event notification to pending state from rejected', async () => {
@@ -947,6 +983,15 @@ describe('Endpoint.PatchEventNotificationsEndpoint', () => {
         // Check not exists
         const model = await EventNotification.getByID(eventNotification.id);
         expect(model).toBeUndefined();
+
+        const log = await AuditLog.select()
+            .where('type', AuditLogType.EventNotificationDeleted)
+            .where('objectId', eventNotification.id)
+            .first(true);
+
+        expect(log.organizationId).toBe(organization.id);
+        expect(log.userId).toBe(admin.id);
+        expect(log.replacements.get('n')?.type).toBe(AuditLogReplacementType.EventNotification);
     });
 
     test('An user cannot delete an event notification', async () => {

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

@@ -1,6 +1,6 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Event, EventNotification, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { EmailTemplateType, EventNotificationStatus, EventNotification as EventNotificationStruct, PermissionLevel, RecordCategory } from '@stamhoofd/structures';
@@ -39,8 +39,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
             if (!await Context.auth.hasSomeAccess(organization.id)) {
                 throw Context.auth.error();
             }
-        }
-        else {
+        } else {
             if (!Context.auth.hasSomePlatformAccess()) {
                 throw Context.auth.error();
             }
@@ -104,8 +103,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                     }
 
                     notification.periodId = period.id;
-                }
-                else {
+                } else {
                     await this.validateEventDate(notification, model);
                 }
             }
@@ -275,8 +273,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
 
         try {
             RecordCategory.validate(type.recordCategories, struct);
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 e.addNamespace('recordAnswers');
             }

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

@@ -1,9 +1,9 @@
 import { PatchableArray } from '@simonbackx/simple-encoding';
-import type { Endpoint} from '@simonbackx/simple-endpoints';
+import type { Endpoint } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, User} from '@stamhoofd/models';
+import type { Organization, User } from '@stamhoofd/models';
 import { EventFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, PlatformEventTypeFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
-import { AccessRight, Event, Group, GroupSettings, GroupType, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, TranslatedString } from '@stamhoofd/structures';
+import { AccessRight, Event, Group, GroupSettings, GroupType, OrganizationEventType, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, TranslatedString } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { PatchEventsEndpoint } from './PatchEventsEndpoint.js';
@@ -211,6 +211,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 name: 'test event',
                 startDate: new Date('2000-02-10'),
                 endDate: new Date('2000-02-12'),
+                typeId: OrganizationEventType.DEFAULT_ID,
             }).create();
 
             const body: Body = new PatchableArray();
@@ -218,6 +219,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 id: event.id,
                 group: Group.create({
                     settings: GroupSettings.create({
+                        name: TranslatedString.create('Naam'),
                         description: TranslatedString.create('Inschrijvingsgroep'),
                     }),
                 }),
@@ -266,6 +268,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 name: 'test event',
                 startDate: new Date('2000-02-10'),
                 endDate: new Date('2000-02-12'),
+                typeId: OrganizationEventType.DEFAULT_ID,
             }).create();
 
             const body: Body = new PatchableArray();
@@ -273,6 +276,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 id: event.id,
                 group: Group.create({
                     settings: GroupSettings.create({
+                        name: TranslatedString.create('Naam'),
                         description: TranslatedString.create('Inschrijvingsgroep'),
                     }),
                 }),
@@ -327,6 +331,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 name: 'test event',
                 startDate: new Date('2001-02-10'),
                 endDate: new Date('2001-02-12'),
+                typeId: OrganizationEventType.DEFAULT_ID,
             }).create();
 
             const body: Body = new PatchableArray();
@@ -334,6 +339,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 id: event.id,
                 group: Group.create({
                     settings: GroupSettings.create({
+                        name: TranslatedString.create('Naam'),
                         description: TranslatedString.create('Inschrijvingsgroep'),
                     }),
                 }),
@@ -387,6 +393,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                 name: 'test event',
                 startDate: new Date('2000-02-10'),
                 endDate: new Date('2000-02-12'),
+                typeId: OrganizationEventType.DEFAULT_ID,
             }).create();
 
             async function part1() {
@@ -395,6 +402,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
                     id: event.id,
                     group: Group.create({
                         settings: GroupSettings.create({
+                            name: TranslatedString.create('Naam'),
                             description: TranslatedString.create('Inschrijvingsgroep'),
                         }),
                     }),
@@ -432,46 +440,6 @@ describe('Endpoint.PatchEventsEndpoint', () => {
             await part2();
         });
 
-        test('A normal user with write access can create an event where the type has a maximum', async () => {
-            const organization = await new OrganizationFactory({}).create();
-
-            const user = await new UserFactory({
-                organization,
-                permissions: minimumUserPermissions,
-            }).create();
-
-            const startDate = new Date(Date.now() + 5 * 24 * 60 * 60 * 1000);
-            const endDate = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
-
-            // create registration period
-            await new RegistrationPeriodFactory({
-                startDate,
-                endDate,
-                organization,
-            }).create();
-
-            const body: Body = new PatchableArray();
-            const newEvent = Event.create({
-                organizationId: organization.id,
-                typeId: (await new PlatformEventTypeFactory({
-                    maximum: 5,
-                }).create()).id,
-                name: 'test event',
-                startDate,
-                endDate,
-            });
-            body.addPut(newEvent);
-
-            const result = await TestRequest.patch({ body, user, organization });
-            expect(result.status).toBe(200);
-            expect(result.body).toHaveLength(1);
-            expect(result.body[0]).toMatchObject({
-                organizationId: newEvent.organizationId,
-                typeId: newEvent.typeId,
-                name: newEvent.name,
-            });
-        });
-
         test('A normal user with write access cannot create a global event', async () => {
             const organization = await new OrganizationFactory({}).create();
             const user = await new UserFactory({
@@ -482,7 +450,7 @@ describe('Endpoint.PatchEventsEndpoint', () => {
             const body: Body = new PatchableArray();
             const newEvent = Event.create({
                 organizationId: null,
-                typeId: (await new PlatformEventTypeFactory({}).create()).id,
+                typeId: OrganizationEventType.DEFAULT_ID,
                 name: 'test event',
                 startDate: new Date(Date.now() + 5 * 24 * 60 * 60 * 1000),
                 endDate: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),