@stamhoofd/models 2.39.0 → 2.40.0

package/src/models/addresses/PostalCode.ts

@@ -1,108 +1,108 @@
-import { column,Database,ManyToOneRelation,Model } from '@simonbackx/simple-database';
+import { column, Database, ManyToOneRelation, Model } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Country } from '@stamhoofd/structures';
 import { Formatter, StringCompare } from '@stamhoofd/utility';
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 import { City } from './City';
 
 export class PostalCode extends Model {
-    static table = "postal_codes"
+    static table = 'postal_codes';
 
     @column({
-        primary: true, type: "string", beforeSave(value) {
+        primary: true, type: 'string', beforeSave(value) {
             return value ?? uuidv4();
-        }
+        },
     })
     id!: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     postalCode: string;
 
-    @column({ type: "string", foreignKey: PostalCode.city })
+    @column({ type: 'string', foreignKey: PostalCode.city })
     cityId: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     country: Country;
 
-    static city = new ManyToOneRelation(City, "city")
+    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: string, cityName: string, country: Country): Promise<City | null> {
         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`
+        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\` = ?`
+        query += `where \`${PostalCode.table}\`.\`postalCode\` = ? AND \`${PostalCode.table}\`.\`country\` = ?`;
 
-        const [results] = await Database.select(query, [postalCode, country])
+        const [results] = await Database.select(query, [postalCode, country]);
 
-        const cities = City.fromRows(results, City.table)
+        const cities = City.fromRows(results, City.table);
 
         if (cities.length == 1) {
-            return cities[0]
+            return cities[0];
         }
 
         // Search by city name (first exact match, then allow errors)
-        let bestScore = 0
-        let bestCity: City | null = null
+        let bestScore = 0;
+        let bestCity: City | null = null;
 
         for (const city of cities) {
-            const typo = StringCompare.typoCount(cityName, city.name)
+            const typo = StringCompare.typoCount(cityName, city.name);
             if (typo == 0) {
-                return city
+                return city;
             }
 
             if (bestCity === null || typo < bestScore) {
-                bestCity = city
-                bestScore = typo
+                bestCity = city;
+                bestScore = typo;
             }
         }
 
         if (bestCity && (bestScore < 3 || StringCompare.contains(cityName, bestCity.name) || StringCompare.contains(bestCity.name, cityName))) {
-            return bestCity
+            return bestCity;
         }
 
-        bestScore = 0
-        bestCity = null
+        bestScore = 0;
+        bestCity = null;
 
         for (const city of cities) {
-            const match = StringCompare.matchCount(cityName, city.name)
+            const match = StringCompare.matchCount(cityName, city.name);
 
             if (bestCity === null || match > bestScore) {
-                bestCity = city
-                bestScore = match
+                bestCity = city;
+                bestScore = match;
             }
         }
 
-        if (bestCity && (bestScore > cityName.length/2 || StringCompare.contains(cityName, bestCity.name))) {
-            return bestCity
+        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)
+            const parent = await City.getByID(cities[0].parentCityId);
             if (parent) {
-                const typo = StringCompare.typoCount(cityName, parent.name)
+                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: "Welke gemeente bedoel je precies? " + Formatter.joinLast(cities.map(c => c.name), ", ", " of ") + "?",
-                            field: "city"
-                        })
+                            code: 'invalid_field',
+                            message: 'Invalid city. Suggestions: ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' of ') + '?',
+                            human: 'Welke gemeente bedoel je precies? ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' of ') + '?',
+                            field: 'city',
+                        });
                     }
-                    return cities[0] // do not return parent here, because the postal code has priority
+                    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 this.getCityByParent(postalCode, cityName, country);
         }
 
         return null;
