@stamhoofd/backend 2.120.6 → 2.122.0

package/src/endpoints/organization/dashboard/invoices/PatchInvoicesEndpoint.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, 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 { Invoice as InvoiceStruct } from '@stamhoofd/structures';
 
@@ -44,6 +44,15 @@ export class PatchInvoicesEndpoint extends Endpoint<Params, Query, Body, Respons
         const invoices: Invoice[] = [];
 
         for (const { put } of request.body.getPuts()) {
+            if (put.payingOrganizationId) {
+                if (!await Context.auth.hasFullAccess(put.payingOrganizationId)) {
+                    Context.auth.error($t('%1Xw'));
+                }
+            }
+
+            put.stripeAccountId = null;
+            put.reference = null;
+
             const model = await InvoiceService.createFrom(organization, put);
             invoices.push(model);
         }

package/src/endpoints/organization/dashboard/mollie/CheckMollieEndpoint.ts

@@ -1,11 +1,12 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { CheckMollieResponse, PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
+import { MollieService } from '../../../../services/MollieService.js';
 
 type Params = Record<string, never>;
 type Body = undefined;
@@ -36,9 +37,9 @@ export class CheckMollieEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw Context.auth.error();
         }
 
-        const mollie = await MollieToken.getTokenFor(organization.id);
+        const service = await MollieService.create({ sellingOrganization: organization });
 
-        if (!mollie) {
+        if (!service) {
             organization.privateMeta.mollieOnboarding = null;
             organization.privateMeta.mollieProfile = null;
             await organization.save();
@@ -52,9 +53,9 @@ export class CheckMollieEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 profiles: [],
             }));
         }
-        const profiles = await mollie.getProfiles();
+        const profiles = await service.getProfiles();
 
-        const status = await mollie.getOnboardingStatus();
+        const status = await service.getOnboardingStatus();
         organization.privateMeta.mollieOnboarding = status;
 
         // Check profile is still valid
@@ -63,8 +64,7 @@ export class CheckMollieEndpoint extends Endpoint<Params, Query, Body, ResponseB
             const profile = profiles.find(p => p.id === s);
             if (!profile) {
                 organization.privateMeta.mollieProfile = null;
-            }
-            else {
+            } else {
                 organization.privateMeta.mollieProfile = profile;
             }
         }

package/src/endpoints/organization/dashboard/mollie/ConnectMollieEndpoint.ts

@@ -1,14 +1,15 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, 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 { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { checkMollieSettlementsFor } from '../../../../helpers/CheckSettlements.js';
 import { Context } from '../../../../helpers/Context.js';
+import { MollieService } from '../../../../services/MollieService.js';
 
 type Params = Record<string, never>;
 
@@ -47,9 +48,13 @@ export class ConnectMollieEndpoint extends Endpoint<Params, Query, Body, Respons
         }
 
         const mollieToken = await MollieToken.create(organization, request.body.code);
+        const service = await MollieService.create({ sellingOrganization: organization });
+        if (service) {
+            await service.setupOnboarding();
 
-        // Check settlements after linking (shouldn't block)
-        checkMollieSettlementsFor(mollieToken.accessToken, true).catch(console.error);
+            // Check settlements after linking (shouldn't block)
+            checkMollieSettlementsFor(mollieToken.accessToken, true).catch(console.error);
+        }
 
         return new Response(await AuthenticatedStructures.organization(organization));
     }

package/src/endpoints/organization/dashboard/mollie/DisconnectMollieEndpoint.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 { MollieToken } from '@stamhoofd/models';
-import type { Organization as OrganizationStruct} from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { PermissionLevel } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';

package/src/endpoints/organization/dashboard/mollie/GetMollieDashboardEndpoint.ts

@@ -1,15 +1,15 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
 import { MollieToken } from '@stamhoofd/models';
 import { PermissionLevel } from '@stamhoofd/structures';
-
+import { GetMollieDashboardResponse } from '@stamhoofd/structures/endpoints/GetMollieDashboardResponse.js';
 import { Context } from '../../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Body = undefined;
 type Query = undefined;
