@stamhoofd/models 2.119.0 → 2.120.1

package/dist/models/addresses/PostalCode.js

@@ -0,0 +1,139 @@
+import { __decorate } from "tslib";
+import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
+import { SimpleError } from '@simonbackx/simple-errors';
+import { QueryableModel } from '@stamhoofd/sql';
+import { Country } from '@stamhoofd/types/Country';
+import { Formatter, StringCompare } from '@stamhoofd/utility';
+import { v4 as uuidv4 } from 'uuid';
+import { City } from './City.js';
+export class PostalCode extends QueryableModel {
+    static table = 'postal_codes';
+    id;
+    postalCode;
+    cityId;
+    country;
+    static city = new ManyToOneRelation(City, 'city');
+    /**
+     * Search for a given city via it's postal code and country, collecting information about the city (id), parentCity (id) and province (id)
+     */
+    static async getCity(postalCode, cityName, country) {
+        let query = `SELECT ${City.getDefaultSelect()}from \`${PostalCode.table}\`\n`;
+        query += `JOIN \`${City.table}\` ON \`${PostalCode.table}\`.\`${PostalCode.city.foreignKey}\` = \`${City.table}\`.\`${City.primary.name}\`\n`;
+        // We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
+        query += `where \`${PostalCode.table}\`.\`postalCode\` = ? AND \`${PostalCode.table}\`.\`country\` = ?`;
+        const [results] = await Database.select(query, [postalCode, country]);
+        const cities = City.fromRows(results, City.table);
+        if (cities.length == 1) {
+            return cities[0];
+        }
+        // Search by city name (first exact match, then allow errors)
+        let bestScore = 0;
+        let bestCity = null;
+        for (const city of cities) {
+            const typo = StringCompare.typoCount(cityName, city.name);
+            if (typo == 0) {
+                return city;
+            }
+            if (bestCity === null || typo < bestScore) {
+                bestCity = city;
+                bestScore = typo;
+            }
+        }
+        if (bestCity && (bestScore < 3 || StringCompare.contains(cityName, bestCity.name) || StringCompare.contains(bestCity.name, cityName))) {
+            return bestCity;
+        }
+        bestScore = 0;
+        bestCity = null;
+        for (const city of cities) {
+            const match = StringCompare.matchCount(cityName, city.name);
+            if (bestCity === null || match > bestScore) {
+                bestCity = city;
+                bestScore = match;
+            }
+        }
+        if (bestCity && (bestScore > cityName.length / 2 || StringCompare.contains(cityName, bestCity.name))) {
+            return bestCity;
+        }
+        if (cities.length >= 1 && cities[0].parentCityId !== null && cities.every(c => c.parentCityId === cities[0].parentCityId)) {
+            // Might have put a postal code of the parent city
+            const parent = await City.getByID(cities[0].parentCityId);
+            if (parent) {
+                const typo = StringCompare.typoCount(cityName, parent.name);
+                if (typo < 4 || StringCompare.contains(cityName, parent.name)) {
+                    if (cities.length > 1) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid city. Suggestions: ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' of ') + '?',
+                            human: $t(`%GS`) + ' ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' ' + $t(`%GT`) + ' ') + '?',
+                            field: 'city',
+                        });
+                    }
+                    return cities[0]; // do not return parent here, because the postal code has priority
+                }
+            }
+        }
+        // Search parent in belgium only
+        if (country == Country.Belgium) {
+            return this.getCityByParent(postalCode, cityName, country);
+        }
+        return null;
+    }
+    /**
+     * Search for a given city via it's postal code and country, collecting information about the city (id), parentCity (id) and province (id)
+     */
+    static async getCityByParent(postalCode, cityName, country) {
+        let query = `SELECT ${City.getDefaultSelect()}from \`${PostalCode.table}\`\n`;
+        query += `JOIN \`${City.table}\` as parent ON \`${PostalCode.table}\`.\`${PostalCode.city.foreignKey}\` = \`parent\`.\`${City.primary.name}\`\n`;
+        query += `JOIN \`${City.table}\` ON \`parent\`.\`${City.primary.name}\` = \`${City.table}\`.\`${City.parentCity.foreignKey}\`\n`;
+        // We do an extra join because we also need to get the other registrations of each member (only one regitration has to match the query)
+        query += `where \`${PostalCode.table}\`.\`postalCode\` = ? AND \`${PostalCode.table}\`.\`country\` = ?`;
+        const [results] = await Database.select(query, [postalCode, country]);
+        const cities = City.fromRows(results, City.table);
+        // Search by city name (first exact match, then allow errors)
+        let bestScore = 0;
+        let bestCity = null;
+        for (const city of cities) {
+            const typo = StringCompare.typoCount(cityName, city.name);
+            if (typo == 0) {
+                return city;
+            }
+            if (bestCity === null || typo < bestScore) {
+                bestCity = city;
+                bestScore = typo;
+            }
+        }
+        if (bestCity && (bestScore < 3 || StringCompare.contains(cityName, bestCity.name) || StringCompare.contains(bestCity.name, cityName))) {
+            return bestCity;
+        }
+        bestScore = 0;
+        bestCity = null;
+        for (const city of cities) {
+            const match = StringCompare.matchCount(cityName, city.name);
+            if (bestCity === null || match > bestScore) {
+                bestCity = city;
+                bestScore = match;
+            }
+        }
+        if (bestCity && (bestScore > cityName.length / 2 || StringCompare.contains(cityName, bestCity.name))) {
+            return bestCity;
+        }
+        return null;
+    }
+}
+__decorate([
+    column({
+        primary: true, type: 'string', beforeSave(value) {
+            return value ?? uuidv4();
+        },
+    })
+], PostalCode.prototype, "id", void 0);
+__decorate([
+    column({ type: 'string' })
+], PostalCode.prototype, "postalCode", void 0);
+__decorate([
+    column({ type: 'string', foreignKey: PostalCode.city })
+], PostalCode.prototype, "cityId", void 0);
+__decorate([
+    column({ type: 'string' })
+], PostalCode.prototype, "country", void 0);
+//# sourceMappingURL=PostalCode.js.map

