@stamhoofd/backend 2.39.0 → 2.40.0

package/src/helpers/StripePayoutChecker.ts

@@ -1,38 +1,37 @@
-import {Order, Payment, StripeCheckoutSession, StripePaymentIntent} from "@stamhoofd/models";
-import { Settlement } from "@stamhoofd/structures";
-import Stripe from "stripe";
+import { Order, Payment, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
+import { Settlement } from '@stamhoofd/structures';
+import Stripe from 'stripe';
 
 export class StripePayoutChecker {
     private stripe: Stripe;
     private stripePlatform: Stripe;
 
-    constructor({secretKey, stripeAccount}: { secretKey: string, stripeAccount?: string}) {
+    constructor({ secretKey, stripeAccount }: { secretKey: string; stripeAccount?: string }) {
         this.stripe = new Stripe(
             secretKey, {
-                apiVersion: '2024-06-20', 
-                typescript: true, 
-                maxNetworkRetries: 1, 
+                apiVersion: '2024-06-20',
+                typescript: true,
+                maxNetworkRetries: 1,
                 timeout: 10000,
-                stripeAccount
-        });
+                stripeAccount,
+            });
 
         this.stripePlatform = new Stripe(
             secretKey, {
-                apiVersion: '2024-06-20', 
-                typescript: true, 
-                maxNetworkRetries: 1, 
-                timeout: 10000
-        });
-
+                apiVersion: '2024-06-20',
+                typescript: true,
+                maxNetworkRetries: 1,
+                timeout: 10000,
+            });
     }
 
     async checkSettlements(checkAll = false) {
-         // Check last 2 weeks + 3 day margin, unless we check them all
-        const d = new Date()
-        d.setDate(d.getDate() - 17)
+        // Check last 2 weeks + 3 day margin, unless we check them all
+        const d = new Date();
+        d.setDate(d.getDate() - 17);
 
         if (checkAll) {
-            d.setFullYear(2022, 11, 1)
+            d.setFullYear(2022, 11, 1);
         }
 
         // Loop all payouts
@@ -41,26 +40,26 @@ export class StripePayoutChecker {
             for await (const payout of this.stripe.payouts.list({
                 status: 'paid',
                 arrival_date: {
-                    gte: Math.floor(d.getTime() / 1000)
-                }
+                    gte: Math.floor(d.getTime() / 1000),
+                },
             })) {
                 // Get all payments for this payout
                 await this.fetchBalanceItems(payout);
             }
-
-        } catch (e) {
-            console.error(e)
+        }
+        catch (e) {
+            console.error(e);
         }
     }
 
     private async fetchBalanceItems(payout: Stripe.Payout) {
         // For the given payout, fetch all balance items
         const params = {
-            payout: payout.id, 
+            payout: payout.id,
             // Via the Application Fee object, we can get the original payment metadata
             expand: ['data.source', 'data.source.application_fee', 'data.source.application_fee.originating_transaction'],
             // TODO: ALSO DO CARDS! (type: 'charge')
-            //type: 'payment'
+            // type: 'payment'
         };
 
         for await (const balanceItem of this.stripe.balanceTransactions.list(params)) {
@@ -79,7 +78,7 @@ export class StripePayoutChecker {
             return;
         }
         if (balanceItem.source.object !== 'charge') {
-            console.log("No payment id set for charge " + balanceItem.source.id)
+            console.log('No payment id set for charge ' + balanceItem.source.id);
             return;
         }
 
@@ -99,67 +98,68 @@ export class StripePayoutChecker {
                         // Try to look it up by payment intent id
 
                         if (originatingTransaction.payment_intent) {
-                            const paymentIntentId = typeof originatingTransaction.payment_intent === 'string' ? originatingTransaction.payment_intent : originatingTransaction.payment_intent.id
+                            const paymentIntentId = typeof originatingTransaction.payment_intent === 'string' ? originatingTransaction.payment_intent : originatingTransaction.payment_intent.id;
                             const stripePayments = await StripePaymentIntent.where({
-                                stripeIntentId: paymentIntentId
-                            }, {limit: 1});
+                                stripeIntentId: paymentIntentId,
+                            }, { limit: 1 });
 
                             if (stripePayments.length === 1) {
                                 paymentId = stripePayments[0].paymentId;
-                                console.log("Found missing payment metadata for payment intent "+originatingTransaction.payment_intent, paymentId)
-                            } else {
+                                console.log('Found missing payment metadata for payment intent ', originatingTransaction.payment_intent, paymentId);
+                            }
+                            else {
                                 // Probably a card payment
                                 // Search for the checkout session
                                 const checkoutSession = await this.stripePlatform.checkout.sessions.list({
-                                    payment_intent: paymentIntentId
-                                })
+                                    payment_intent: paymentIntentId,
+                                });
                                 if (checkoutSession.data.length === 1) {
                                     const session = checkoutSession.data[0];
-                                    console.log("Found checkout session for payment intent ", paymentIntentId, session)
+                                    console.log('Found checkout session for payment intent ', paymentIntentId, session);
 
                                     // Search
                                     const stripeCheckoutSessions = await StripeCheckoutSession.where({
-                                        stripeSessionId: session.id
-                                    }, {limit: 1});
+                                        stripeSessionId: session.id,
+                                    }, { limit: 1 });
 
                                     if (stripeCheckoutSessions.length === 1) {
                                         paymentId = stripeCheckoutSessions[0].paymentId;
-                                        console.log("Found missing payment metadata for payment intent "+originatingTransaction.payment_intent, paymentId)
-                                    } else {
-                                        console.log("No payment found for checkout session "+session.id)
+                                        console.log('Found missing payment metadata for payment intent ', originatingTransaction.payment_intent, paymentId);
+                                    }
+                                    else {
+                                        console.log('No payment found for checkout session ' + session.id);
                                     }