-type ResponseBody = string;
+type ResponseBody = GetMollieDashboardResponse;
 
 export class GetMollieDashboardEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -46,11 +46,11 @@ export class GetMollieDashboardEndpoint extends Endpoint<Params, Query, Body, Re
         try {
             const url = await mollie.getOnboardingLink() as string;
 
-            const response = new Response(url);
-            response.headers['Content-Type'] = 'text/plain';
+            const response = new Response(GetMollieDashboardResponse.create({
+                url,
+            }));
             return response;
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleErrors(e) || isSimpleError(e)) {
                 throw e;
             }

package/src/endpoints/organization/dashboard/nolt/CreateNoltTokenEndpoint.ts

@@ -1,5 +1,5 @@
 import { AutoEncoder, field, 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 jwt from 'jsonwebtoken';
 

package/src/endpoints/organization/dashboard/organization/GetOrganizationArchivedGroups.ts

@@ -1,8 +1,8 @@
-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 { Group, Token } from '@stamhoofd/models';
-import type { Group as GroupStruct} from '@stamhoofd/structures';
+import type { Group as GroupStruct } from '@stamhoofd/structures';
 import { GroupStatus } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';

package/src/endpoints/organization/dashboard/organization/GetOrganizationDeletedGroups.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 { Group } from '@stamhoofd/models';
 import type { Group as GroupStruct } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/organization/GetUitpasClientIdEndpoint.ts

@@ -1,4 +1,4 @@
-import type { Request} from '@simonbackx/simple-endpoints';
+import type { Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasGetClientIdResponse } from '@stamhoofd/structures';
 

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.test.ts

@@ -1,9 +1,9 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, User, Webshop} from '@stamhoofd/models';
+import type { Organization, User, Webshop } from '@stamhoofd/models';
 import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { AccessRight, MemberResponsibility, OrganizationPrivateMetaData, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 
-import type { AutoEncoderPatchType, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../../tests/helpers/TestServer.js';

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -1,10 +1,10 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { cloneObject, isPatchableArray, isPatchMap, ObjectData, PatchableArray, PatchMap, patchObject } 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, SimpleErrors } from '@simonbackx/simple-errors';
 import { Organization, OrganizationRegistrationPeriod, PayconiqPayment, Platform, RegistrationPeriod, StripeAccount, Webshop } from '@stamhoofd/models';
-import type { Company, PermissionsResourceType, ResourcePermissions} from '@stamhoofd/structures';
+import type { Company, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
 import { BuckarooSettings, MemberResponsibility, OrganizationMetaData, Organization as OrganizationStruct, PayconiqAccount, PaymentMethod, PaymentMethodHelper, PermissionLevel, PermissionRoleDetailed, PermissionRoleForResponsibility, UitpasClientCredentialsStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -12,10 +12,13 @@ import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStruct
 import { BuckarooHelper } from '../../../../helpers/BuckarooHelper.js';
 import { Context } from '../../../../helpers/Context.js';
 import { MemberUserSyncer } from '../../../../helpers/MemberUserSyncer.js';
+import { RecordAnswerHelper } from '../../../../helpers/RecordAnswerHelper.js';
 import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater.js';
 import { TagHelper } from '../../../../helpers/TagHelper.js';
 import { ViesHelper } from '../../../../helpers/ViesHelper.js';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
+import { VATService } from '../../../../services/VATService.js';
+import { isAbortedError, isCanceledError } from '@stamhoofd/queues';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -70,6 +73,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
         const errors = new SimpleErrors();
         let shouldUpdateSetupSteps = false;
+        let shouldUpdateVATExcempt = false;
         let shouldUpdateUserPermissions = false;
         let updateTags = false;
 
@@ -158,6 +162,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 organization.privateMeta.privateKey = request.body.privateMeta.privateKey ?? organization.privateMeta.privateKey;
                 organization.privateMeta.featureFlags = patchObject(organization.privateMeta.featureFlags, request.body.privateMeta.featureFlags);
                 organization.privateMeta.balanceNotificationSettings = patchObject(organization.privateMeta.balanceNotificationSettings, request.body.privateMeta.balanceNotificationSettings);
+                organization.privateMeta.invoiceSettings = patchObject(organization.privateMeta.invoiceSettings, request.body.privateMeta.invoiceSettings);
                 organization.privateMeta.recordAnswers = request.body.privateMeta.recordAnswers.applyTo(organization.privateMeta.recordAnswers);
 
                 if (request.body.privateMeta.responsibilities || request.body.privateMeta.roles) {
@@ -218,8 +223,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 if (request.body.privateMeta.buckarooSettings !== undefined) {
                     if (request.body.privateMeta.buckarooSettings === null) {
                         organization.privateMeta.buckarooSettings = null;
-                    }
-                    else {
+                    } else {
                         organization.privateMeta.buckarooSettings = organization.privateMeta.buckarooSettings ?? BuckarooSettings.create({});
                         organization.privateMeta.buckarooSettings.patchOrPut(request.body.privateMeta.buckarooSettings);
 
@@ -251,16 +255,24 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 }
             }
 
-            // Allow admin patches (permissions only atm). No put atm
-            if (request.body.admins) {
-                throw new Error('Temporary removed to keep code cleaner. Please use different endpoints.');
-            }
-
             if (request.body.meta) {
                 if (request.body.meta.companies) {
                     await this.validateCompanies(organization, request.body.meta.companies);
                     shouldUpdateSetupSteps = true;
+                    shouldUpdateVATExcempt = true;
                 }
+
+                if (request.body.meta.recordsConfiguration?.recordCategories) {
+                    RecordAnswerHelper.throwIfPatchOrPutIsInvalid(organization.meta.recordsConfiguration.recordCategories, request.body.meta.recordsConfiguration.recordCategories);
+                }
+
+                if (request.body.meta.financialSupport) {
+                    if (STAMHOOFD.userMode === 'platform') {
+                        // can only set financial support settings on platform if userMode platform
+                        request.body.meta.financialSupport = null;
+                    }
+                }
+
                 const savedPackages = organization.meta.packages;
                 organization.meta.patchOrPut(request.body.meta);
                 organization.meta.packages = savedPackages;
@@ -420,21 +432,37 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set is already closed',
-                            human: $t('%15i'),
+                            human: $t('%1X8'),
                             field: 'period',
                         });
                     }
 
-                    const maximumStart = 1000 * 60 * 60 * 24 * 31 * 2; // 2 months in advance
-                    if (period.startDate > new Date(Date.now() + maximumStart) && STAMHOOFD.environment !== 'development') {
+                    const struct = period.getBaseStructure();
+                    if (struct.switchDate && struct.switchDate > new Date()) {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'The period you want to set has not started yet',
-                            human: $t('%15k'),
+                            human: $t('%1ca', { date: Formatter.date(struct.switchDate) }),
                             field: 'period',
                         });
                     }
 
+                    if (period.organizationId === null) {
+                        // Not allowed to return to a period lower than the currently active platform period
+                        const platform = await Platform.getShared();
+                        const platformPeriod = await RegistrationPeriod.getByID(platform.periodId);
+                        if (platformPeriod) {
+                            if (period.startDate < platformPeriod.startDate) {
+                                throw new SimpleError({
+                                    code: 'invalid_field',
+                                    message: 'Cannot return to period with a start date before the currently active platform period',
+                                    human: $t('%1Wt', {}),
+                                    field: 'period',
+                                });
+                            }
+                        }
+                    }
+
                     organization.periodId = period.id;
                     shouldUpdateSetupSteps = true;
                 }