package/dist/models/addresses/PostalCode.js.map

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

package/dist/models/addresses/Province.d.ts

@@ -0,0 +1,9 @@
+import { QueryableModel } from '@stamhoofd/sql';
+import type { Country } from '@stamhoofd/types/Country';
+export declare class Province extends QueryableModel {
+    static table: string;
+    id: string;
+    name: string;
+    country: Country;
+}
+//# sourceMappingURL=Province.d.ts.map

package/dist/models/addresses/Province.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Province.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/Province.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,qBAAa,QAAS,SAAQ,cAAc;IACxC,MAAM,CAAC,KAAK,SAAe;IAO3B,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,OAAO,EAAE,OAAO,CAAC;CACpB"}

package/dist/models/addresses/Province.js

@@ -0,0 +1,24 @@
+import { __decorate } from "tslib";
+import { column } from '@simonbackx/simple-database';
+import { QueryableModel } from '@stamhoofd/sql';
+import { v4 as uuidv4 } from 'uuid';
+export class Province extends QueryableModel {
+    static table = 'provinces';
+    id;
+    name;
+    country;
+}
+__decorate([
+    column({
+        primary: true, type: 'string', beforeSave(value) {
+            return value ?? uuidv4();
+        },
+    })
+], Province.prototype, "id", void 0);
+__decorate([
+    column({ type: 'string' })
+], Province.prototype, "name", void 0);
+__decorate([
+    column({ type: 'string' })
+], Province.prototype, "country", void 0);
+//# sourceMappingURL=Province.js.map

package/dist/models/addresses/Province.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Province.js","sourceRoot":"","sources":["../../../src/models/addresses/Province.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,OAAO,QAAS,SAAQ,cAAc;IACxC,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;IAO3B,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,OAAO,CAAU;;AANjB;IALC,MAAM,CAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,MAAM,EAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;oCACU;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sCACd;AAGb;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;yCACV"}

