@stamhoofd/backend 2.98.0 → 2.99.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.98.0",
+    "version": "2.99.1",
     "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.98.0",
-        "@stamhoofd/backend-middleware": "2.98.0",
-        "@stamhoofd/email": "2.98.0",
-        "@stamhoofd/models": "2.98.0",
-        "@stamhoofd/queues": "2.98.0",
-        "@stamhoofd/sql": "2.98.0",
-        "@stamhoofd/structures": "2.98.0",
-        "@stamhoofd/utility": "2.98.0",
+        "@stamhoofd/backend-i18n": "2.99.1",
+        "@stamhoofd/backend-middleware": "2.99.1",
+        "@stamhoofd/email": "2.99.1",
+        "@stamhoofd/models": "2.99.1",
+        "@stamhoofd/queues": "2.99.1",
+        "@stamhoofd/sql": "2.99.1",
+        "@stamhoofd/structures": "2.99.1",
+        "@stamhoofd/utility": "2.99.1",
         "archiver": "^7.0.1",
         "axios": "^1.8.2",
         "cookie": "^0.7.0",
@@ -70,5 +70,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d15c1756a1e10788fa2736efcc6abbc2e3f365a6"
+    "gitHead": "92d884776091f7182f8699725b7a7b5b8dcf41e7"
 }

package/src/crons/balance-emails.ts

@@ -21,7 +21,7 @@ async function balanceEmails() {
         return;
     }
 
-    if ((new Date().getHours() > 18 || new Date().getHours() < 6) && STAMHOOFD.environment !== 'development') {
+    if ((new Date().getHours() > 10 || new Date().getHours() < 6) && STAMHOOFD.environment !== 'development') {
         return;
     }
 

package/src/endpoints/global/registration-periods/PatchRegistrationPeriodsEndpoint.ts

@@ -1,12 +1,11 @@
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { AuditLogSource, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
+import { RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { Context } from '../../../helpers/Context';
 import { PeriodHelper } from '../../../helpers/PeriodHelper';
-import { AuditLogService } from '../../../services/AuditLogService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -71,8 +70,17 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
         const periods: RegistrationPeriod[] = [];
 
         for (const { put } of request.body.getPuts()) {
+            if (put.endDate < put.startDate) {
+                throw new SimpleError({
+                    code: 'invalid_field',
+                    message: $t('De einddatum moet na de startdatum liggen.'),
+                    field: 'endDate',
+                });
+            }
+
             const period = new RegistrationPeriod();
             period.id = put.id;
+            period.customName = put.customName;
             period.startDate = put.startDate;
             period.endDate = put.endDate;
             period.locked = put.locked;
@@ -129,6 +137,15 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 model.endDate = patch.endDate;
             }
 
+            // only check if start or end date is patched
+            if ((patch.startDate || patch.endDate) && model.endDate < model.startDate) {
+                throw new SimpleError({
+                    code: 'invalid_field',
+                    message: $t('De einddatum moet na de startdatum liggen.'),
+                    field: 'endDate',
+                });
+            }
+
             if (patch.locked !== undefined) {
                 model.locked = patch.locked;
             }
@@ -137,6 +154,10 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 model.settings = patchObject(model.settings, patch.settings);
             }
 
+            if (patch.customName !== undefined) {
+                model.customName = patch.customName;
+            }
+
             await model.updatePreviousNextPeriods();
             await model.save();
 

package/src/excel-loaders/organizations.ts

@@ -1,12 +1,12 @@
+import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
 import { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
-import { Platform as PlatformStruct, ExcelExportType, LimitedFilteredRequest, Organization as OrganizationStruct, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, PaginatedResponse, MemberWithRegistrationsBlob, Premise } from '@stamhoofd/structures';
-import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint';
-import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
+import { ExcelExportType, LimitedFilteredRequest, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct, Premise } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
-import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
+import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
 import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 
 class MemberResponsibilityRecordWithMember extends MemberResponsibilityRecordStruct {
     @field({ decoder: MemberWithRegistrationsBlob })
@@ -70,6 +70,18 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
             matchId: 'address',
             getAddress: object => object.address,
         }),
+        // Dynamic records
+        XlsxTransformerColumnHelper.createRecordAnswersColumns({
+            matchId: 'recordAnswers',
+            getRecordAnswers: (object: Object) => object.getRecordAnswers(),
+            getRecordCategories: () => {
+                const platform = PlatformStruct.shared;
+
+                return [
+                    ...platform.config.organizationLevelRecordsConfiguration.recordCategories,
+                ];
+            },
+        }),
     ],
 };