@@ -442,8 +470,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
             // Save the organization
             await organization.save();
-        }
-        else {
+        } else {
             if (request.body.name || request.body.address || request.body.website || request.body.meta?.companies || request.body.meta?.recordsConfiguration || request.body.meta?.registrationPaymentConfiguration) {
                 throw new SimpleError({
                     code: 'permission_denied',
@@ -605,12 +632,29 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             await SetupStepUpdater.updateForOrganization(organization);
         }
 
+        if (shouldUpdateVATExcempt) {
+            const platform = await Platform.getShared();
+            const sellingOrganizationId = platform.membershipOrganizationId;
+            if (sellingOrganizationId) {
+                const sellingOrganization = await Organization.getByID(sellingOrganizationId, true);
+
+                await VATService.updateVATExcempt({
+                    organization,
+                    sellingOrganization,
+                });
+            }
+        }
+
         if (shouldUpdateUserPermissions) {
             await MemberUserSyncer.updatePermissionsForOrganization(organization.id);
         }
 
         if (updateTags) {
-            await TagHelper.updateOrganizations();
+            try {
+                await TagHelper.updateOrganizations();
+            } catch (e) {
+                if (!isAbortedError(e) && !isCanceledError(e)) throw e;
+            }
         }
         const struct = await AuthenticatedStructures.organization(organization);
         return new Response(struct);
@@ -623,7 +667,11 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 const original = organization.meta.companies.find(c => c.id === patch.id);
 
                 if (!original) {
-                    throw new Error('Could not find company');
+                    throw new SimpleError({
+                        code: 'not_found',
+                        message: 'Company not found',
+                        human: $t('%1cw'),
+                    });
                 }
 
                 // Changed VAT number
@@ -646,8 +694,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
 
                 await ViesHelper.checkCompany(put, put);
             }
-        }
-        else {
+        } else {
             if (companies.length > 5) {
                 throw new SimpleError({
                     code: 'invalid_field',

package/src/endpoints/organization/dashboard/organization/SearchUitpasOrganizersEndpoint.ts

@@ -1,8 +1,8 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { UitpasService } from '../../../../services/uitpas/UitpasService.js';
 import type { UitpasOrganizersResponse } from '@stamhoofd/structures';
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { Context } from '../../../../helpers/Context.js';
 

package/src/endpoints/organization/dashboard/organization/SetOrganizationDomainEndpoint.ts

@@ -104,8 +104,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                     // We set a custom domainname for webshops already
                     // This is not used at this moment
                     organization.privateMeta.mailFromDomain = defaultFromDomain;
-                }
-                else {
+                } else {
                     // CNAME domain: for SPF + MX + A record
                     organization.privateMeta.mailFromDomain = organization.privateMeta.pendingRegisterDomain;
                 }
@@ -126,8 +125,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                             value: (STAMHOOFD.domains.registrationCname[organization.address.country] ?? STAMHOOFD.domains.registrationCname['']) + '.',
                         }));
                     }