package/dist/models/addresses/Street.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Street.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/Street.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,qBAAa,MAAO,SAAQ,cAAc;IACtC,MAAM,CAAC,KAAK,SAAa;IAOzB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,IAAI,kCAAuC;CACrD"}

package/dist/models/addresses/Street.js

@@ -0,0 +1,26 @@
+import { __decorate } from "tslib";
+import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import { QueryableModel } from '@stamhoofd/sql';
+import { v4 as uuidv4 } from 'uuid';
+import { City } from './City.js';
+export class Street extends QueryableModel {
+    static table = 'streets';
+    id;
+    name;
+    cityId;
+    static city = new ManyToOneRelation(City, 'city');
+}
+__decorate([
+    column({
+        primary: true, type: 'string', beforeSave(value) {
+            return value ?? uuidv4();
+        },
+    })
+], Street.prototype, "id", void 0);
+__decorate([
+    column({ type: 'string' })
+], Street.prototype, "name", void 0);
+__decorate([
+    column({ type: 'string', foreignKey: Street.city })
+], Street.prototype, "cityId", void 0);
+//# sourceMappingURL=Street.js.map

package/dist/models/addresses/Street.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Street.js","sourceRoot":"","sources":["../../../src/models/addresses/Street.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,OAAO,MAAO,SAAQ,cAAc;IACtC,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;IAOzB,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,MAAM,CAAS;IAEf,MAAM,CAAC,IAAI,GAAG,IAAI,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;;AARlD;IALC,MAAM,CAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,MAAM,EAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;kCACU;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oCACd;AAGb;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;sCACrC"}

package/dist/models/index.d.ts

@@ -0,0 +1,55 @@
+export * from './Member.js';
+export { MergedMember } from './MergedMember.js';
+export { Organization } from './Organization.js';
+export { Payment } from './Payment.js';
+export { Registration } from './Registration.js';
+export { User } from './User.js';
+export * from './EmailVerificationCode.js';
+export { BalanceItem } from './BalanceItem.js';
+export { BalanceItemPayment } from './BalanceItemPayment.js';
+export * from './BuckarooPayment.js';
+export * from './EmailTemplate.js';
+export { Group } from './Group.js';
+export * from './Image.js';
+export * from './MolliePayment.js';
+export * from './MollieToken.js';
+export { Order } from './Order.js';
+export * from './PasswordToken.js';
+export * from './PayconiqPayment.js';
+export * from './RegisterCode.js';
+export * from './STCredit.js';
+export * from './STInvoice.js';
+export * from './STPackage.js';
+export { STPendingInvoice } from './STPendingInvoice.js';
+export * from './Ticket.js';
+export { Token, type TokenWithUser } from './Token.js';
+export * from './UsedRegisterCode.js';
+export * from './Webshop.js';
+export * from './addresses/City.js';
+export * from './addresses/PostalCode.js';
+export * from './addresses/Province.js';
+export * from './addresses/Street.js';
+export * from './StripeAccount.js';
+export * from './StripeCheckoutSession.js';
+export * from './StripePaymentIntent.js';
+export * from './Document.js';
+export * from './DocumentTemplate.js';
+export * from './WebshopDiscountCode.js';
+export * from './WebshopUitpasNumber.js';
+export * from './MemberResponsibilityRecord.js';
+export * from './Platform.js';
+export * from './AuditLog.js';
+export * from './CachedBalance.js';
+export * from './Email.js';
+export * from './EmailRecipient.js';
+export * from './Event.js';
+export * from './EventNotification.js';
+export * from './MemberPlatformMembership.js';
+export * from './MemberUser.js';
+export * from './OrganizationRegistrationPeriod.js';
+export * from './RegistrationPeriod.js';
+export * from './UitpasClientCredential.js';
+export * from './Invoice.js';
+export * from './InvoicedBalanceItem.js';
+import './_relations.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/models/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACvD,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAE7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AAEzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AAEtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AAExC,cAAc,6BAA6B,CAAC;AAE5C,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AAEzC,OAAO,iBAAiB,CAAC"}