@@ -113,52 +113,52 @@ export class PostalCode extends Model {
      */
     static async getCityByParent(postalCode: string, cityName: string, country: Country): Promise<City | null> {
         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`
+        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\` = ?`
+        query += `where \`${PostalCode.table}\`.\`postalCode\` = ? AND \`${PostalCode.table}\`.\`country\` = ?`;
 
-        const [results] = await Database.select(query, [postalCode, country])
+        const [results] = await Database.select(query, [postalCode, country]);
 
-        const cities = City.fromRows(results, City.table)
+        const cities = City.fromRows(results, City.table);
 
         // Search by city name (first exact match, then allow errors)
-        let bestScore = 0
-        let bestCity: City | null = null
+        let bestScore = 0;
+        let bestCity: City | null = null;
 
         for (const city of cities) {
-            const typo = StringCompare.typoCount(cityName, city.name)
+            const typo = StringCompare.typoCount(cityName, city.name);
             if (typo == 0) {
-                return city
+                return city;
             }
 
             if (bestCity === null || typo < bestScore) {
-                bestCity = city
-                bestScore = typo
+                bestCity = city;
+                bestScore = typo;
             }
         }
 
         if (bestCity && (bestScore < 3 || StringCompare.contains(cityName, bestCity.name) || StringCompare.contains(bestCity.name, cityName))) {
-            return bestCity
+            return bestCity;
         }
 
-        bestScore = 0
-        bestCity = null
+        bestScore = 0;
+        bestCity = null;
 
         for (const city of cities) {
-            const match = StringCompare.matchCount(cityName, city.name)
+            const match = StringCompare.matchCount(cityName, city.name);
 
             if (bestCity === null || match > bestScore) {
-                bestCity = city
-                bestScore = match
+                bestCity = city;
+                bestScore = match;
             }
         }
 
-        if (bestCity && (bestScore > cityName.length/2 || StringCompare.contains(cityName, bestCity.name))) {
-            return bestCity
+        if (bestCity && (bestScore > cityName.length / 2 || StringCompare.contains(cityName, bestCity.name))) {
+            return bestCity;
         }
 
         return null;
     }
-}
+}

package/src/models/addresses/Province.ts

@@ -1,20 +1,20 @@
-import { column,Model } from '@simonbackx/simple-database';
+import { column, Model } from '@simonbackx/simple-database';
 import { Country } from '@stamhoofd/structures';
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 export class Province extends Model {
-    static table = "provinces"
+    static table = 'provinces';
 
     @column({
-        primary: true, type: "string", beforeSave(value) {
+        primary: true, type: 'string', beforeSave(value) {
             return value ?? uuidv4();
-        }
+        },
     })
     id!: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     name: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     country: Country;
-}
+}

package/src/models/addresses/Street.ts

@@ -1,25 +1,23 @@
 import { column, ManyToOneRelation, Model } from '@simonbackx/simple-database';
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 import { City } from './City';
 
 export class Street extends Model {
-    static table = "streets"
+    static table = 'streets';
 
     @column({
-        primary: true, type: "string", beforeSave(value) {
+        primary: true, type: 'string', beforeSave(value) {
             return value ?? uuidv4();
-        }
+        },
     })
     id!: string;
-    
-    @column({ type: "string" })
+
+    @column({ type: 'string' })
     name: string;
-    
-    @column({ type: "string", foreignKey: Street.city })
-    cityId: string;
 
-    static city = new ManyToOneRelation(City, "city")
+    @column({ type: 'string', foreignKey: Street.city })
+    cityId: string;
 
-    
-}
+    static city = new ManyToOneRelation(City, 'city');
+}

package/src/models/index.ts