-                }
-                else {
+                } else {
                     organization.privateMeta.dnsRecords.push(DNSRecord.create({
                         type: DNSRecordType.CNAME,
                         name: organization.privateMeta.mailFromDomain + '.',
@@ -149,8 +147,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
 
                     organization.serverMeta.privateDKIMKey = priv;
                     organization.serverMeta.publicDKIMKey = pub;
-                }
-                else {
+                } else {
                     priv = organization.serverMeta.privateDKIMKey;
                     pub = organization.serverMeta.publicDKIMKey;
                 }
@@ -170,8 +167,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                     description: $t(`%Ee`),
                     optional: true,
                 }));
-            }
-            else {
+            } else {
                 if (oldMailDomain) {
                     organization.deleteAWSMailIdenitity(oldMailDomain).catch(console.error);
                 }
@@ -189,8 +185,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
             }
 
             await organization.save();
-        }
-        else {
+        } else {
             // Validate DNS-records if not empty
             console.log('Validating domains');
             await organization.updateDNSRecords();

package/src/endpoints/organization/dashboard/organization/SetUitpasClientCredentialsEndpoint.ts

@@ -1,5 +1,5 @@
 import type { AutoEncoderPatchType, 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 { UitpasClientCredentialsStatus, UitpasClientIdAndSecret, UitpasSetClientCredentialsResponse } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/payments/GetPaymentsCountEndpoint.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/organization/dashboard/payments/GetPaymentsEndpoint.ts

@@ -1,10 +1,10 @@
 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 { Payment } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, PaymentGeneral, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
@@ -167,8 +167,7 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',

package/src/endpoints/organization/dashboard/payments/PatchPaymentsEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, BalanceItemPayment, Payment, User } from '@stamhoofd/models';
@@ -40,7 +40,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate();
+        const { user } = await Context.authenticate();
 
         if (!await Context.auth.hasSomeAccess(organization.id)) {
             throw Context.auth.error();
@@ -74,6 +74,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             payment.status = PaymentStatus.Created;
             payment.method = put.method;
             payment.customer = put.customer;
+            payment.adminUserId = user.id;
 
             const payingOrganizationId = put.payingOrganizationId ?? put.payingOrganization?.id ?? null;
 
@@ -81,8 +82,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 if (Context.auth.hasSomePlatformAccess()) {
                     if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
                         payment.payingOrganizationId = payingOrganizationId;
-                    }
-                    else {
+                    } else {
                         // silently ignore
                     }
                 }
@@ -166,7 +166,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
             // Check total price
             const totalPrice = balanceItemPayments.reduce((total, item) => total + item.price, 0);
             payment.price = totalPrice;
-            PaymentService.round(payment);
+            PaymentService.roundPayment(payment);
 
             switch (payment.type) {
                 case PaymentType.Payment: {
@@ -233,8 +233,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     payment.paidAt = put.paidAt;
                     await payment.save();
                 }
-            }
-            else {
+            } else {
                 for (const balanceItem of balanceItems) {
                     await BalanceItemService.markUpdated(balanceItem, payment, organization);
                 }
@@ -255,8 +254,18 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     });
                 }
 
