@stamhoofd/backend 2.52.0 → 2.53.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.52.0",
+    "version": "2.53.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.16.6",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.52.0",
-        "@stamhoofd/backend-middleware": "2.52.0",
-        "@stamhoofd/email": "2.52.0",
-        "@stamhoofd/models": "2.52.0",
-        "@stamhoofd/queues": "2.52.0",
-        "@stamhoofd/sql": "2.52.0",
-        "@stamhoofd/structures": "2.52.0",
-        "@stamhoofd/utility": "2.52.0",
+        "@stamhoofd/backend-i18n": "2.53.0",
+        "@stamhoofd/backend-middleware": "2.53.0",
+        "@stamhoofd/email": "2.53.0",
+        "@stamhoofd/models": "2.53.0",
+        "@stamhoofd/queues": "2.53.0",
+        "@stamhoofd/sql": "2.53.0",
+        "@stamhoofd/structures": "2.53.0",
+        "@stamhoofd/utility": "2.53.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -63,5 +63,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3702314394e25e62289472a70174ef50b6d85898"
+    "gitHead": "d202fb8d4a234f7369c3da54ba15f2b10b82e74e"
 }

package/src/endpoints/global/organizations/GetOrganizationFromUriEndpoint.ts

@@ -3,7 +3,6 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
 import { Organization as OrganizationStruct } from '@stamhoofd/structures';
-import { GoogleTranslateHelper } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 type Params = Record<string, never>;
 

package/src/endpoints/global/organizations/SearchOrganizationEndpoint.ts

@@ -1,7 +1,7 @@
 import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { Organization } from '@stamhoofd/models';
-import { Organization as OrganizationStruct, OrganizationSimple } from '@stamhoofd/structures';
+import { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 
 type Params = Record<string, never>;
@@ -12,7 +12,7 @@ class Query extends AutoEncoder {
 }
 
 type Body = undefined;
-type ResponseBody = (OrganizationSimple | OrganizationStruct)[];
+type ResponseBody = OrganizationStruct[];
 
 export class SearchOrganizationEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected queryDecoder = Query as Decoder<Query>;
@@ -55,9 +55,6 @@ export class SearchOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
             ],
         });
 
-        if (request.request.getVersion() < 169) {
-            return new Response(organizations.map(o => OrganizationSimple.create(o)));
-        }
         return new Response(await Promise.all(organizations.map(o => AuthenticatedStructures.organization(o))));
     }
 }

package/src/endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.ts

@@ -321,6 +321,8 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         if (period) {
             model.periodId = period.id;
             model.settings.period = period.getBaseStructure();
+            model.settings.startDate = period.startDate;
+            model.settings.endDate = period.endDate;
         }
 
         const patch = struct;
@@ -424,6 +426,8 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         model.status = struct.status;
         model.type = struct.type;
         model.settings.period = period.getBaseStructure();
+        model.settings.startDate = period.startDate;
+        model.settings.endDate = period.endDate;
 
         if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
             // Create a temporary permission role for this user

package/src/excel-loaders/payments.ts

@@ -45,6 +45,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Payments, {
             columns: [
                 ...getGeneralColumns(),
                 ...getInvoiceColumns(),
+                ...getPayingOrganizationColumns(),
                 ...getSettlementColumns(),
                 ...getStripeColumns(),
                 ...getTransferColumns(),
@@ -64,6 +65,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Payments, {
                 ...[
                     ...getGeneralColumns(),
                     ...getInvoiceColumns(),
+                    ...getPayingOrganizationColumns(),
                 ].map((c) => {
                     if ('match' in c) {
                         return {
@@ -127,6 +129,16 @@ function getBalanceItemColumns(): XlsxTransformerColumn<PaymentWithItem>[] {
                 value: getBalanceItemTypeName(object.balanceItemPayment.balanceItem.type),
             }),
         },
+        {
+            id: 'balanceItem.category',
+            name: 'Categorie',
+            width: 30,
+            getValue: (object: PaymentWithItem) => {
+                return {
+                    value: Formatter.capitalizeFirstLetter(object.balanceItemPayment.balanceItem.category),
+                };
+            },
+        },
         {
             id: 'balanceItem.description',
             name: 'Beschrijving',
@@ -245,7 +257,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<PaymentGeneral>[] {
             name: 'Betaalprovider',
             width: 16,
             getValue: (object: PaymentGeneralWithStripeAccount) => ({
-                value: object.provider,
+                value: object.provider ?? PaymentMethodHelper.getNameCapitalized(object.method),
             }),
         },
         {
@@ -432,6 +444,46 @@ function getTransferColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
     ];
 }
 
+function getPayingOrganizationColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
+    return [
+        {
+            id: 'payingOrganization.id',
+            name: 'ID betalende groep',
+            width: 30,
+            getValue: (object: PaymentGeneralWithStripeAccount) => {
+                return {
+                    value: object.payingOrganization?.id || '',
+                };
+            },
+        },
+        {
+            id: 'payingOrganization.name',
+            name: 'Naam betalende groep',
+            width: 30,
+            getValue: (object: PaymentGeneralWithStripeAccount) => {
+                return {
+                    value: object.payingOrganization?.name || '',
+                };
+            },
+        },
+        {
+            id: 'payingOrganization.uri',
+            name: 'Groepsnummer betalende groep',
+            width: 30,
+            getValue: (object: PaymentGeneralWithStripeAccount) => {
+                return {
+                    value: object.payingOrganization?.uri || '',
+                };
+            },
+        },
+        XlsxTransformerColumnHelper.createAddressColumns<PaymentGeneralWithStripeAccount>({
+            matchId: 'payingOrganization.address',
+            getAddress: object => object.payingOrganization?.address,
+            identifier: 'Adres betalende groep',
+        }),
+    ];
+}
+
 function getInvoiceColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
     return [
         {

package/src/helpers/AuthenticatedStructures.ts

@@ -42,10 +42,13 @@ export class AuthenticatedStructures {
 
         console.log('includeSettlements', includeSettlements);
 
+        const { payingOrganizations } = await Payment.loadPayingOrganizations(payments);
+
         return Payment.getGeneralStructureFromRelations({
             payments,
             balanceItemPayments,
             balanceItems,
+            payingOrganizations,
         }, includeSettlements);
     }
 
@@ -323,8 +326,26 @@ export class AuthenticatedStructures {
                 if (includeContextOrganization || organizationId !== Context.auth.organization?.id) {
                     const found = organizations.get(organizationId);
                     if (!found) {
-                        const organization = await Context.auth.getOrganization(organizationId);
-                        organizations.set(organization.id, organization);
+                        try {
+                            const organization = await Context.auth.getOrganization(organizationId);
+                            organizations.set(organization.id, organization);
+                        }
+                        catch (e) {
+                            if (e.message.includes('Unexpected missing organization')) {
+                                // This user has permissions for an organization that is deleted
+                                console.error(e);
+                                console.error('User has permissions for an organization that is not found:', organizationId, 'userid', includeUser.id);
+
+                                // Remove permissions for this organization
+                                if (includeUser.permissions) {
+                                    includeUser.permissions.organizationPermissions.delete(organizationId);
+                                    await includeUser.save();
+                                }
+                            }
+                            else {
+                                throw e;
+                            }
+                        }
                     }
                 }
             }