@stamhoofd/models 2.120.6 → 2.122.0

package/dist/helpers/InvoiceCounter.js

@@ -0,0 +1,133 @@
+import { QueueHandler } from '@stamhoofd/queues';
+import { Formatter } from '@stamhoofd/utility';
+import { Invoice } from '../models/Invoice.js';
+export class InvoiceCounter {
+    static numberCache = new Map();
+    static getNextResetDate(last, resetMonth) {
+        const candidate = last.set({ month: resetMonth, day: 1 }).startOf('day');
+        return candidate > last ? candidate : candidate.plus({ years: 1 }).startOf('day');
+    }
+    static shouldStartNewSeries(settings, lastInvoiceDate, invoiceDate) {
+        if (settings.resetMonth === null) {
+            return false;
+        }
+        const last = Formatter.luxon(lastInvoiceDate);
+        const current = Formatter.luxon(invoiceDate);
+        return current >= this.getNextResetDate(last, settings.resetMonth);
+    }
+    /**
+     * XXX-123 -> 123
+     * YYY-0001 -> 1
+     *
+     * if prefix is enabled:
+     * 2025001 -> 1
+     * STA-2025001 -> 1
+     */
+    static parseNumber(settings, str) {
+        str = str.replace(/\D+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
+        // Remove prefixes and possibly year
+        const splitted = str.split('-');
+        let last = splitted[splitted.length - 1];
+        const stripYear = settings.prefixYear;
+        if (last.length) {
+            if (stripYear) {
+                if (last.length <= 4) {
+                    console.error('Could not parse invoice number from string ' + str + ' (could not trim year prefix)');
+                    return null;
+                }
+                last = last.substring(4);
+            }
+            const int = parseInt(last);
+            if (int !== 0 && !isNaN(int) && isFinite(int)) {
+                return int;
+            }
+        }
+        console.error('Could not parse invoice number from string ' + str);
+        return null;
+    }
+    static formatNumber(settings, int, invoicedAt) {
+        let str = int.toFixed(0).padStart(settings.padZeroLength, '0');
+        if (settings.prefixYear) {
+            const year = Formatter.luxon(invoicedAt).year;
+            str = year + str;
+        }
+        if (settings.fixedPrefix) {
+            if (!settings.fixedPrefix.match(/\D$/)) {
+                // Need seperation character
+                str = settings.fixedPrefix.replace(/-$/, '') + '-' + str;
+            }
+            else {
+                str = settings.fixedPrefix + str;
+            }
+        }
+        return str;
+    }
+    static async assignNextNumber(invoice, settings) {
+        const organizationId = invoice.organizationId;
+        return await QueueHandler.schedule('invoice/numbers-' + organizationId, async () => {
+            // Invoice date should be inside the queue to ensure it is chronologically generated
+            const invoicedAt = new Date();
+            const c = this.numberCache.get(organizationId);
+            if (c !== undefined) {
+                const lastNumber = c.lastNumber;
+                // check date
+                if (!this.shouldStartNewSeries(settings, c.date, invoicedAt)) {
+                    // Set and save.
+                    // we do this here because it assures we'll not increase the next number if the save fails
+                    invoice.number = this.formatNumber(settings, lastNumber + 1, invoicedAt);
+                    invoice.invoicedAt = invoicedAt;
+                    await invoice.save();
+                    // If save succeeds, increase cache:
+                    this.numberCache.set(organizationId, {
+                        lastNumber: lastNumber + 1,
+                        date: new Date(invoicedAt)
+                    });
+                    return;
+                }
+            }
+            const lastInvoice = await Invoice.select()
+                .where('organizationId', organizationId)
+                .where('number', '!=', null)
+                .where('invoicedAt', '!=', null)
+                .orderBy('invoicedAt', 'DESC')
+                .first(false);
+            if (lastInvoice && lastInvoice.number && lastInvoice.invoicedAt) {
+                // check date
+                if (!this.shouldStartNewSeries(settings, lastInvoice.invoicedAt, invoicedAt)) {
+                    const lastNumber = this.parseNumber(settings, lastInvoice.number);
+                    if (lastNumber) {
+                        invoice.number = this.formatNumber(settings, lastNumber + 1, invoicedAt);
+                        invoice.invoicedAt = invoicedAt;
+                        await invoice.save();
+                        this.numberCache.set(organizationId, {
+                            lastNumber: lastNumber + 1,
+                            date: new Date(invoicedAt)
+                        });
+                        return;
+                    }
+                }
+            }
+            // Start new
+            invoice.number = this.formatNumber(settings, 1, invoicedAt);
+            invoice.invoicedAt = invoicedAt;
+            await invoice.save();
+            this.numberCache.set(organizationId, {
+                lastNumber: 1,
+                date: new Date(invoicedAt)
+            });
+            return;
+        });
+    }
+    static async resetNumbers(organizationId) {
+        // Prevent race conditions: create a queue
+        // The queue can only run one at a time for the same webshop (so multiple webshops at the same time are allowed)
+        return await QueueHandler.schedule('invoice/numbers-' + organizationId, async () => {
+            this.numberCache.delete(organizationId);
+            return Promise.resolve();
+        });
+    }
+    static clearAll() {
+        this.numberCache.clear();
+    }
+}
+//# sourceMappingURL=InvoiceCounter.js.map

package/dist/helpers/InvoiceCounter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvoiceCounter.js","sourceRoot":"","sources":["../../src/helpers/InvoiceCounter.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from './helpers/EmailBuilder.js';
-export * from './helpers/MemberMerger.js';
 export * from './helpers/RateLimiter.js';
 export * from './helpers/WebshopCounter.js';
 export * from './models/index.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAG5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,4CAA4C,CAAC;AAG3D,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAG5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,4CAA4C,CAAC;AAG3D,cAAc,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,6 +1,5 @@
 // Helpers
 export * from './helpers/EmailBuilder.js';
-export * from './helpers/MemberMerger.js';
 export * from './helpers/RateLimiter.js';
 export * from './helpers/WebshopCounter.js';
 // Models

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAE5C,SAAS;AACT,cAAc,mBAAmB,CAAC;AAClC,cAAc,4CAA4C,CAAC;AAE3D,YAAY;AACZ,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAE5C,SAAS;AACT,cAAc,mBAAmB,CAAC;AAClC,cAAc,4CAA4C,CAAC;AAE3D,YAAY;AACZ,cAAc,sBAAsB,CAAC"}

package/dist/migrations/1605262045-import-postcodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1605262045-import-postcodes.d.ts","sourceRoot":"","sources":["../../src/migrations/1605262045-import-postcodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAInD,qBAAa,QAAS,SAAQ,cAAc;IACxC,MAAM,CAAC,KAAK,SAAe;IAK3B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,QAAQ,EAAE,MAAM,CAAC;IAGjB,sBAAsB,EAAE,MAAM,CAAC;IAG/B,aAAa,EAAE,MAAM,CAAC;IAGtB,SAAS,EAAE,MAAM,CAAC;IAGlB,IAAI,EAAG,IAAI,CAAC;CACf;;AAeD,wBA4EG"}
+{"version":3,"file":"1605262045-import-postcodes.d.ts","sourceRoot":"","sources":["../../src/migrations/1605262045-import-postcodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAInD,qBAAa,QAAS,SAAQ,cAAc;IACxC,MAAM,CAAC,KAAK,SAAe;IAK3B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,QAAQ,EAAE,MAAM,CAAC;IAGjB,sBAAsB,EAAE,MAAM,CAAC;IAG/B,aAAa,EAAE,MAAM,CAAC;IAGtB,SAAS,EAAE,MAAM,CAAC;IAGlB,IAAI,EAAG,IAAI,CAAC;CACf;;AAgBD,wBA8EG"}

package/dist/migrations/1605262045-import-postcodes.js

@@ -1,8 +1,9 @@
 import { __decorate } from "tslib";
-import { column, Migration } from '@simonbackx/simple-database';
+import { column, Database, Migration } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Country } from '@stamhoofd/types/Country';
 import { StringCompare } from '@stamhoofd/utility';
+import { v4 as uuidv4 } from 'uuid';
 import { City } from '../models/addresses/City.js';
 import { PostalCode } from '../models/addresses/PostalCode.js';
 import { Province } from '../models/addresses/Province.js';
@@ -37,16 +38,17 @@ __decorate([
 __decorate([
     column({ type: 'string' })
 ], Gemeente.prototype, "provincie", void 0);
-async function getProvince(name, provinces) {
+function getProvince(name, provinces, provinceRows) {
     const p = provinces.find(p => StringCompare.typoCount(p.name, name) < 2 && p.country == Country.Belgium);
     if (p) {
         return p;
     }
     const province = new Province();
+    province.id = uuidv4();
     province.country = Country.Belgium;
     province.name = name.trim();
-    await province.save();
     provinces.push(province);
+    provinceRows.push([province.id, province.name, province.country]);
     return province;
 }
 export default new Migration(async () => {
@@ -57,61 +59,93 @@ export default new Migration(async () => {
     // Loop all gemeenten
     const provinces = await Province.all();
     const gemeenten = await Gemeente.all();
-    const cities = [];
+    const citiesByNameAndProvince = new Map();
+    const provinceRows = [];
+    const cityRows = [];
+    const postalCodeRows = [];
+    const parentCityUpdates = new Map();
     for (const gemeente of gemeenten) {
-        const province = await getProvince(gemeente.provincie, provinces);
+        const province = getProvince(gemeente.provincie, provinces, provinceRows);
         // Some cities have the same name
-        const found = cities.find(c => c.name.trim() == gemeente.gemeente.trim() && c.provinceId == province.id);
+        const found = citiesByNameAndProvince.get(cityKey(gemeente.gemeente, province.id));
         if (!found) {
             // Create the city
             const city = new City();
+            city.id = uuidv4();
             city.name = gemeente.gemeente.trim();
             city.country = Country.Belgium;
             city.provinceId = province.id;
-            await city.save();
+            cityRows.push([city.id, city.name, city.provinceId, city.parentCityId, city.country]);
             // Also add postal code already
-            const postalCode = new PostalCode();
-            postalCode.postalCode = gemeente.postcode;
-            postalCode.cityId = city.id;
-            postalCode.country = Country.Belgium;
-            await postalCode.save();
+            postalCodeRows.push([uuidv4(), gemeente.postcode, city.id, Country.Belgium]);
             gemeente.city = city;
-            cities.push(city);
+            citiesByNameAndProvince.set(cityKey(city.name, city.provinceId), city);
         }
         else {
             gemeente.city = found;
             // Also add postal code already
-            const postalCode = new PostalCode();
-            postalCode.postalCode = gemeente.postcode;
-            postalCode.cityId = found.id;
-            postalCode.country = Country.Belgium;
-            await postalCode.save();
+            postalCodeRows.push([uuidv4(), gemeente.postcode, found.id, Country.Belgium]);
         }
     }
     for (const gemeente of gemeenten) {
         if (gemeente.gemeente.trim() == gemeente.hoofdgemeente.trim()) {
             continue;
         }
-        const hoofd = cities.find(c => c.name.trim() == gemeente.hoofdgemeente.trim() && c.provinceId == gemeente.city.provinceId);
+        const hoofd = citiesByNameAndProvince.get(cityKey(gemeente.hoofdgemeente, gemeente.city.provinceId));
         if (!hoofd) {
             // Create the city
             const city = new City();
+            city.id = uuidv4();
             city.name = gemeente.hoofdgemeente.trim();
             city.country = Country.Belgium;
-            const province = await getProvince(gemeente.provincie, provinces);
+            const province = getProvince(gemeente.provincie, provinces, provinceRows);
             city.provinceId = province.id;
-            await city.save();
-            cities.push(city);
+            cityRows.push([city.id, city.name, city.provinceId, city.parentCityId, city.country]);
+            citiesByNameAndProvince.set(cityKey(city.name, city.provinceId), city);
             // do not create a postal code here, these don't have one
             // console.log('Assigning ' + gemeente.gemeente + ' to ' + city.name);
             gemeente.city.parentCityId = city.id;
-            await gemeente.city.save();
+            parentCityUpdates.set(gemeente.city.id, city.id);
         }
         else {
             // console.log('Assigning ' + gemeente.gemeente + ' to ' + hoofd.name);
             gemeente.city.parentCityId = hoofd.id;
-            await gemeente.city.save();
+            parentCityUpdates.set(gemeente.city.id, hoofd.id);
         }
     }
+    await insertRows(Province.table, ['id', 'name', 'country'], provinceRows);
+    await insertRows(City.table, ['id', 'name', 'provinceId', 'parentCityId', 'country'], cityRows);
+    await insertRows(PostalCode.table, ['id', 'postalCode', 'cityId', 'country'], postalCodeRows);
+    await updateParentCityIds([...parentCityUpdates.entries()]);
 });
+function cityKey(name, provinceId) {
+    return `${name.trim()}\0${provinceId}`;
+}
+async function insertRows(table, columns, rows) {
+    for (const chunk of chunks(rows, 1000)) {
+        if (chunk.length === 0) {
+            continue;
+        }
+        await Database.insert(`INSERT INTO \`${table}\` (${columns.map(column => `\`${column}\``).join(', ')}) VALUES ?`, [chunk]);
+    }
+}
+async function updateParentCityIds(rows) {
+    for (const chunk of chunks(rows, 1000)) {
+        if (chunk.length === 0) {
+            continue;
+        }
+        const cases = chunk.map(() => 'WHEN ? THEN ?').join(' ');
+        await Database.statement(`UPDATE \`${City.table}\` SET \`parentCityId\` = CASE \`id\` ${cases} END WHERE \`id\` IN (?)`, [
+            ...chunk.flatMap(([cityId, parentCityId]) => [cityId, parentCityId]),
+            chunk.map(([cityId]) => cityId),
+        ]);
+    }
+}
+function chunks(values, size) {
+    const result = [];
+    for (let index = 0; index < values.length; index += size) {
+        result.push(values.slice(index, index + size));
+    }
+    return result;
+}
 //# sourceMappingURL=1605262045-import-postcodes.js.map

package/dist/migrations/1605262045-import-postcodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"1605262045-import-postcodes.js","sourceRoot":"","sources":["../../src/migrations/1605262045-import-postcodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"1605262045-import-postcodes.js","sourceRoot":"","sources":["../../src/migrations/1605262045-import-postcodes.ts"],"names":[],"mappings":"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"}

package/dist/migrations/1605262046-import-postcodes-nl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1605262046-import-postcodes-nl.d.ts","sourceRoot":"","sources":["../../src/migrations/1605262046-import-postcodes-nl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;;AAuCxD,wBAuDG"}
+{"version":3,"file":"1605262046-import-postcodes-nl.d.ts","sourceRoot":"","sources":["../../src/migrations/1605262046-import-postcodes-nl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,6BAA6B,CAAC;;AA0ClE,wBA4DG"}

package/dist/migrations/1605262046-import-postcodes-nl.js

@@ -1,34 +1,37 @@
-import { Migration } from '@simonbackx/simple-database';
+import { Database, Migration } from '@simonbackx/simple-database';
 import { Country } from '@stamhoofd/types/Country';
 import { StringCompare } from '@stamhoofd/utility';
 import fs from 'fs';
 import readline from 'readline';
+import { v4 as uuidv4 } from 'uuid';
 import { City } from '../models/addresses/City.js';
 import { PostalCode } from '../models/addresses/PostalCode.js';
 import { Province } from '../models/addresses/Province.js';
-async function getProvince(name, provinces) {
+function getProvince(name, provinces, provinceRows) {
     const p = provinces.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands);
     if (p) {
         return p;
     }
     const province = new Province();
+    province.id = uuidv4();
     province.country = Country.Netherlands;
     province.name = name;
-    await province.save();
     provinces.push(province);
+    provinceRows.push([province.id, province.name, province.country]);
     return province;
 }
-async function getCity(name, provinceId, cities) {
-    const p = cities.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands);
+function getCity(name, provinceId, citiesByName, cityRows) {
+    const p = citiesByName.get(normalizeCityName(name));
     if (p) {
         return p;
     }
     const city = new City();
+    city.id = uuidv4();
     city.name = name;
     city.country = Country.Netherlands;
     city.provinceId = provinceId;
-    await city.save();
-    cities.push(city);
+    cityRows.push([city.id, city.name, city.provinceId, city.parentCityId, city.country]);
+    citiesByName.set(normalizeCityName(city.name), city);
     return city;
 }
 export default new Migration(async () => {
@@ -44,14 +47,18 @@ export default new Migration(async () => {
         return { path: folder + '/' + dirent.name, name: dirent.name };
     });
     const allProvinces = await Province.where({ country: Country.Netherlands });
+    const provinceRows = [];
+    const cityRows = [];
+    const postalCodeRows = [];
+    const parentCityUpdates = [];
     for (const p of provinces) {
         // console.log(p.name);
-        const province = await getProvince(p.name.trim(), allProvinces);
+        const province = getProvince(p.name.trim(), allProvinces, provinceRows);
         // const cities = await fs.readFile(p.path, { encoding: "utf-8" });
         const lineReader = readline.createInterface({
             input: fs.createReadStream(p.path, { encoding: 'utf-8' }),
         });
-        const cities = [];
+        const citiesByName = new Map();
         for await (const line of lineReader) {
             const splitted = line.split('\t');
             if (splitted.length !== 3) {
@@ -62,19 +69,49 @@ export default new Migration(async () => {
             const gemeente = splitted[1].trim();
             const plaats = splitted[2].trim();
             // Check plaats and gemeente
-            const city = await getCity(plaats, province.id, cities);
-            const city2 = await getCity(gemeente, province.id, cities); // might be the same as city
+            const city = getCity(plaats, province.id, citiesByName, cityRows);
+            const city2 = getCity(gemeente, province.id, citiesByName, cityRows); // might be the same as city
             if (city2.id !== city.id && city.parentCityId === null) {
                 city.parentCityId = city2.id;
-                await city.save();
+                parentCityUpdates.push([city.id, city2.id]);
             }
             // Also add postal code already
-            const postalCode = new PostalCode();
-            postalCode.postalCode = postcode;
-            postalCode.cityId = city.id;
-            postalCode.country = Country.Netherlands;
-            await postalCode.save();
+            postalCodeRows.push([uuidv4(), postcode, city.id, Country.Netherlands]);
         }
     }
+    await insertRows(Province.table, ['id', 'name', 'country'], provinceRows);
+    await insertRows(City.table, ['id', 'name', 'provinceId', 'parentCityId', 'country'], cityRows);
+    await insertRows(PostalCode.table, ['id', 'postalCode', 'cityId', 'country'], postalCodeRows);
+    await updateParentCityIds(parentCityUpdates);
 });
+function normalizeCityName(name) {
+    return name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase().replace(/\s+/, ' ').trim();
+}
+async function insertRows(table, columns, rows) {
+    for (const chunk of chunks(rows, 1000)) {
+        if (chunk.length === 0) {
+            continue;
+        }
+        await Database.insert(`INSERT INTO \`${table}\` (${columns.map(column => `\`${column}\``).join(', ')}) VALUES ?`, [chunk]);
+    }
+}
+async function updateParentCityIds(rows) {
+    for (const chunk of chunks(rows, 1000)) {
+        if (chunk.length === 0) {
+            continue;
+        }
+        const cases = chunk.map(() => 'WHEN ? THEN ?').join(' ');
+        await Database.statement(`UPDATE \`${City.table}\` SET \`parentCityId\` = CASE \`id\` ${cases} END WHERE \`id\` IN (?)`, [
+            ...chunk.flatMap(([cityId, parentCityId]) => [cityId, parentCityId]),
+            chunk.map(([cityId]) => cityId),
+        ]);
+    }
+}
+function chunks(values, size) {
+    const result = [];
+    for (let index = 0; index < values.length; index += size) {
+        result.push(values.slice(index, index + size));
+    }
+    return result;
+}
 //# sourceMappingURL=1605262046-import-postcodes-nl.js.map

package/dist/migrations/1605262046-import-postcodes-nl.js.map

@@ -1 +1 @@
-{"version":3,"file":"1605262046-import-postcodes-nl.js","sourceRoot":"","sources":["../../src/migrations/1605262046-import-postcodes-nl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"1605262046-import-postcodes-nl.js","sourceRoot":"","sources":["../../src/migrations/1605262046-import-postcodes-nl.ts"],"names":[],"mappings":"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"}

package/dist/migrations/1719567881-organization-periodId.sql

@@ -1,2 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `organizations` ADD COLUMN `periodId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL;
 ALTER TABLE `organizations` ADD FOREIGN KEY (`periodId`) REFERENCES `registration_periods` (`id`) ON UPDATE CASCADE ON DELETE RESTRICT;
+SET FOREIGN_KEY_CHECKS=1;

package/dist/migrations/1719567882-groups-periodId.sql

@@ -1,2 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `groups` ADD COLUMN `periodId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL;
 ALTER TABLE `groups` ADD FOREIGN KEY (`periodId`) REFERENCES `registration_periods` (`id`) ON UPDATE CASCADE ON DELETE RESTRICT;
+SET FOREIGN_KEY_CHECKS=1;

package/dist/migrations/1720080975-convert-charset.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@simonbackx/simple-database';
+declare const _default: Migration;
+export default _default;
+//# sourceMappingURL=1720080975-convert-charset.d.ts.map

package/dist/migrations/1720080975-convert-charset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"1720080975-convert-charset.d.ts","sourceRoot":"","sources":["../../src/migrations/1720080975-convert-charset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,6BAA6B,CAAC;;AAGlE,wBAmBG"}

package/dist/migrations/1720080975-convert-charset.js

@@ -0,0 +1,26 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+import { LoggingTools } from '@stamhoofd/utility';
+export default new Migration(async () => {
+    process.stdout.write('\n');
+    if (STAMHOOFD.userMode === 'platform' && (STAMHOOFD.environment === 'production' || STAMHOOFD.environment === 'staging')) {
+        console.log('Skipped convert charset for userMode platform in production.');
+        return;
+    }
+    const tables = ['_members_users', 'balance_item_payments', 'balance_items', 'buckaroo_payments', 'cities', 'document_templates', 'documents', 'email_templates', 'email_verification_codes', 'groups', 'images', 'members', 'migrations', 'mollie_payments', 'mollie_tokens', 'organization_registration_periods', 'organizations', 'password_tokens', 'payconiq_payments', 'payments', 'platform', 'postal_codes', 'provinces', 'register_codes', 'registration_periods', 'registrations', 'stamhoofd_credits', 'stamhoofd_invoices', 'stamhoofd_packages', 'stamhoofd_pending_invoices', 'streets', 'stripe_accounts', 'stripe_checkout_sessions', 'stripe_payment_intents', 'tokens', 'used_register_codes', 'users', 'webshop_discount_codes', 'webshop_orders', 'webshop_tickets', 'webshops'];
+    const progressLogger = LoggingTools.createProgressLogger(tables.length, { tag: 'convert tables charset' });
+    for (const table of tables) {
+        await convertTable(table);
+        progressLogger.update();
+    }
+    console.log('Start set database charset.');
+    await Database.statement('ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;');
+});
+async function convertTable(name) {
+    await Database.beginTransaction(async () => {
+        await Database.statement('set foreign_key_checks=0;');
+        console.log('Start converting charset of table: ' + name);
+        await Database.statement('ALTER TABLE `' + name + '` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;');
+        await Database.statement('set foreign_key_checks=1;');
+    });
+}
+//# sourceMappingURL=1720080975-convert-charset.js.map

package/dist/migrations/1720080975-convert-charset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1720080975-convert-charset.js","sourceRoot":"","sources":["../../src/migrations/1720080975-convert-charset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,eAAe,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE;IACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE3B,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC,EAAE,CAAC;QACvH,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAC5E,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,gBAAgB,EAAE,uBAAuB,EAAE,eAAe,EAAE,mBAAmB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,WAAW,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,mCAAmC,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,eAAe,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,SAAS,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAEpwB,MAAM,cAAc,GAAG,YAAY,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,CAAC;IAE3G,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1B,cAAc,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,QAAQ,CAAC,SAAS,CAAC,kEAAkE,CAAC,CAAC;AACjG,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,YAAY,CAAC,IAAY;IACpC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACvC,MAAM,QAAQ,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QAEtD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,IAAI,CAAC,CAAC;QAC1D,MAAM,QAAQ,CAAC,SAAS,CAAC,eAAe,GAAG,IAAI,GAAG,gEAAgE,CAAC,CAAC;QAEpH,MAAM,QAAQ,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/migrations/1720080976-convert-charset-leads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1720080976-convert-charset-leads.d.ts","sourceRoot":"","sources":["../../src/migrations/1720080976-convert-charset-leads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;;AACH,wBAwBG"}
+{"version":3,"file":"1720080976-convert-charset-leads.d.ts","sourceRoot":"","sources":["../../src/migrations/1720080976-convert-charset-leads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;;AACH,wBAgBG"}

package/dist/migrations/1720080976-convert-charset-leads.js

@@ -7,21 +7,14 @@ import { Database, Migration } from '@simonbackx/simple-database';
  */
 export default new Migration(async () => {
     process.stdout.write('\n');
-    if (STAMHOOFD.userMode === 'platform') {
-        console.log('Skipped update leads charset for userMode platform.');
+    if (STAMHOOFD.userMode === 'platform' && (STAMHOOFD.environment === 'production' || STAMHOOFD.environment === 'staging')) {
+        console.log('Skipped update leads charset for userMode platform in production.');
         return Promise.resolve();
     }
     const hasTable = await tableExists('leads');
     console.log('Has leads table: ' + hasTable);
     if (hasTable) {
-        const sqlStatement = [
-            'set foreign_key_checks=0;',
-            'ALTER TABLE `leads` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;',
-            'ALTER TABLE `leads` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;',
-            'set foreign_key_checks=1;'
-        ].join('');
-        console.log('Start updating charset of leads table.');
-        await Database.statement(sqlStatement);
+        await convertTable('leads');
     }
     return Promise.resolve();
 });
@@ -38,4 +31,12 @@ async function tableExists(tableName) {
     }
     return count > 0;
 }
+async function convertTable(name) {
+    await Database.beginTransaction(async () => {
+        await Database.statement('set foreign_key_checks=0;');
+        console.log('Start converting charset of table: ' + name);
+        await Database.statement('ALTER TABLE `' + name + '` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;');
+        await Database.statement('set foreign_key_checks=1;');
+    });
+}
 //# sourceMappingURL=1720080976-convert-charset-leads.js.map

package/dist/migrations/1720080976-convert-charset-leads.js.map

@@ -1 +1 @@
-{"version":3,"file":"1720080976-convert-charset-leads.js","sourceRoot":"","sources":["../../src/migrations/1720080976-convert-charset-leads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;AACH,eAAe,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE;IACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE3B,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;QAClE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,QAAQ,CAAC,CAAC;IAE5C,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,YAAY,GAAW;YACzB,2BAA2B;YAC3B,uEAAuE;YACvE,kFAAkF;YAClF,2BAA2B;SAC9B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEX,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CAAC,SAAiB;IACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,QAAQ,CAAC,MAAM,CAChC;;;;;SAKC,EACD,CAAC,SAAS,CAAC,CACd,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAEnC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,KAAK,GAAG,CAAC,CAAC;AACrB,CAAC"}
+{"version":3,"file":"1720080976-convert-charset-leads.js","sourceRoot":"","sources":["../../src/migrations/1720080976-convert-charset-leads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;AACH,eAAe,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE;IACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE3B,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC,EAAE,CAAC;QACvH,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;QACjF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,QAAQ,CAAC,CAAC;IAE5C,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CAAC,SAAiB;IACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,QAAQ,CAAC,MAAM,CAChC;;;;;SAKC,EACD,CAAC,SAAS,CAAC,CACd,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAEnC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,KAAK,GAAG,CAAC,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,IAAY;IACpC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACvC,MAAM,QAAQ,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QAEtD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,IAAI,CAAC,CAAC;QAC1D,MAAM,QAAQ,CAAC,SAAS,CAAC,eAAe,GAAG,IAAI,GAAG,gEAAgE,CAAC,CAAC;QAEpH,MAAM,QAAQ,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/migrations/1721400546-users-memberId.sql

@@ -1,3 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `users`
 ADD COLUMN `memberId` varchar(36) NULL AFTER `id`;
 ALTER TABLE `users` ADD FOREIGN KEY (`memberId`) REFERENCES `members` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;