-                                } else {
-                                    console.log("No Stripe Checkout Sessions found for payment intent "+paymentIntentId)    
+                                }
+                                else {
+                                    console.log('No Stripe Checkout Sessions found for payment intent ' + paymentIntentId);
                                 }
                             }
                         }
                     }
                 }
-
-                
             }
         }
 
         if (!paymentId) {
-            console.log(balanceItem)
-            console.log("No payment id set for charge " + balanceItem.source.id)
+            console.log(balanceItem);
+            console.log('No payment id set for charge ' + balanceItem.source.id);
             return;
         }
 
         const applicationFee = balanceItem.source.application_fee_amount;
-        const otherFees = balanceItem.fee
+        const otherFees = balanceItem.fee;
         const totalFees = otherFees + (applicationFee ?? 0);
 
         // Cool, we can store this in the database now.
 
         const payment = await Payment.getByID(paymentId);
         if (!payment) {
-            console.log("Invalid payment id set for charge " + balanceItem.source.id+': '+paymentId)
+            console.log('Invalid payment id set for charge ' + balanceItem.source.id + ': ' + paymentId);
             return;
         }
 
         if (payment.price !== balanceItem.amount) {
-            console.log("Amount mismatch for payment " + payment.id+': '+payment.price+' !== '+balanceItem.amount)
+            console.log('Amount mismatch for payment ' + payment.id + ': ' + payment.price + ' !== ' + balanceItem.amount);
             return;
         }
 
@@ -169,7 +169,7 @@ export class StripePayoutChecker {
             settledAt: new Date(payout.arrival_date * 1000),
             amount: payout.amount,
             // Set only if application fee is witheld
-            fee: totalFees
+            fee: totalFees,
         });
 
         payment.settlement = settlement;