package/dist/models/index.js

@@ -0,0 +1,55 @@
+export * from './Member.js';
+export { MergedMember } from './MergedMember.js';
+export { Organization } from './Organization.js';
+export { Payment } from './Payment.js';
+export { Registration } from './Registration.js';
+export { User } from './User.js';
+export * from './EmailVerificationCode.js';
+export { BalanceItem } from './BalanceItem.js';
+export { BalanceItemPayment } from './BalanceItemPayment.js';
+export * from './BuckarooPayment.js';
+export * from './EmailTemplate.js';
+export { Group } from './Group.js';
+export * from './Image.js';
+export * from './MolliePayment.js';
+export * from './MollieToken.js';
+export { Order } from './Order.js';
+export * from './PasswordToken.js';
+export * from './PayconiqPayment.js';
+export * from './RegisterCode.js';
+export * from './STCredit.js';
+export * from './STInvoice.js';
+export * from './STPackage.js';
+export { STPendingInvoice } from './STPendingInvoice.js';
+export * from './Ticket.js';
+export { Token } from './Token.js';
+export * from './UsedRegisterCode.js';
+export * from './Webshop.js';
+export * from './addresses/City.js';
+export * from './addresses/PostalCode.js';
+export * from './addresses/Province.js';
+export * from './addresses/Street.js';
+export * from './StripeAccount.js';
+export * from './StripeCheckoutSession.js';
+export * from './StripePaymentIntent.js';
+export * from './Document.js';
+export * from './DocumentTemplate.js';
+export * from './WebshopDiscountCode.js';
+export * from './WebshopUitpasNumber.js';
+export * from './MemberResponsibilityRecord.js';
+export * from './Platform.js';
+export * from './AuditLog.js';
+export * from './CachedBalance.js';
+export * from './Email.js';
+export * from './EmailRecipient.js';
+export * from './Event.js';
+export * from './EventNotification.js';
+export * from './MemberPlatformMembership.js';
+export * from './MemberUser.js';
+export * from './OrganizationRegistrationPeriod.js';
+export * from './RegistrationPeriod.js';
+export * from './UitpasClientCredential.js';
+export * from './Invoice.js';
+export * from './InvoicedBalanceItem.js';
+import './_relations.js';
+//# sourceMappingURL=index.js.map

package/dist/models/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAsB,MAAM,YAAY,CAAC;AACvD,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAE7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AAEzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AAEtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AAExC,cAAc,6BAA6B,CAAC;AAE5C,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AAEzC,OAAO,iBAAiB,CAAC"}

package/dist/structures/OrganizationServerMetaData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrganizationServerMetaData.d.ts","sourceRoot":"","sources":["../../src/structures/OrganizationServerMetaData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAiF,MAAM,6BAA6B,CAAC;AACvJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,qBAAa,SAAU,SAAQ,WAAW;IAEtC,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,OAAc;CACrB;AAED,qBAAa,0BAA2B,SAAQ,WAAW;IAEvD,cAAc,CAAC,EAAE,MAAM,CAAC;IAGxB,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IAEH,sBAAsB,CAAC,EAAE,IAAI,CAAC;IAE9B;;;OAGG;IAEH,sBAAsB,UAAQ;IAE9B;;;OAGG;IAEH,qBAAqB,SAAK;IAG1B,mBAAmB,CAAC,EAAE,IAAI,EAAE,CAAC;IAG7B,aAAa,EAAE,OAAO,CAAS;IAG/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGtC,gBAAgB,EAAE,yBAAyB,GAAG,IAAI,CAAQ;IAE1D;;OAEG;IAaH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAElD,YAAY;IAMZ,cAAc;IAed;;OAEG;IACH,wBAAwB;IAKxB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAM3B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,GAAG,IAAW;CAU5D"}

