@stamhoofd/backend 2.120.6 → 2.122.0

package/src/crons/update-cached-balances.ts

@@ -17,10 +17,10 @@ async function updateCachedBalances() {
      * Cached balances of member should be updated before the cached balances of the user
      * because the cached balances of the user are dependent on the cached balances of the member.
      */
-    .orderBy('objectType', 'ASC')
+        .orderBy('objectType', 'ASC')
     // minimize the number of queries when updating
-    .orderBy('organizationId', 'ASC')
-    .limit(100).fetch();
+        .orderBy('organizationId', 'ASC')
+        .limit(100).fetch();
 
     // Group by object type, next by organization id
     const grouped = new Map<ReceivableBalanceType, Map<string, CachedBalance[]>>();
@@ -51,7 +51,7 @@ async function updateCachedBalances() {
         const bIsMember = b[0] === ReceivableBalanceType.member;
         if (aIsMember && !bIsMember) return -1;
         if (!aIsMember && bIsMember) return 1;
-        return 0; 
+        return 0;
     });
 
     for (const [objectType, organizationMap] of objectTypeMemberFirst) {

package/src/crons.ts

@@ -1,9 +1,8 @@
 import { Database } from '@simonbackx/simple-database';
+import { registerCron } from '@stamhoofd/crons';
 import { Group, Organization, Payment, Registration, STPackage, Webshop } from '@stamhoofd/models';
-import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
 import { SQL } from '@stamhoofd/sql';
-import { registerCron } from '@stamhoofd/crons';
+import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
 import { checkSettlements } from './helpers/CheckSettlements.js';
 import { PaymentService } from './services/PaymentService.js';
 import { RegistrationService } from './services/RegistrationService.js';
@@ -41,8 +40,7 @@ async function checkDNS() {
         }
         try {
             await organization.updateDNSRecords();
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -123,19 +121,22 @@ async function checkWebshopDNS() {
 
 // 11 min - 2 hours
 async function checkPayments() {
+    let timeout = 60 * 1000 * 11;
+    const methods = [
+        PaymentMethod.Bancontact, PaymentMethod.iDEAL, PaymentMethod.Payconiq, PaymentMethod.CreditCard,
+    ];
+
     if (STAMHOOFD.environment === 'development') {
-        // return;
+        // For Mollie, webhooks won't work, so we poll in the backend
+        timeout = 0;
     }
 
-    const timeout = 60 * 1000 * 11;
     const timeout2 = 60 * 1000 * 60 * 2;
 
     // TODO: only select the ID + organizationId
     const payments = await Payment.select()
         .where(
-            SQL.where('method', [
-                PaymentMethod.Bancontact, PaymentMethod.iDEAL, PaymentMethod.Payconiq, PaymentMethod.CreditCard,
-            ])
+            SQL.where('method', methods)
                 .and('status', [PaymentStatus.Created, PaymentStatus.Pending])
                 .and('createdAt', '<', new Date(new Date().getTime() - timeout))
                 .and('createdAt', '>', new Date(new Date().getTime() - timeout2)),
@@ -152,9 +153,10 @@ async function checkPayments() {
         .orderBy('createdAt', 'ASC')
         .limit(500)
         .fetch();
-
-    console.log('[DELAYED PAYMENTS] Checking pending payments: ' + payments.length);
-    await doCheckPayments(payments);
+    if (payments.length) {
+        console.log('[DELAYED PAYMENTS] Checking pending payments: ' + payments.length);
+        await doCheckPayments(payments);
+    }
 }
 
 // 2 hours - 3 days
@@ -180,8 +182,40 @@ async function checkOldPayments() {
         .limit(500)
         .fetch();
 
-    console.log('[DELAYED PAYMENTS] Checking old pending payments: ' + payments.length);
-    await doCheckPayments(payments);
+    if (payments.length) {
+        console.log('[DELAYED PAYMENTS] Checking old pending payments: ' + payments.length);
+        await doCheckPayments(payments);
+    }
+}
+
+// 5 days - 10 days
+async function checkOldDirectDebitPayments() {
+    let timeout = 60 * 1000 * 60 * 24 * 5;
+    const timeout2 = 60 * 1000 * 60 * 24 * 10;
+
+    if (STAMHOOFD.environment === 'development') {
+        // For Mollie, webhooks won't work, so we poll in the backend
+        timeout = 0;
+    }
+
+    // TODO: only select the ID + organizationId
+    const payments = await Payment.select()
+        .where(
+            SQL.where('method', [
+                PaymentMethod.DirectDebit,
+            ])
+                .and('status', [PaymentStatus.Created, PaymentStatus.Pending])
+                .and('createdAt', '<', new Date(new Date().getTime() - timeout))
+                .and('createdAt', '>', new Date(new Date().getTime() - timeout2)),
+        )
+        .orderBy('createdAt', 'ASC')
+        .limit(500)
+        .fetch();
+
+    if (payments.length) {
+        console.log('[DELAYED PAYMENTS] Checking old direct debit pending payments: ' + payments.length);
+        await doCheckPayments(payments);
+    }
 }
 
 async function doCheckPayments(payments: Payment[]) {
@@ -193,8 +227,7 @@ async function doCheckPayments(payments: Payment[]) {
                     await PaymentService.pollStatus(payment.id, organization);
                     continue;
                 }
-            }
-            else {
+            } else {
                 // deprecated
             }
 
@@ -204,8 +237,7 @@ async function doCheckPayments(payments: Payment[]) {
                 payment.status = PaymentStatus.Failed;
                 await payment.save();
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -267,8 +299,7 @@ async function checkFailedBuckarooPayments() {
                     continue;
                 }
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
     }
@@ -276,8 +307,7 @@ async function checkFailedBuckarooPayments() {
     if (payments.length === 0) {
         didCheckBuckaroo = true;
         lastBuckarooId = '';
-    }
-    else {
+    } else {
         lastBuckarooId = payments[payments.length - 1].id;
     }
 }
@@ -325,56 +355,6 @@ async function checkReservedUntil() {
     }
 }
 
-let lastDripCheck: Date | null = null;
-let lastDripId = '';
-async function checkDrips() {
-    if (STAMHOOFD.environment === 'development') {
-        return;
-    }
-
-    if (STAMHOOFD.userMode === 'platform') {
-        return;
-    }
-
-    if (lastDripCheck && lastDripCheck > new Date(new Date().getTime() - 6 * 60 * 60 * 1000)) {
-        console.log('Skip Drip check');
-        return;
-    }
-
-    // Only send emails between 8:00 - 18:00 CET
-    const CETTime = Formatter.timeIso(new Date());
-    if ((CETTime < '08:00' || CETTime > '18:00') && STAMHOOFD.environment === 'production') {
-        console.log('Skip Drip check: outside hours');
-        return;
-    }
-
-    const organizations = await Organization.where({ id: { sign: '>', value: lastDripId } }, {
-        limit: STAMHOOFD.environment === 'production' ? 30 : 100,
-        sort: ['id'],
-    });
-
-    if (organizations.length == 0) {
-        // Wait before starting again
-        lastDripId = '';
-        lastDripCheck = new Date();
-        return;
-    }
-
-    console.log('Checking drips...');
-
-    for (const organization of organizations) {
-        console.log(organization.name);
-        try {
-            await organization.checkDrips();
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-
-    lastDripId = organizations[organizations.length - 1].id;
-}
-
 registerCron('checkSettlements', checkSettlements);
 registerCron('checkExpirationEmails', checkExpirationEmails);
 registerCron('checkReservedUntil', checkReservedUntil);
@@ -382,7 +362,7 @@ registerCron('checkDNS', checkDNS);
 registerCron('checkWebshopDNS', checkWebshopDNS);
 registerCron('checkPayments', checkPayments);
 registerCron('checkOldPayments', checkOldPayments);
-registerCron('checkDrips', checkDrips);
+registerCron('checkOldDirectDebitPayments', checkOldDirectDebitPayments);
 
 // Register other crons
 import './crons/index.js';

package/src/debug.ts

@@ -10,8 +10,10 @@ import { SQLLogger } from '@stamhoofd/sql';
 import { ContextInstance } from './helpers/Context.js';
 
 export function loadDebugFunctions({ routerServer }: { routerServer: RouterServer }) {
-    SQLLogger.slowQueryThresholdMs = 75;
-    SQLLogger.explainAllAndLogInefficient = true;
+    if (process.env.LOG_SLOW_QUERIES) {
+        SQLLogger.slowQueryThresholdMs = 75;
+        SQLLogger.explainAllAndLogInefficient = true;
+    }
 
     if (process.env.LOG_REQUEST_QUERIES) {
         loadRequestQueries({ routerServer });

package/src/email-recipient-loaders/documents.ts

@@ -1,6 +1,6 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { LimitedFilteredRequest} from '@stamhoofd/structures';
+import type { LimitedFilteredRequest } from '@stamhoofd/structures';
 import { EmailRecipient, EmailRecipientFilterType, PaginatedResponse, Replacement } from '@stamhoofd/structures';
 import { GetDocumentsEndpoint } from '../endpoints/organization/dashboard/documents/GetDocumentsEndpoint.js';
 

package/src/email-recipient-loaders/members.ts

@@ -1,6 +1,6 @@
 import { Email } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { EmailRecipient, LimitedFilteredRequest, MembersBlob} from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, MembersBlob } from '@stamhoofd/structures';
 import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';
 

package/src/email-recipient-loaders/payments.ts

@@ -1,4 +1,4 @@
-import type { RecipientLoader} from '@stamhoofd/models';
+import type { RecipientLoader } from '@stamhoofd/models';
 import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Order, Organization, Payment, User, Webshop } from '@stamhoofd/models';
 import { compileToSQLFilter, SQL } from '@stamhoofd/sql';
 import type { LimitedFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
@@ -14,15 +14,6 @@ type BeforeFetchAllResult = {
     areAllPaymentsTransfers: boolean;
 };
 
-async function fetchPaymentRecipients(query: LimitedFilteredRequest, subfilter: StamhoofdFilter, beforeFetchAllResult?: BeforeFetchAllResult) {
-    const result = await GetPaymentsEndpoint.buildData(query);
-
-    return new PaginatedResponse({
-        results: await getRecipients(result, EmailRecipientFilterType.Payment, subfilter, beforeFetchAllResult),
-        next: result.next,
-    });
-}
-
 const paymentRecipientLoader: RecipientLoader<BeforeFetchAllResult> = {
     beforeFetchAll: async (query: LimitedFilteredRequest) => {
         const doesIncludePaymentWithoutOrders = await doesQueryIncludePaymentsWithoutOrder(query);
@@ -39,9 +30,9 @@ const paymentRecipientLoader: RecipientLoader<BeforeFetchAllResult> = {
         const q = await GetPaymentsEndpoint.buildQuery(query);
         const base = await q.count();
 
-        if (base < 1000) {
+        if (base < 100) {
             // Do full scan
-            query.limit = 1000;
+            query.limit = 100;
             const result = await fetchPaymentRecipients(query, _subfilter);
             return result.results.length;
         }
@@ -52,6 +43,36 @@ const paymentRecipientLoader: RecipientLoader<BeforeFetchAllResult> = {
 
 Email.recipientLoaders.set(EmailRecipientFilterType.Payment, paymentRecipientLoader);
 
+const paymentOrganizationRecipientLoader: RecipientLoader<BeforeFetchAllResult> = {
+    fetch: async (query: LimitedFilteredRequest, subfilter: StamhoofdFilter | null, beforeFetchAllResult) => fetchPaymentOrganizationRecipients(query, subfilter, beforeFetchAllResult),
+
+    // For now: only count the number of payments - not the amount of emails
+    count: async (query: LimitedFilteredRequest, _subfilter) => {
+        const q = await GetPaymentsEndpoint.buildQuery(query);
+        const base = await q.count();
+
+        if (base < 100) {
+            // Do full scan
+            query.limit = 100;
+            const result = await fetchPaymentOrganizationRecipients(query, _subfilter);
+            return result.results.length;
+        }
+
+        return base;
+    },
+};
+
+Email.recipientLoaders.set(EmailRecipientFilterType.PaymentOrganization, paymentOrganizationRecipientLoader);
+
+async function fetchPaymentRecipients(query: LimitedFilteredRequest, subfilter: StamhoofdFilter, beforeFetchAllResult?: BeforeFetchAllResult) {
+    const result = await GetPaymentsEndpoint.buildData(query);
+
+    return new PaginatedResponse({
+        results: await getRecipients(result, EmailRecipientFilterType.Payment, subfilter, beforeFetchAllResult),
+        next: result.next,
+    });
+}
+
 async function doesQueryIncludePaymentsWithoutOrder(filterRequest: LimitedFilteredRequest) {
     // create count request (without limit and page filter)
     const countRequest = new CountFilteredRequest({
@@ -113,17 +134,6 @@ async function fetchPaymentOrganizationRecipients(query: LimitedFilteredRequest,
     });
 }
 
-const paymentOrganizationRecipientLoader: RecipientLoader<BeforeFetchAllResult> = {
-    fetch: async (query: LimitedFilteredRequest, subfilter: StamhoofdFilter | null, beforeFetchAllResult) => fetchPaymentOrganizationRecipients(query, subfilter, beforeFetchAllResult),
-    // For now: only count the number of payments - not the amount of emails
-    count: async (query: LimitedFilteredRequest, subfilter: StamhoofdFilter | null) => {
-        const q = await GetPaymentsEndpoint.buildQuery(query);
-        return await q.count();
-    },
-};
-
-Email.recipientLoaders.set(EmailRecipientFilterType.PaymentOrganization, paymentOrganizationRecipientLoader);
-
 async function getRecipients(result: PaginatedResponse<PaymentGeneral[], LimitedFilteredRequest>, type: EmailRecipientFilterType.Payment | EmailRecipientFilterType.PaymentOrganization, subFilter: StamhoofdFilter | null, beforeFetchAllResult: BeforeFetchAllResult | undefined) {
     const recipients: EmailRecipient[] = [];
     const userIds: { userId: string; payment: PaymentGeneral }[] = [];
@@ -196,8 +206,7 @@ async function getRecipients(result: PaginatedResponse<PaymentGeneral[], Limited
         recipients.push(...await getUserRecipients(userIds, replacementOptions));
         recipients.push(...await getMemberRecipients(memberIds, replacementOptions));
         recipients.push(...await getOrderRecipients(orderIds, replacementOptions));
-    }
-    else {
+    } else {
         recipients.push(...await getOrganizationRecipients(organizationIds, replacementOptions, subFilter));
     }
 
@@ -263,8 +272,7 @@ async function getMembersForOrganizations(organizationIds: string[], filter: Sta
         const membersForOrganization = result.get(organizationId);
         if (membersForOrganization) {
             membersForOrganization.push(member);
-        }
-        else {
+        } else {
             result.set(organizationId, [member]);
         }
     }
@@ -273,7 +281,7 @@ async function getMembersForOrganizations(organizationIds: string[], filter: Sta
 }
 
 async function getOrganizationRecipients(ids: { organizationId: string; payment: PaymentGeneral }[], replacementOptions: ReplacementsOptions, subFilter: StamhoofdFilter | null): Promise<EmailRecipient[]> {
-    if (ids.length === 0 || subFilter === null) {
+    if (ids.length === 0) {
         return [];
     }
 
@@ -287,32 +295,65 @@ async function getOrganizationRecipients(ids: { organizationId: string; payment:
         organizationMap.set(organization.id, organization);
     }
 
-    const membersForOrganizations = await getMembersForOrganizations(allOrganizationIds, subFilter);
-
     const results: EmailRecipient[] = [];
 
-    for (const { organizationId, payment } of ids) {
-        const organization = organizationMap.get(organizationId);
+    if (subFilter === null) {
+        // Use full admins instead
+        const admins = await User.getAdmins(allOrganizationIds, { verified: true });
+        for (const { organizationId, payment } of ids) {
+            const organization = organizationMap.get(organizationId);
+            if (!organization) {
+                continue;
+            }
+            const users = admins.filter(a => a.permissions?.forOrganization(organization)?.hasFullAccess());
 
-        if (organization) {
-            const members = membersForOrganizations.get(organizationId);
-            if (!members) {
+            if (users.length === 0) {
+                console.warn('No admins found for organization with id ', organizationId, ' while fetching email recipients for payment with id ', payment.id);
                 continue;
             }
 
             const replacements = getEmailReplacementsForPayment(payment, replacementOptions);
 
-            for (const member of members) {
-                for (const email of member.details.getNotificationEmails()) {
-                    results.push(EmailRecipient.create({
-                        objectId: payment.id,
-                        name: organization.name,
-                        memberId: member.id,
-                        firstName: member.details.firstName,
-                        lastName: member.details.lastName,
-                        email,
-                        replacements,
-                    }));
+            for (const user of users) {
+                results.push(EmailRecipient.create({
+                    objectId: payment.id,
+                    name: organization.name,
+                    userId: user.id,
+                    firstName: user.firstName,
+                    lastName: user.lastName,
+                    email: user.email,
+                    replacements,
+                }));
+            }
+        }
+    } else {
+        const membersForOrganizations = await getMembersForOrganizations(allOrganizationIds, subFilter);
+
+        for (const { organizationId, payment } of ids) {
+            const organization = organizationMap.get(organizationId);
+
+            if (organization) {
+                const members = membersForOrganizations.get(organizationId);
+                if (!members || members.length === 0) {
+                    // Use admins by default
+
+                    continue;
+                }
+
+                const replacements = getEmailReplacementsForPayment(payment, replacementOptions);
+
+                for (const member of members) {
+                    for (const email of member.details.getNotificationEmails()) {
+                        results.push(EmailRecipient.create({
+                            objectId: payment.id,
+                            name: organization.name,
+                            memberId: member.id,
+                            firstName: member.details.firstName,
+                            lastName: member.details.lastName,
+                            email,
+                            replacements,
+                        }));
+                    }
                 }
             }
         }

package/src/email-recipient-loaders/registrations.ts

@@ -1,6 +1,6 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import type { EmailRecipient, LimitedFilteredRequest, RegistrationsBlob} from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, RegistrationsBlob } from '@stamhoofd/structures';
 import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
 import { memberJoin } from '../sql-filters/registrations.js';

package/src/email-replacements/getEmailReplacementsForPayment.ts

@@ -1,5 +1,5 @@
 import { Order, Organization, Webshop } from '@stamhoofd/models';
-import type { BalanceItemPaymentsHtmlTableItem, PaymentGeneral} from '@stamhoofd/structures';
+import type { BalanceItemPaymentsHtmlTableItem, PaymentGeneral } from '@stamhoofd/structures';
 import { BalanceItemRelationType, BalanceItemType, getBalanceItemPaymentsHtmlTable, PaymentMethod, PaymentMethodHelper, Replacement, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { createOrderDataHTMLTable } from '../helpers/email-html-helpers.js';
@@ -106,8 +106,7 @@ export function getEmailReplacementsForPayment(payment: PaymentGeneral, options:
                 });
                 paymentUrl = 'https://' + webshopStruct.getUrl(organization) + '/order/' + (singleOrder.id);
             }
-        }
-        else {
+        } else {
             // Fallback (should not happen, but better than leaving {{orderUrl}} in place)
             orderUrlReplacement = Replacement.create({
                 token: 'orderUrl',
@@ -221,12 +220,10 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                                     webshop: webshop.meta.name,
                                     orderNumber: order.number ?? '',
                                 }));
-                            }
-                            else {
+                            } else {
                                 overviewContext.add(webshop.meta.name);
                             }
-                        }
-                        else {
+                        } else {
                             overviewContext.add($t('%1L0', {
                                 orderNumber: order.number ?? '',
                             }));
@@ -239,8 +236,7 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                 const memberName = balanceItem.relations.get(BalanceItemRelationType.Member)?.name.toString();
                 if (memberName) {
                     registrationMemberNames.add(memberName);
-                }
-                else {
+                } else {
                     overviewContext.add(balanceItem.itemTitle);
                 }
 

package/src/endpoints/admin/members/ChargeMembersEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';

package/src/endpoints/admin/memberships/ChargeMembershipsEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';

package/src/endpoints/admin/memberships/GetChargeMembershipsSummaryEndpoint.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 { Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
@@ -107,8 +107,7 @@ export class GetChargeMembershipsSummaryEndpoint extends Endpoint<Params, Query,
 
         if (!trial) {
             query.where(noTrial);
-        }
-        else {
+        } else {
             query.whereNot(noTrial);
         }
 
@@ -174,8 +173,7 @@ export class GetChargeMembershipsSummaryEndpoint extends Endpoint<Params, Query,
 
         if (!trial) {
             query.where(trialQ);
-        }
-        else {
+        } else {
             query.whereNot(trialQ);
         }
 

package/src/endpoints/admin/organizations/ChargeOrganizationsEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest } from '@stamhoofd/structures';

package/src/endpoints/admin/organizations/GetOrganizationsCountEndpoint.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/admin/organizations/GetOrganizationsEndpoint.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 { Organization } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import type { CountFilteredRequest, Organization as OrganizationStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import type { CountFilteredRequest, Organization as OrganizationStruct, StamhoofdFilter } from '@stamhoofd/structures';
 import { LimitedFilteredRequest, PaginatedResponse, PermissionLevel, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
@@ -76,9 +76,16 @@ export class GetOrganizationsEndpoint extends Endpoint<Params, Query, Body, Resp
 
             // todo: auto detect e-mailaddresses and search on admins
             searchFilter = {
-                name: {
-                    $contains: q.search,
-                },
+                $or: [
+                    {
+                        name: {
+                            $contains: q.search,
+                        },
+                    },
+                    {
+                        uri: q.search,
+                    },
+                ],
             };
 
             if (searchFilter) {
@@ -125,8 +132,7 @@ export class GetOrganizationsEndpoint extends Endpoint<Params, Query, Body, Resp
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',

package/src/endpoints/admin/organizations/PatchOrganizationsEndpoint.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 { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
@@ -133,8 +133,7 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
             if (STAMHOOFD.userMode === 'platform') {
                 const periodId = (await Platform.getShared()).periodIdIfPlatform;
                 organization.periodId = periodId;
-            }
-            else {
+            } else {
                 period = new RegistrationPeriod();
                 period.configureForNewOrganization();
                 await period.save();
@@ -147,8 +146,7 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
 
             try {
                 await organization.save();
-            }
-            catch (e) {
+            } catch (e) {
                 console.error(e);
                 throw new SimpleError({
                     code: 'creating_organization',