@@ -177,7 +177,7 @@ export class StripePayoutChecker {
 
         // Force an updatedAt timestamp of the related order
         // Mark order as 'updated', or the frontend won't pull in the updates
-        const order = await Order.getForPayment(null, payment.id)
+        const order = await Order.getForPayment(null, payment.id);
         if (order) {
             order.updatedAt = new Date();
             order.forceSaveProperty('updatedAt');
@@ -186,5 +186,4 @@ export class StripePayoutChecker {
 
         await payment.save();
     }
-
 }

package/src/helpers/ViesHelper.ts

@@ -7,26 +7,25 @@ import * as jsvat from 'jsvat-next'; // has no default export, so we need the wi
 export class ViesHelperStatic {
     testMode = false;
 
-    async request(method: "GET" | "POST", url: string, content: any) {
+    async request(method: 'GET' | 'POST', url: string, content: any) {
+        const json = content ? JSON.stringify(content) : '';
 
-        const json = content ? JSON.stringify(content) : "";
-
-        console.log("[VIES REQUEST]", method, url, content ? "\n [VIES REQUEST] " : undefined, json)
+        console.log('[VIES REQUEST]', method, url, content ? '\n [VIES REQUEST] ' : undefined, json);
 
         const response = await axios.request({
             method,
             url,
             headers: {
-                'Content-Type': json.length > 0 ? 'application/json' : "text/plain",
+                'Content-Type': json.length > 0 ? 'application/json' : 'text/plain',
             },
-            data: json
-            
-        })
-        console.log("[VIES RESPONSE]", method, url, "\n[VIES RESPONSE]", JSON.stringify(response.data))
-        return response.data
+            data: json,
+
+        });
+        console.log('[VIES RESPONSE]', method, url, '\n[VIES RESPONSE]', JSON.stringify(response.data));
+        return response.data;
     }
 
-    async checkCompany(company: Company, patch: AutoEncoderPatchType<Company>|Company) {
+    async checkCompany(company: Company, patch: AutoEncoderPatchType<Company> | Company) {
         if (!company.address) {
             // Not allowed to set
             patch.companyNumber = null;
@@ -36,32 +35,33 @@ export class ViesHelperStatic {
 
         if (company.VATNumber !== null) {
             // Changed VAT number
-            patch.VATNumber = await ViesHelper.checkVATNumber(company.address.country, company.VATNumber)
+            patch.VATNumber = await ViesHelper.checkVATNumber(company.address.country, company.VATNumber);
 
             if (company.address.country === Country.Belgium) {
-                patch.companyNumber = company.VATNumber
+                patch.companyNumber = company.VATNumber;
             }
         }
 
         if (company.companyNumber) {
             if (company.VATNumber !== null && company.address.country === Country.Belgium) {
                 // Already validated
-            } else {
+            }
+            else {
                 // Need to validate
-                const result = await ViesHelper.checkCompanyNumber(company.address.country, company.companyNumber)
-                patch.companyNumber = result.companyNumber
+                const result = await ViesHelper.checkCompanyNumber(company.address.country, company.companyNumber);
+                patch.companyNumber = result.companyNumber;
                 if (result.VATNumber !== undefined) {
-                    patch.VATNumber = result.VATNumber
+                    patch.VATNumber = result.VATNumber;
                 }
             }
         }
     }
 
-    async checkCompanyNumber(country: Country, companyNumber: string): Promise<{companyNumber: string|null, VATNumber?: string|null}> {
+    async checkCompanyNumber(country: Country, companyNumber: string): Promise<{ companyNumber: string | null; VATNumber?: string | null }> {
         if (country !== Country.Belgium) {
             // Not supported
             return {
-                companyNumber
+                companyNumber,
             };
         }
 
@@ -71,10 +71,10 @@ export class ViesHelperStatic {
 
         if (!result.isValid) {
             throw new SimpleError({
-                "code": "invalid_field",
-                "message": "Ongeldig ondernemingsnummer: " + companyNumber,
-                "field": "companyNumber"
-            })
+                code: 'invalid_field',
+                message: 'Ongeldig ondernemingsnummer: ' + companyNumber,
+                field: 'companyNumber',
+            });
         }
 
         // If this is a valid VAT number, we can assume it's a valid company number
@@ -84,12 +84,14 @@ export class ViesHelperStatic {
             // this is a VAT number, not a company number
             return {
                 companyNumber: corrected,
-                VATNumber: corrected
-            }
-        } catch (e) {
+                VATNumber: corrected,
+            };
+        }
+        catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 // Ignore: normal that it is not a valid VAT number
-            } else {
+            }
+            else {
                 // Other errors should be thrown
                 throw e;
             }
@@ -99,7 +101,7 @@ export class ViesHelperStatic {
             companyNumber: result.value ?? companyNumber,
 
             // VATNumber should always be set to null if it is not a valid VAT number
-            VATNumber: null
+            VATNumber: null,
         };
     }
 
@@ -108,34 +110,35 @@ export class ViesHelperStatic {
 
         if (!result.isValid) {
             throw new SimpleError({
-                "code": "invalid_field",
-                "message": "Ongeldig BTW-nummer: " + vatNumber,
-                "field": "VATNumber"
-            })
-        } 
+                code: 'invalid_field',
+                message: 'Ongeldig BTW-nummer: ' + vatNumber,
+                field: 'VATNumber',
+            });
+        }
 
         const formatted = result.value ?? vatNumber;
 
         try {
-            const cleaned = formatted.substring(2).replace(/(\.\-\s)+/g, "")
-            const response = await this.request("POST", "https://ec.europa.eu/taxation_customs/vies/rest-api/check-vat-number", {
+            const cleaned = formatted.substring(2).replace(/(\.-\s)+/g, '');
+            const response = await this.request('POST', 'https://ec.europa.eu/taxation_customs/vies/rest-api/check-vat-number', {
                 countryCode: country,
-                vatNumber: cleaned
+                vatNumber: cleaned,
             });
 
             if (typeof response !== 'object' || response === null || typeof response.valid !== 'boolean') {
                 // APi error
-                throw new Error("Invalid response from VIES")
+                throw new Error('Invalid response from VIES');
             }
-            
+
             if (!response.valid) {
                 throw new SimpleError({
-                    "code": "invalid_field",
-                    "message": "Het opgegeven BTW-nummer is ongeldig of niet BTW-plichtig: " + formatted,
-                    "field": "VATNumber"
-                })
+                    code: 'invalid_field',
+                    message: 'Het opgegeven BTW-nummer is ongeldig of niet BTW-plichtig: ' + formatted,
+                    field: 'VATNumber',
+                });
             }
-        } catch (e) {
+        }
+        catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 throw e;
             }