package/dist/structures/OrganizationServerMetaData.js

@@ -0,0 +1,130 @@
+import { __decorate } from "tslib";
+import { ArrayDecoder, AutoEncoder, BooleanDecoder, DateDecoder, field, IntegerDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import { OpenIDClientConfiguration } from '@stamhoofd/structures';
+export class DripEmail extends AutoEncoder {
+    id;
+    date = new Date();
+}
+__decorate([
+    field({ decoder: StringDecoder })
+], DripEmail.prototype, "id", void 0);
+__decorate([
+    field({ decoder: DateDecoder })
+], DripEmail.prototype, "date", void 0);
+export class OrganizationServerMetaData extends AutoEncoder {
+    privateDKIMKey;
+    publicDKIMKey;
+    usedRegisterCode;
+    /**
+     * When the DNS records are invalid for the first time, this timestamp will get set.
+     * When DNS is valid again, this will get cleared
+     */
+    firstInvalidDNSRecords;
+    /**
+     * Whether an email has been send to say that the domain is setup correctly
+     * Set back to false when changing the domain
+     */
+    didSendDomainSetupMail = true;
+    /**
+     * When the DNS records are invalid for the first time, this timestamp will get set.
+     * When DNS is valid again, this will get cleared
+     */
+    DNSRecordWarningCount = 0;
+    lastInvalidDNSDates;
+    isDNSUnstable = false;
+    mollieCustomerId;
+    mollieMandateId = null;
+    ssoConfiguration = null;
+    /**
+     * List of specific emails that were send to this organization
+     */
+    dripEmailList = new Map();
+    markDNSValid() {
+        // Reset if longer than 14 days without invalid DNS
+        this.isDNSUnstable = this.recalculateIsDNSUnstable();
+        this.firstInvalidDNSRecords = undefined;
+    }
+    markDNSFailure() {
+        if (this.firstInvalidDNSRecords) {
+            // Hasn't been valid
+            return;
+        }
+        console.warn('DNS settings became invalid');
+        this.firstInvalidDNSRecords = new Date();
+        // Remove all dates longer than 14 days ago, or more than 6 events
+        const d14 = new Date(Date.now() - 1000 * 60 * 60 * 24 * 14);
+        const maxLength = 6;
+        this.lastInvalidDNSDates = [...(this.lastInvalidDNSDates ?? []), new Date()].filter(d => d > d14).slice(0, maxLength);
+        this.isDNSUnstable = this.recalculateIsDNSUnstable();
+    }
+    /**
+     * DNS is unstable if it was marked invalid 4 times in the last 2 weeks. Then it stays unstable until there were no invalid DNS moments in the last 2 weeks.
+     */
+    recalculateIsDNSUnstable() {
+        const d14 = new Date(Date.now() - 1000 * 60 * 60 * 24 * 14);
+        return (this.lastInvalidDNSDates ?? []).filter(d => d > d14).length > (this.isDNSUnstable ? 0 : 4);
+    }
+    addEmail(identifier) {
+        console.log('Marked email ', identifier);
+        const email = DripEmail.create({ id: identifier });
+        this.dripEmailList.set(email.id, email);
+    }
+    hasEmail(identifier, lastMs = null) {
+        if (!this.dripEmailList.has(identifier)) {
+            return false;
+        }
+        if (lastMs === null) {
+            return true;
+        }
+        const email = this.dripEmailList.get(identifier);
+        return email.date.getTime() > Date.now() - lastMs;
+    }
+}
+__decorate([
+    field({ decoder: StringDecoder, optional: true })
+], OrganizationServerMetaData.prototype, "privateDKIMKey", void 0);
+__decorate([
+    field({ decoder: StringDecoder, optional: true })
+], OrganizationServerMetaData.prototype, "publicDKIMKey", void 0);
+__decorate([
+    field({ decoder: StringDecoder, optional: true, version: 24 })
+], OrganizationServerMetaData.prototype, "usedRegisterCode", void 0);
+__decorate([
+    field({ decoder: DateDecoder, optional: true, version: 37 })
+], OrganizationServerMetaData.prototype, "firstInvalidDNSRecords", void 0);
+__decorate([
+    field({ decoder: BooleanDecoder, optional: true, version: 157 })
+], OrganizationServerMetaData.prototype, "didSendDomainSetupMail", void 0);
+__decorate([
+    field({ decoder: IntegerDecoder, version: 37 })
+], OrganizationServerMetaData.prototype, "DNSRecordWarningCount", void 0);
+__decorate([
+    field({ decoder: new ArrayDecoder(DateDecoder), optional: true, version: 230 })
+], OrganizationServerMetaData.prototype, "lastInvalidDNSDates", void 0);
+__decorate([
+    field({ decoder: BooleanDecoder, version: 230 })
+], OrganizationServerMetaData.prototype, "isDNSUnstable", void 0);
+__decorate([
+    field({ decoder: StringDecoder, optional: true, version: 86 })
+], OrganizationServerMetaData.prototype, "mollieCustomerId", void 0);
+__decorate([
+    field({ decoder: StringDecoder, optional: true, nullable: true })
+], OrganizationServerMetaData.prototype, "mollieMandateId", void 0);
+__decorate([
+    field({ decoder: OpenIDClientConfiguration, nullable: true, version: 189 })
+], OrganizationServerMetaData.prototype, "ssoConfiguration", void 0);
+__decorate([
+    field({ decoder: new MapDecoder(StringDecoder, DripEmail), optional: true, version: 230, upgrade: () => {
+            const m = new Map();
+            const identifier = 'OrganizationDripWelcome';
+            m.set(identifier, DripEmail.create({ id: identifier }));
+            return m;
+        } }),
+    field({ decoder: new MapDecoder(StringDecoder, DripEmail), optional: true, version: 232, upgrade: () => {
+            const m = new Map();
+            const identifier = 'OrganizationDripWelcome';
+            m.set(identifier, DripEmail.create({ id: identifier }));
+            return m;
+        } })
+], OrganizationServerMetaData.prototype, "dripEmailList", void 0);
+//# sourceMappingURL=OrganizationServerMetaData.js.map

package/dist/structures/OrganizationServerMetaData.js.map

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

package/package.json

@@ -1,22 +1,25 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.119.0",
-    "main": "./dist/src/index.js",
-    "types": "./dist/src/index.d.ts",
+    "version": "2.120.1",
+    "type": "module",
+    "types": "./dist/index.d.ts",
+    "main": "./dist/index.js",
     "license": "UNLICENCED",
-    "sideEffects": false,
+    "sideEffects": [
+        "./src/models/_relations.ts",
+        "./dist/models/_relations.js"
+    ],
     "files": [
         "dist",
         "src"
     ],
     "scripts": {
-        "build": "tsc -b && mkdir -p ./dist/src/migrations && rsync --delete --exclude='*.ts' --exclude='*.js' -r --checksum ./src/migrations/ ./dist/src/migrations/ && rsync -r --checksum ./src/assets/ ./dist/src/assets/",
-        "test": "jest --runInBand",
-        "test:build": "yarn -s build && yarn -s test",
+        "build": "tsc --build tsconfig.build.json && mkdir -p ./dist/migrations && rsync --delete --exclude='*.ts' --exclude='*.js' --exclude='*.map' -r --checksum ./src/migrations/ ./dist/migrations/ && rsync -r --checksum ./src/assets/ ./dist/assets/",
+        "test": "vitest",
         "lint": "eslint"
     },
     "peerDependencies": {
-        "@simonbackx/simple-database": "1.34.0",
+        "@simonbackx/simple-database": "1.36.12",
         "@stamhoofd/email": "*",
         "@stamhoofd/queues": "*"
     },
@@ -25,10 +28,10 @@
         "base-x": "^3.0.11"
     },
     "devDependencies": {
-        "@simonbackx/simple-database": "1.34.0"
+        "@simonbackx/simple-database": "1.36.12"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7bcbadd31fcc4f3109efc67c4034d1382a1d0439"
+    "gitHead": "00f65fc28d68feb86c30789784181a8954d638d7"
 }