@@ -1,55 +1,54 @@
-/* eslint-disable simple-import-sort/exports */
-export {Organization} from "./Organization"
-export {User} from "./User"
-export {Payment} from "./Payment"
-export {Registration} from "./Registration"
-export {Member, RegistrationWithMember, MemberWithRegistrations} from "./Member"
-export {MergedMember} from "./MergedMember"
-
-export * from "./EmailVerificationCode"
-
-export * from "./Image"
-export * from "./MolliePayment"
-export * from "./MollieToken"
-export {Order} from "./Order"
-export * from "./PasswordToken"
-export * from "./PayconiqPayment"
-export * from "./RegisterCode"
-export * from "./STInvoice"
-export * from "./STPackage"
-export {STPendingInvoice} from "./STPendingInvoice"
-export {Token, TokenWithUser} from "./Token"
-export * from "./Webshop"
-export * from "./STCredit"
-export * from "./UsedRegisterCode"
-export * from "./Ticket"
-export * from "./EmailTemplate"
-export * from "./BuckarooPayment"
-export {BalanceItem} from "./BalanceItem"
-export {BalanceItemPayment} from "./BalanceItemPayment"
-export {Group} from "./Group"
-
-export * from "./addresses/Street"
-export * from "./addresses/City"
-export * from "./addresses/PostalCode"
-export * from "./addresses/Province"
-
-export * from "./StripeAccount"
-export * from "./StripePaymentIntent"
-export * from "./StripeCheckoutSession"
-
-export * from "./Document"
-export * from "./DocumentTemplate"
-
-export * from "./WebshopDiscountCode"
-
-export * from "./Platform"
-export * from "./MemberResponsibilityRecord"
-
-export * from "./OrganizationRegistrationPeriod"
-export * from "./RegistrationPeriod"
-export * from "./MemberPlatformMembership"
-export * from "./Email"
-export * from "./EmailRecipient"
-export * from "./Event"
-export * from "./CachedOutstandingBalance"
+export { Organization } from './Organization';
+export { User } from './User';
+export { Payment } from './Payment';
+export { Registration } from './Registration';
+export { Member, RegistrationWithMember, MemberWithRegistrations } from './Member';
+export { MergedMember } from './MergedMember';
+
+export * from './EmailVerificationCode';
+
+export * from './Image';
+export * from './MolliePayment';
+export * from './MollieToken';
+export { Order } from './Order';
+export * from './PasswordToken';
+export * from './PayconiqPayment';
+export * from './RegisterCode';
+export * from './STInvoice';
+export * from './STPackage';
+export { STPendingInvoice } from './STPendingInvoice';
+export { Token, TokenWithUser } from './Token';
+export * from './Webshop';
+export * from './STCredit';
+export * from './UsedRegisterCode';
+export * from './Ticket';
+export * from './EmailTemplate';
+export * from './BuckarooPayment';
+export { BalanceItem } from './BalanceItem';
+export { BalanceItemPayment } from './BalanceItemPayment';
+export { Group } from './Group';
+
+export * from './addresses/Street';
+export * from './addresses/City';
+export * from './addresses/PostalCode';
+export * from './addresses/Province';
+
+export * from './StripeAccount';
+export * from './StripePaymentIntent';
+export * from './StripeCheckoutSession';
+
+export * from './Document';
+export * from './DocumentTemplate';
+
+export * from './WebshopDiscountCode';
+
+export * from './Platform';
+export * from './MemberResponsibilityRecord';
+
+export * from './OrganizationRegistrationPeriod';
+export * from './RegistrationPeriod';
+export * from './MemberPlatformMembership';
+export * from './Email';
+export * from './EmailRecipient';
+export * from './Event';
+export * from './CachedOutstandingBalance';

package/src/structures/OrganizationServerMetaData.ts