@@ -145,7 +148,6 @@ export class ViesHelperStatic {
 
         return formatted;
     }
-
 }
 
 export const ViesHelper = new ViesHelperStatic();

package/src/helpers/fetchToAsyncIterator.ts

@@ -1,33 +1,33 @@
-import { IPaginatedResponse, LimitedFilteredRequest } from "@stamhoofd/structures";
+import { IPaginatedResponse, LimitedFilteredRequest } from '@stamhoofd/structures';
 
 export function fetchToAsyncIterator<T>(
-    initialFilter: LimitedFilteredRequest, 
+    initialFilter: LimitedFilteredRequest,
     loader: {
-        fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T, LimitedFilteredRequest>>
-    }
+        fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T, LimitedFilteredRequest>>;
+    },
 ): AsyncIterable<T> {
     return {
         [Symbol.asyncIterator]: function () {
-            let request: LimitedFilteredRequest|null = initialFilter
+            let request: LimitedFilteredRequest | null = initialFilter;
 
             return {
                 async next(): Promise<IteratorResult<T, undefined>> {
                     if (!request) {
                         return {
                             done: true,
-                            value: undefined
-                        }
+                            value: undefined,
+                        };
                     }
 
                     const response = await loader.fetch(request);
                     request = response.next ?? null;
-                    
+
                     return {
                         done: false,
-                        value: response.results
-                    }
-                }
-            }
-        }
-    }
+                        value: response.results,
+                    };
+                },
+            };
+        },
+    };
 }

