@stamhoofd/backend 2.48.0 → 2.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.48.0",
+    "version": "2.49.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -33,17 +33,17 @@
     "dependencies": {
         "@mollie/api-client": "3.7.0",
         "@simonbackx/simple-database": "1.25.0",
-        "@simonbackx/simple-encoding": "2.15.1",
+        "@simonbackx/simple-encoding": "2.16.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.48.0",
-        "@stamhoofd/backend-middleware": "2.48.0",
-        "@stamhoofd/email": "2.48.0",
-        "@stamhoofd/models": "2.48.0",
-        "@stamhoofd/queues": "2.48.0",
-        "@stamhoofd/sql": "2.48.0",
-        "@stamhoofd/structures": "2.48.0",
-        "@stamhoofd/utility": "2.48.0",
+        "@stamhoofd/backend-i18n": "2.49.0",
+        "@stamhoofd/backend-middleware": "2.49.0",
+        "@stamhoofd/email": "2.49.0",
+        "@stamhoofd/models": "2.49.0",
+        "@stamhoofd/queues": "2.49.0",
+        "@stamhoofd/sql": "2.49.0",
+        "@stamhoofd/structures": "2.49.0",
+        "@stamhoofd/utility": "2.49.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "64ace7d8f8dcfa887046c4415d0f0f4cac236ef4"
+    "gitHead": "ee78a53466f94dd4c58e7a3140198422f25ee961"
 }

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

@@ -71,7 +71,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             }
         }
 
