@stamhoofd/backend 2.17.0 → 2.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.17.0",
+    "version": "2.17.3",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -39,10 +39,10 @@
         "@stamhoofd/backend-i18n": "^2.17.0",
         "@stamhoofd/backend-middleware": "^2.17.0",
         "@stamhoofd/email": "^2.17.0",
-        "@stamhoofd/models": "^2.17.0",
-        "@stamhoofd/queues": "^2.17.0",
-        "@stamhoofd/sql": "^2.17.0",
-        "@stamhoofd/structures": "^2.17.0",
+        "@stamhoofd/models": "^2.17.3",
+        "@stamhoofd/queues": "^2.17.3",
+        "@stamhoofd/sql": "^2.17.3",
+        "@stamhoofd/structures": "^2.17.3",
         "@stamhoofd/utility": "^2.17.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "5f940486646acd12e23e96a750bc12ca2be4df44"
+    "gitHead": "9aa2fbb9c268c4c5c45efd68a9dc55f5d48eb621"
 }

package/src/endpoints/global/files/ExportToExcelEndpoint.ts

@@ -5,11 +5,12 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { ArchiverWriterAdapter, exportToExcel, XlsxTransformerSheet, XlsxWriter } from '@stamhoofd/excel-writer';
 import { getEmailBuilderForTemplate, Platform, RateLimiter } from '@stamhoofd/models';
-import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, LimitedFilteredRequest, PaginatedResponse, Recipient, Replacement } from '@stamhoofd/structures';
+import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, LimitedFilteredRequest, PaginatedResponse, Recipient, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from "@stamhoofd/utility";
 import { Context } from '../../../helpers/Context';
 import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator';
 import { FileCache } from '../../../helpers/FileCache';
+import { QueueHandler } from '@stamhoofd/queues';
 
 type Params = { type: string };
 type Query = undefined;
@@ -62,6 +63,15 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
             })
         }
 
+        if (QueueHandler.isRunning('user-export-to-excel-' + user.id)) {
+            throw new SimpleError({
+                code: "not_allowed",
+                message: "Export is pending",
+                human: 'Je hebt momenteel al een Excel export lopen. Wacht tot die klaar is voor je een nieuwe export start.',
+                statusCode: 403
+            })
+        }
+
         const loader = ExportToExcelEndpoint.loaders.get(request.params.type as ExcelExportType);
         
         if (!loader) {
@@ -137,27 +147,33 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
     }
 
     async job(loader: ExcelExporter<EncodableObject>, request: ExcelExportRequest, type: string): Promise<string> {
-        // Estimate how long it will take.
-        // If too long, we'll schedule it and write it to Digitalocean Spaces
-        // Otherwise we'll just return the file directly
-        const {file, stream} = await FileCache.getWriteStream('.xlsx');
-
-        const zipWriterAdapter = new ArchiverWriterAdapter(stream);
-        const writer = new XlsxWriter(zipWriterAdapter);
-
-        // Limit to pages of 100
-        request.filter.limit = 100;
-
-        await exportToExcel({
-            definitions: loader.sheets,
-            writer,
-            dataGenerator: fetchToAsyncIterator(request.filter, loader),
-            filter: request.workbookFilter
-        })
-
-        console.log('Done writing excel file')
-
-        const url = 'https://'+ STAMHOOFD.domains.api + '/file-cache?file=' + encodeURIComponent(file) + '&name=' + encodeURIComponent(type)
-        return url;
+        // Only run 1 export per user at the same time
+        return await QueueHandler.schedule('user-export-to-excel-' + Context.user!.id, async () => {
+            // Allow maximum 2 running Excel jobs at the same time for all users
+            return await QueueHandler.schedule('export-to-excel', async () => {
+                // Estimate how long it will take.
+                // If too long, we'll schedule it and write it to Digitalocean Spaces
+                // Otherwise we'll just return the file directly
+                const {file, stream} = await FileCache.getWriteStream('.xlsx');
+
+                const zipWriterAdapter = new ArchiverWriterAdapter(stream);
+                const writer = new XlsxWriter(zipWriterAdapter);
+
+                // Limit to pages of 100
+                request.filter.limit = 100;
+
+                await exportToExcel({
+                    definitions: loader.sheets,
+                    writer,
+                    dataGenerator: fetchToAsyncIterator(request.filter, loader),
+                    filter: request.workbookFilter
+                })
+
+                console.log('Done writing excel file')
+
+                const url = 'https://'+ STAMHOOFD.domains.api + '/v'+ Version +'/file-cache?file=' + encodeURIComponent(file) + '&name=' + encodeURIComponent(type)
+                return url;
+            }, 2)
+        });
     }
 }

package/src/sql-sorters/members.ts

@@ -16,7 +16,8 @@ export const memberSorters: SQLSortDefinitions<MemberWithRegistrations> = {
     },
     'name': {
         getValue(a) {
-            return a.details.name
+            // Note: we should not use 'name' here (that will remove the in between space if one is missing), because we need to use Exactly the same value as the filter will use
+            return a.firstName + ' ' + a.lastName
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return SQLOrderBy.combine([