package/src/helpers/xlsxAddressTransformerColumnFactory.ts

@@ -1,14 +1,14 @@
-import { XlsxTransformerColumn } from "@stamhoofd/excel-writer";
-import { Address, CountryHelper, MemberWithRegistrationsBlob, Parent, ParentTypeHelper } from "@stamhoofd/structures";
+import { XlsxTransformerColumn } from '@stamhoofd/excel-writer';
+import { Address, CountryHelper, MemberWithRegistrationsBlob, Parent, ParentTypeHelper } from '@stamhoofd/structures';
 
 export class XlsxTransformerColumnHelper {
     static formatBoolean(value: boolean | undefined | null): string {
-        if(value === true) {
-            return "Ja";
+        if (value === true) {
+            return 'Ja';
         }
 
-        if(value === false) {
-            return 'Nee'
+        if (value === false) {
+            return 'Nee';
         }
 
         return '';
@@ -18,13 +18,13 @@ export class XlsxTransformerColumnHelper {
         return [
             ...this.createColumnsForParent(0),
             ...this.createColumnsForParent(1),
-        ]
+        ];
     }
 
-    static createColumnsForAddresses<T>({limit, getAddresses, matchIdStart, identifier}: {limit: number, getAddresses: (object: T) => Address[], matchIdStart: string, identifier: string}): XlsxTransformerColumn<unknown>[] {
+    static createColumnsForAddresses<T>({ limit, getAddresses, matchIdStart, identifier }: { limit: number; getAddresses: (object: T) => Address[]; matchIdStart: string; identifier: string }): XlsxTransformerColumn<unknown>[] {
         const result: XlsxTransformerColumn<unknown>[] = [];
 
-        for(let i = 0; i <= limit; i++) {
+        for (let i = 0; i <= limit; i++) {
             const column = this.createAddressColumns({
                 matchId: `${matchIdStart}.${i}`,
                 getAddress: (object: T) => getAddresses(object)[i],
@@ -38,13 +38,13 @@ export class XlsxTransformerColumnHelper {
     }
 
     static createColumnsForParent(parentIndex: number): XlsxTransformerColumn<unknown>[] {
-        const getParent = (member: MemberWithRegistrationsBlob): Parent | null | undefined => member.details.parents[parentIndex]; 
+        const getParent = (member: MemberWithRegistrationsBlob): Parent | null | undefined => member.details.parents[parentIndex];
 
         const parentNumber = parentIndex + 1;
 
-        const identifier = `Ouder ${parentNumber}`
+        const identifier = `Ouder ${parentNumber}`;
         const getId = (value: string) => `parent.${parentIndex}.${value}`;
-        const getName = (value: string) => `${identifier} - ${value}`
+        const getName = (value: string) => `${identifier} - ${value}`;
 
         return [
             {
@@ -55,61 +55,61 @@ export class XlsxTransformerColumnHelper {
                     const parent = getParent(member);
 
                     return {
-                        value: parent ? ParentTypeHelper.getName(parent.type) : ''
-                    }
-                }
+                        value: parent ? ParentTypeHelper.getName(parent.type) : '',
+                    };
+                },
             },
             {
                 id: getId('firstName'),
                 name: getName('Voornaam'),
                 width: 20,
                 getValue: (member: MemberWithRegistrationsBlob) => ({
-                    value: getParent(member)?.firstName ?? ''
-                })
+                    value: getParent(member)?.firstName ?? '',
+                }),
             },
             {
                 id: getId('lastName'),
                 name: getName('Achternaam'),
                 width: 20,
                 getValue: (member: MemberWithRegistrationsBlob) => ({
-                    value: getParent(member)?.lastName ?? ''
-                })
+                    value: getParent(member)?.lastName ?? '',
+                }),
             },
             {
                 id: getId('phone'),
                 name: getName('Telefoonnummer'),
                 width: 20,
                 getValue: (member: MemberWithRegistrationsBlob) => ({
-                    value: getParent(member)?.phone ?? ''
-                })
+                    value: getParent(member)?.phone ?? '',
+                }),
             },
             {
                 id: getId('email'),
                 name: getName('E-mailadres'),
                 width: 20,
                 getValue: (member: MemberWithRegistrationsBlob) => ({
-                    value: getParent(member)?.email ?? ''
-                })
+                    value: getParent(member)?.email ?? '',
+                }),
             },
             XlsxTransformerColumnHelper.createAddressColumns<MemberWithRegistrationsBlob>({
                 matchId: getId('address'),
-                getAddress: (member) => getParent(member)?.address,
-                identifier: getName('Adres')
+                getAddress: member => getParent(member)?.address,
+                identifier: getName('Adres'),
             }),
-        ]
+        ];
     }
 