-                if (patch.method || patch.paidAt !== undefined || patch.status !== undefined) {
-                    if (payment.method && ![PaymentMethod.Unknown, PaymentMethod.Transfer, PaymentMethod.PointOfSale].includes(payment.method)) {
+                if (patch.method || patch.paidAt !== undefined) {
+                    if (![PaymentMethod.Unknown, PaymentMethod.Transfer, PaymentMethod.PointOfSale].includes(payment.method)) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid payment method',
+                            human: $t(`%Ex`),
+                        });
+                    }
+                }
+
+                if (patch.status !== undefined && patch.status !== payment.status) {
+                    if (!payment.canChangeStatus) {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid payment method',
@@ -268,8 +277,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 if (patch.transferSettings && payment.method == PaymentMethod.Transfer) {
                     if (patch.transferSettings.isPut()) {
                         payment.transferSettings = patch.transferSettings;
-                    }
-                    else if (payment.transferSettings !== null) {
+                    } else if (payment.transferSettings !== null) {
                         payment.transferSettings = payment.transferSettings.patch(patch.transferSettings);
                     }
                 }
@@ -301,8 +309,8 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     payment.paidAt = patch.paidAt;
                 }
 
-                if (patch.customer) {
-                    // payment.customer = patchObject(payment.customer, patch.customer, { getDefaultValue: () => PaymentCustomer.create({}) });
+                if (patch.customer !== undefined) {
+                    payment.customer = patchObject(payment.customer, patch.customer, { getDefaultValue: () => PaymentCustomer.create({}) });
                 }
 
                 const payingOrganizationId = patch.payingOrganizationId ?? patch.payingOrganization?.id ?? null;
@@ -311,8 +319,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                     if (Context.auth.hasSomePlatformAccess()) {
                         if (await Context.auth.hasFullAccess(payingOrganizationId, PermissionLevel.Full)) {
                             payment.payingOrganizationId = payingOrganizationId;
-                        }
-                        else {
+                        } else {
                             // silently ignore
                         }
                     }
@@ -335,7 +342,7 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
 
                 await payment.save();
 
-                if (patch.status) {
+                if (patch.status && patch.status !== payment.status) {
                     await PaymentService.handlePaymentStatusUpdate(payment, organization, patch.status);
                 }