@@ -1,78 +1,78 @@
-import { ArrayDecoder, AutoEncoder,BooleanDecoder,DateDecoder,field, IntegerDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import { ArrayDecoder, AutoEncoder, BooleanDecoder, DateDecoder, field, IntegerDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { OpenIDClientConfiguration } from '@stamhoofd/structures';
 
 export class DripEmail extends AutoEncoder {
     @field({ decoder: StringDecoder })
-    id: string
+    id: string;
 
     @field({ decoder: DateDecoder })
-    date = new Date()
+    date = new Date();
 }
 
 export class OrganizationServerMetaData extends AutoEncoder {
     @field({ decoder: StringDecoder, optional: true })
-    privateDKIMKey?: string
+    privateDKIMKey?: string;
 
     @field({ decoder: StringDecoder, optional: true })
-    publicDKIMKey?: string
+    publicDKIMKey?: string;
 
     @field({ decoder: StringDecoder, optional: true, version: 24 })
-    usedRegisterCode?: string
+    usedRegisterCode?: string;
 
     /**
      * When the DNS records are invalid for the first time, this timestamp will get set.
      * When DNS is valid again, this will get cleared
      */
     @field({ decoder: DateDecoder, optional: true, version: 37 })
-    firstInvalidDNSRecords?: Date
+    firstInvalidDNSRecords?: Date;
 
     /**
      * Whether an email has been send to say that the domain is setup correctly
      * Set back to false when changing the domain
      */
     @field({ decoder: BooleanDecoder, optional: true, version: 157 })
-    didSendDomainSetupMail = true
+    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
      */
     @field({ decoder: IntegerDecoder, version: 37 })
-    DNSRecordWarningCount = 0
-    
+    DNSRecordWarningCount = 0;
+
     @field({ decoder: new ArrayDecoder(DateDecoder), optional: true, version: 230 })
-    lastInvalidDNSDates?: Date[]
+    lastInvalidDNSDates?: Date[];
 
     @field({ decoder: BooleanDecoder, version: 230 })
-    isDNSUnstable: boolean = false
+    isDNSUnstable: boolean = false;
 
     @field({ decoder: StringDecoder, optional: true, version: 86 })
-    mollieCustomerId?: string
+    mollieCustomerId?: string;
 
     @field({ decoder: OpenIDClientConfiguration, nullable: true, version: 189 })
-    ssoConfiguration: OpenIDClientConfiguration | null = null
+    ssoConfiguration: OpenIDClientConfiguration | null = null;
 
     /**
      * List of specific emails that were send to this organization
      */
     @field({ decoder: new MapDecoder(StringDecoder, DripEmail), optional: true, version: 230, upgrade: () => {
         const m = new Map<string, DripEmail>();
-        const identifier = "OrganizationDripWelcome";
-        m.set(identifier, DripEmail.create({id: identifier}))
-        return m
+        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<string, DripEmail>();
-        const identifier = "OrganizationDripWelcome";
-        m.set(identifier, DripEmail.create({id: identifier}))
-        return m
+        const identifier = 'OrganizationDripWelcome';
+        m.set(identifier, DripEmail.create({ id: identifier }));
+        return m;
     } })
-    dripEmailList: Map<string, DripEmail> = new Map()
+    dripEmailList: Map<string, DripEmail> = new Map();
 
     markDNSValid() {
         // Reset if longer than 14 days without invalid DNS
-        this.isDNSUnstable = this.recalculateIsDNSUnstable()
-        this.firstInvalidDNSRecords = undefined
+        this.isDNSUnstable = this.recalculateIsDNSUnstable();
+        this.firstInvalidDNSRecords = undefined;
     }
 
     markDNSFailure() {
@@ -80,31 +80,31 @@ export class OrganizationServerMetaData extends AutoEncoder {
             // Hasn't been valid
             return;
         }
-        console.warn("DNS settings became invalid")
-        this.firstInvalidDNSRecords = new Date()
-        
+        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
+        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()
+        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)
+        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: string) {
-        console.log("Marked email ", identifier)
-        const email = DripEmail.create({id: identifier})
+        console.log('Marked email ', identifier);
+        const email = DripEmail.create({ id: identifier });
         this.dripEmailList.set(email.id, email);
     }
 
-    hasEmail(identifier: string, lastMs: number|null = null) {
+    hasEmail(identifier: string, lastMs: number | null = null) {
         if (!this.dripEmailList.has(identifier)) {
             return false;
         }
@@ -112,6 +112,6 @@ export class OrganizationServerMetaData extends AutoEncoder {
             return true;
         }
         const email = this.dripEmailList.get(identifier)!;
-        return email.date.getTime() > Date.now() - lastMs
+        return email.date.getTime() > Date.now() - lastMs;
     }
-}
+}