-    static createAddressColumns<T>({matchId, identifier, getAddress} : {matchId: string, identifier?: string, getAddress: (object: T) => Address | null | undefined}): XlsxTransformerColumn<T> {
+    static createAddressColumns<T>({ matchId, identifier, getAddress }: { matchId: string; identifier?: string; getAddress: (object: T) => Address | null | undefined }): XlsxTransformerColumn<T> {
         const getId = (value: string) => matchId + '.' + value;
         const identifierText = identifier ? `${identifier} - ` : '';
         const getName = (value: string) => {
-            const name =`${identifierText}${value}`;
+            const name = `${identifierText}${value}`;
             return name[0].toUpperCase() + name.slice(1);
         };
-    
+
         return {
             match: (id) => {
-                if(id === matchId) {
+                if (id === matchId) {
                     return [
                         {
                             id: getId('street'),
@@ -118,9 +118,9 @@ export class XlsxTransformerColumnHelper {
                             getValue: (object: T) => {
                                 const address = getAddress(object);
                                 return {
-                                    value: address?.street || ''
-                                }
-                            }
+                                    value: address?.street || '',
+                                };
+                            },
                         },
                         {
                             id: getId('number'),
@@ -129,9 +129,9 @@ export class XlsxTransformerColumnHelper {
                             getValue: (object: T) => {
                                 const address = getAddress(object);
                                 return {
-                                    value: address?.number || ''
-                                }
-                            }
+                                    value: address?.number || '',
+                                };
+                            },
                         },
                         {
                             id: getId('postalCode'),
@@ -140,9 +140,9 @@ export class XlsxTransformerColumnHelper {
                             getValue: (object: T) => {
                                 const address = getAddress(object);
                                 return {
-                                    value: address?.postalCode || ''
-                                }
-                            }
+                                    value: address?.postalCode || '',
+                                };
+                            },
                         },
                         {
                             id: getId('city'),
@@ -151,9 +151,9 @@ export class XlsxTransformerColumnHelper {
                             getValue: (object: T) => {
                                 const address = getAddress(object);
                                 return {
-                                    value: address?.city || ''
-                                }
-                            }
+                                    value: address?.city || '',
+                                };
+                            },
                         },
                         {
                             id: getId('country'),
@@ -163,15 +163,13 @@ export class XlsxTransformerColumnHelper {
                                 const address = getAddress(object);
                                 const country = address?.country;
                                 return {
-                                    value: country ? CountryHelper.getName(country) : ''
-                                }
-                            }
-                        }
-                    ]
+                                    value: country ? CountryHelper.getName(country) : '',
+                                };
+                            },
+                        },
+                    ];
                 }
-    
-            }
-        }
-    
-    }   
+            },
+        };
+    }
 }