-        if (organization) {
+        if (organization && !Context.auth.canAccessAllPlatformMembers()) {
             // Add organization scope filter
             const groups = await Context.auth.getAccessibleGroups(organization.id);
 

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

@@ -65,7 +65,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         const { user } = await Context.authenticate();
 
         if (request.body.asOrganizationId && request.body.asOrganizationId !== organization.id) {
-            if (!await Context.auth.hasFullAccess(request.body.asOrganizationId)) {
+            if (!await Context.auth.canManageFinances(request.body.asOrganizationId)) {
                 throw new SimpleError({
                     code: 'forbidden',
                     message: 'No permission to register as this organization for a different organization',

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -73,13 +73,15 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                 );
 
         const defaultTemplateTypes = organization ? types.filter(type => type !== EmailTemplateType.SavedMembersEmail) : types;
-        const defaultTemplates = await EmailTemplate.where({
-            organizationId: null,
-            type: {
-                sign: 'IN',
-                value: defaultTemplateTypes,
-            },
-        });
+        const defaultTemplates = defaultTemplateTypes.length === 0
+            ? []
+            : (await EmailTemplate.where({
+                    organizationId: null,
+                    type: {
+                        sign: 'IN',
+                        value: defaultTemplateTypes,
+                    },
+                }));
 
         return new Response(templates.concat(defaultTemplates).map(template => EmailTemplateStruct.create(template)));
     }

package/src/endpoints/organization/dashboard/payments/PatchBalanceItemsEndpoint.ts

@@ -94,11 +94,11 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                 }
 
                 if (patch.unitPrice !== undefined) {
-                    throw new SimpleError({
-                        code: 'invalid_field',
-                        message: 'You cannot change the unit price of a balance item',
-                        human: 'Het is niet mogelijk om de eenheidsprijs van een openstaande schuld te wijzigen. Je kan de openstaande schuld verwijderen en opnieuw aanmaken indien noodzakelijk.',
-                    });
+                    // throw new SimpleError({
+                    //    code: 'invalid_field',
+                    //    message: 'You cannot change the unit price of a balance item',
+                    //    human: 'Het is niet mogelijk om de eenheidsprijs van een openstaande schuld te wijzigen. Je kan de openstaande schuld verwijderen en opnieuw aanmaken indien noodzakelijk.',
+                    // });
                 }
 
                 // Check permissions

package/src/endpoints/organization/dashboard/webshops/GetWebshopOrdersEndpoint.ts

@@ -1,9 +1,10 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { assertSort, CountFilteredRequest, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PrivateOrder, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, CountFilteredRequest, getOrderSearchFilter, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PrivateOrder, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { Order } from '@stamhoofd/models';
 import { compileToSQLFilter, compileToSQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { parsePhoneNumber } from 'libphonenumber-js/max';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
 import { LimitedFilteredRequestHelper } from '../../../../helpers/LimitedFilteredRequestHelper';
@@ -51,16 +52,8 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
             query.where(compileToSQLFilter(q.filter, filterCompilers));
         }
 
-        // todo: use same logic as frontend
         if (q.search) {
-            let searchFilter: StamhoofdFilter | null = null;
-
-            // todo: detect special search patterns and adjust search filter if needed
-            searchFilter = {
-                name: {
-                    $contains: q.search,
-                },
-            };
+            const searchFilter: StamhoofdFilter | null = getOrderSearchFilter(q.search, parsePhoneNumber);
 
             if (searchFilter) {
                 query.where(compileToSQLFilter(searchFilter, filterCompilers));

package/src/helpers/ModelHelper.ts

@@ -19,6 +19,10 @@ export class ModelHelper {
 
             await onBatchReceived(models);
 
+            if (models.length < limit) {
+                break;
+            }
+
             lastId
                     = models[
                     models.length - 1

package/src/helpers/TagHelper.test.ts

@@ -50,9 +50,9 @@ describe('TagHelper', () => {
             ]);
 
             // act
-            const doesTag3ContainTag4 = TagHelper.containsDeep('id3', 'id4', tags);
-            const doesTag3ContainTag5 = TagHelper.containsDeep('id3', 'id5', tags);
-            const doesTag3ContainTag1 = TagHelper.containsDeep('id3', 'id1', tags);
+            const doesTag3ContainTag4 = TagHelper.containsDeep('id3', 'id4', { tagMap: tags });
+            const doesTag3ContainTag5 = TagHelper.containsDeep('id3', 'id5', { tagMap: tags });
+            const doesTag3ContainTag1 = TagHelper.containsDeep('id3', 'id1', { tagMap: tags });
 
             // assert
             expect(doesTag3ContainTag4).toBe(true);

package/src/seeds/1729253172-update-orders.ts

@@ -16,8 +16,12 @@ export default new Migration(async () => {
 
     await ModelHelper.loop(Order, 'id', async (batch: Order[]) => {
         console.log('Saving orders...', `(${count})`);
+
         // save all orders to update the new columns
-        await Promise.all(batch.map(order => order.save()));
+        for (const order of batch) {
+            await order.save();
+        }
+
         count += limit;
     },
     { limit });

package/src/sql-filters/members.ts

@@ -27,6 +27,7 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         SQL.jsonValue(SQL.column('details'), '$.value.gender'),
         { isJSONValue: true, type: SQLValueType.JSONString },
     ),
+
     'birthDay': createSQLColumnFilterCompiler('birthDay', {
         normalizeValue: (d) => {
             if (typeof d === 'number') {
@@ -36,6 +37,7 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
             return d;
         },
     }),
+
     'organizationName': createSQLExpressionFilterCompiler(
         SQL.column('organizations', 'name'),
     ),
@@ -55,6 +57,28 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         { isJSONValue: true, isJSONObject: true, type: SQLValueType.JSONString },
     ),
 
+    'details.parents[0]': createSQLFilterNamespace({
+        name: createSQLExpressionFilterCompiler(
+            new SQLConcat(
+                SQL.jsonUnquotedValue(SQL.column('details'), '$.value.parents[0].firstName'),
+                new SQLScalar(' '),
+                SQL.jsonUnquotedValue(SQL.column('details'), '$.value.parents[0].lastName'),
+            ),
+            { isJSONValue: true, isJSONObject: false, type: SQLValueType.JSONString },
+        ),
+    }),
+
+    'details.parents[1]': createSQLFilterNamespace({
+        name: createSQLExpressionFilterCompiler(
+            new SQLConcat(
+                SQL.jsonUnquotedValue(SQL.column('details'), '$.value.parents[1].firstName'),
+                new SQLScalar(' '),
+                SQL.jsonUnquotedValue(SQL.column('details'), '$.value.parents[1].lastName'),
+            ),
+            { isJSONValue: true, isJSONObject: false, type: SQLValueType.JSONString },
+        ),
+    }),
+
     'unverifiedEmail': createSQLExpressionFilterCompiler(
         SQL.jsonValue(SQL.column('details'), '$.value.unverifiedEmails'),
         { isJSONValue: true, isJSONObject: true, type: SQLValueType.JSONString },
@@ -78,6 +102,10 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
             SQL.jsonValue(SQL.column('details'), '$.value.address.street'),
             { isJSONValue: true, type: SQLValueType.JSONString },
         ),
+        number: createSQLExpressionFilterCompiler(
+            SQL.jsonValue(SQL.column('details'), '$.value.address.number'),
+            { isJSONValue: true, type: SQLValueType.JSONString },
+        ),
     }),
 
     'details.parents[*].address': createSQLFilterNamespace({
@@ -93,6 +121,10 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
             SQL.jsonValue(SQL.column('details'), '$.value.parents[*].address.street'),
             { isJSONValue: true, isJSONObject: true },
         ),
+        number: createSQLExpressionFilterCompiler(
+            SQL.jsonValue(SQL.column('details'), '$.value.parents[*].address.number'),
+            { isJSONValue: true, isJSONObject: true },
+        ),
     }),
 
     'parentPhone': createSQLExpressionFilterCompiler(

package/src/sql-filters/orders.ts

@@ -1,4 +1,4 @@
-import { baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, SQL, SQLConcat, SQLFilterDefinitions, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, SQL, SQLCast, SQLConcat, SQLFilterDefinitions, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 
 export const orderFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
@@ -36,17 +36,14 @@ export const orderFilterCompilers: SQLFilterDefinitions = {
         { isJSONValue: true, type: SQLValueType.JSONString },
     ),
     validAt: createSQLColumnFilterCompiler('validAt'),
-
-    // todo: TEST!
     name: createSQLExpressionFilterCompiler(
-        new SQLConcat(
-            SQL.jsonValue(SQL.column('data'), '$.value.customer.firstName'),
-            new SQLScalar(' '),
-            SQL.jsonValue(SQL.column('data'), '$.value.customer.lastName'),
-        ),
-        // SQL.jsonValue(SQL.column('data'), '$.value.customer.name'),
-        // todo: type?
-        { isJSONValue: true, type: SQLValueType.JSONString },
+        new SQLCast(
+            new SQLConcat(
+                new SQLJsonUnquote(SQL.jsonValue(SQL.column('data'), '$.value.customer.firstName')),
+                new SQLScalar(' '),
+                new SQLJsonUnquote(SQL.jsonValue(SQL.column('data'), '$.value.customer.lastName')),
+            ),
+            'CHAR'),
     ),
     email: createSQLExpressionFilterCompiler(
         SQL.jsonValue(SQL.column('data'), '$.value.customer.email'),
@@ -61,8 +58,4 @@ export const orderFilterCompilers: SQLFilterDefinitions = {
     totalPrice: createSQLColumnFilterCompiler('totalPrice'),
     amount: createSQLColumnFilterCompiler('amount'),
     timeSlotTime: createSQLColumnFilterCompiler('timeSlotTime'),
-
-    // only frontend
-    // openBalance
-    // location
 };