package/src/factories/AddressFactory.ts

@@ -1,6 +1,7 @@
 import { Factory } from '@simonbackx/simple-database';
-import StreetNames from '@simonbackx/simple-database/dist/src/classes/data/streets';
-import { Address, Country } from '@stamhoofd/structures';
+import StreetNames from '@simonbackx/simple-database/data/streets';
+import { Address } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 
 type Options = Record<string, never>;
 

package/src/factories/BalanceItemFactory.ts

@@ -1,6 +1,7 @@
 import { Factory } from '@simonbackx/simple-database';
 
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType } from '@stamhoofd/structures';
+import type { BalanceItemRelation, BalanceItemRelationType, BalanceItemType } from '@stamhoofd/structures';
+import { BalanceItemStatus } from '@stamhoofd/structures';
 import { BalanceItem } from '../models/index.js';
 
 class Options {

package/src/factories/DocumentTemplateFactory.ts

@@ -1,7 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
 
 import { DocumentPrivateSettings, DocumentSettings, DocumentStatus, DocumentTemplateDefinition, DocumentTemplateGroup, NamedObject, RecordCategory, RecordSettings, RecordType } from '@stamhoofd/structures';
-import { DocumentTemplate, Group } from '../models/index.js';
+import type { Group } from '../models/index.js';
+import { DocumentTemplate } from '../models/index.js';
 import { OrganizationFactory } from './OrganizationFactory.js';
 
 class Options {

package/src/factories/EmailTemplateFactory.ts

@@ -1,8 +1,9 @@
 import { Factory } from '@simonbackx/simple-database';
 
 import { EmailTemplate } from '../models/index.js';
-import { Organization } from '../models/Organization.js';
-import { EmailTemplateType, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
+import type { Organization } from '../models/Organization.js';
+import type { EmailTemplateType} from '@stamhoofd/structures';
+import { EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 
 class Options {
     organization?: Organization;

package/src/factories/EmergencyContactFactory.ts

@@ -5,7 +5,7 @@ type Options = Record<string, never>;
 
 export class EmergencyContactFactory extends Factory<Options, EmergencyContact> {
     create(): Promise<EmergencyContact> {
-        const contact = new EmergencyContact();
+        const contact = EmergencyContact.create({});
         contact.title = this.randomArray([
             'Oma',
             'Opa',

package/src/factories/EventFactory.ts

@@ -2,9 +2,9 @@ import { Factory } from '@simonbackx/simple-database';
 import { EventMeta } from '@stamhoofd/structures';
 
 import { Event } from '../models/Event.js';
-import { Organization } from '../models/Organization.js';
+import type { Organization } from '../models/Organization.js';
 import { PlatformEventTypeFactory } from './PlatformEventTypeFactory.js';
-import { Group } from '../models/Group.js';
+import type { Group } from '../models/Group.js';
 
 class Options {
     organization?: Organization;

package/src/factories/EventNotificationFactory.ts

@@ -1,9 +1,11 @@
 import { Factory } from '@simonbackx/simple-database';
-import { EventNotificationStatus, RecordAnswer } from '@stamhoofd/structures';
+import type { RecordAnswer } from '@stamhoofd/structures';
+import { EventNotificationStatus } from '@stamhoofd/structures';
 
-import { EventNotification, User } from '../models/index.js';
-import { Event } from '../models/Event.js';
-import { Organization } from '../models/Organization.js';
+import type { User } from '../models/index.js';
+import { EventNotification } from '../models/index.js';
+import type { Event } from '../models/Event.js';
+import type { Organization } from '../models/Organization.js';
 import { EventFactory } from './EventFactory.js';
 import { EventNotificationTypeFactory } from './EventNotificationTypeFactory.js';