@stamhoofd/models 2.13.0 → 2.17.0

package/dist/src/models/Webshop.js

@@ -9,38 +9,45 @@ const uuid_1 = require("uuid");
 const DNSValidator_1 = require("../helpers/DNSValidator");
 const _1 = require("./");
 class Webshop extends simple_database_1.Model {
-    constructor() {
-        super(...arguments);
-        // A custom domain name that is used to host the webshop application (should be unique)
-        // E.g. webshop.scoutswetteren.be
-        this.domain = null;
-        // If a domain is used, the optional suffix on that domain
-        // E.g. webshop.scoutswetteren.be/wafelbak
-        this.domainUri = null;
-        // Old uri format, which was only unique on a per-organization basis
-        // in org.stamhoofd.shop/legacyUri
-        this.legacyUri = null;
-        /**
-         * Public meta data
-         */
-        this.meta = structures_1.WebshopMetaData.create({});
-        /**
-         * Data only accessible by the owners / users with special permissions
-         */
-        this.privateMeta = structures_1.WebshopPrivateMetaData.create({});
-        /**
-         * Data only accessible by the server
-         */
-        this.serverMeta = structures_1.WebshopServerMetaData.create({});
-        /**
-         * Contains all the products
-         */
-        this.products = [];
-        /**
-         * Contains all the categories in the right order
-         */
-        this.categories = [];
-    }
+    static table = "webshops";
+    // Columns
+    id;
+    organizationId;
+    // A custom domain name that is used to host the webshop application (should be unique)
+    // E.g. webshop.scoutswetteren.be
+    domain = null;
+    // If a domain is used, the optional suffix on that domain
+    // E.g. webshop.scoutswetteren.be/wafelbak
+    domainUri = null;
+    // Unique representation of this webshop from a string, that is used to provide the default domains
+    // in shop.stamhoofd.be/uri, and stamhoofd.be/shop/uri
+    uri;
+    // Old uri format, which was only unique on a per-organization basis
+    // in org.stamhoofd.shop/legacyUri
+    legacyUri = null;
+    /**
+     * Public meta data
+     */
+    meta = structures_1.WebshopMetaData.create({});
+    /**
+     * Data only accessible by the owners / users with special permissions
+     */
+    privateMeta = structures_1.WebshopPrivateMetaData.create({});
+    /**
+     * Data only accessible by the server
+     */
+    serverMeta = structures_1.WebshopServerMetaData.create({});
+    /**
+     * Contains all the products
+     */
+    products = [];
+    /**
+     * Contains all the categories in the right order
+     */
+    categories = [];
+    createdAt;
+    updatedAt;
+    static organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
     // Methods
     static async getByLegacyURI(organizationId, uri) {
         const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()} FROM ${this.table} WHERE \`organizationId\` = ? AND \`legacyUri\` = ? LIMIT 1`, [organizationId, uri]);
@@ -84,14 +91,13 @@ class Webshop extends simple_database_1.Model {
     }
     // Return the location of the webshop
     getHost() {
-        var _a;
         if (this.domain && this.meta.domainActive) {
             if (this.domainUri) {
                 return this.domain + "/" + this.domainUri;
             }
             return this.domain;
         }
-        const domain = (_a = STAMHOOFD.domains.webshop[this.organization.address.country]) !== null && _a !== void 0 ? _a : STAMHOOFD.domains.webshop[""];
+        const domain = STAMHOOFD.domains.webshop[this.organization.address.country] ?? STAMHOOFD.domains.webshop[""];
         return domain + "/" + this.uri;
     }
     async updateDNSRecords(background = false) {
@@ -120,12 +126,10 @@ class Webshop extends simple_database_1.Model {
     }
 }
 exports.Webshop = Webshop;
-Webshop.table = "webshops";
-Webshop.organization = new simple_database_1.ManyToOneRelation(_1.Organization, "organization");
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], Webshop.prototype, "id", void 0);

package/dist/src/models/Webshop.js.map

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

package/dist/src/models/WebshopDiscountCode.js

@@ -7,13 +7,18 @@ const simple_encoding_1 = require("@simonbackx/simple-encoding");
 const structures_1 = require("@stamhoofd/structures");
 const uuid_1 = require("uuid");
 class WebshopDiscountCode extends simple_database_1.Model {
-    constructor() {
-        super(...arguments);
-        this.description = '';
-        this.discounts = [];
-        this.usageCount = 0;
-        this.maximumUsage = null;
-    }
+    static table = "webshop_discount_codes";
+    // Columns
+    id;
+    organizationId;
+    webshopId;
+    code;
+    description = '';
+    discounts = [];
+    usageCount = 0;
+    maximumUsage = null;
+    createdAt;
+    updatedAt;
     getStructure() {
         return structures_1.DiscountCode.create(this);
     }
@@ -34,11 +39,10 @@ class WebshopDiscountCode extends simple_database_1.Model {
     }
 }
 exports.WebshopDiscountCode = WebshopDiscountCode;
-WebshopDiscountCode.table = "webshop_discount_codes";
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], WebshopDiscountCode.prototype, "id", void 0);

package/dist/src/models/WebshopDiscountCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebshopDiscountCode.js","sourceRoot":"","sources":["../../../src/models/WebshopDiscountCode.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAA2D;AAC3D,sDAA+D;AAC/D,+BAAoC;AAEpC,MAAa,mBAAoB,SAAQ,uBAAK;IAA9C;;QAqBI,gBAAW,GAAG,EAAE,CAAA;QAGhB,cAAS,GAAe,EAAE,CAAA;QAG1B,eAAU,GAAG,CAAC,CAAA;QAGd,iBAAY,GAAgB,IAAI,CAAA;IA6CpC,CAAC;IArBG,YAAY;QACR,OAAO,yBAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,KAAe;QAC1D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC;YACzC,SAAS;YACT,IAAI,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf;SACJ,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,CAAA;QACrF,OAAO,MAAM,CAAC;IAClB,CAAC;;AA1EL,kDA2EC;AA1EU,yBAAK,GAAG,wBAAwB,AAA3B,CAA4B;AAQxC;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;+CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2DACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;iDACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wDACX;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,qBAAQ,CAAC,EAAE,CAAC;sDACpC;AAG1B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;uDACd;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;yDACZ;AAYhC;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;KACJ,CAAC;sDACa;AAUf;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;sDACa"}
+{"version":3,"file":"WebshopDiscountCode.js","sourceRoot":"","sources":["../../../src/models/WebshopDiscountCode.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAA2D;AAC3D,sDAA+D;AAC/D,+BAAoC;AAEpC,MAAa,mBAAoB,SAAQ,uBAAK;IAC1C,MAAM,CAAC,KAAK,GAAG,wBAAwB,CAAC;IAExC,UAAU;IAMV,EAAE,CAAU;IAGZ,cAAc,CAAS;IAGvB,SAAS,CAAS;IAGlB,IAAI,CAAS;IAGb,WAAW,GAAG,EAAE,CAAA;IAGhB,SAAS,GAAe,EAAE,CAAA;IAG1B,UAAU,GAAG,CAAC,CAAA;IAGd,YAAY,GAAgB,IAAI,CAAA;IAYhC,SAAS,CAAM;IAUf,SAAS,CAAM;IAEf,YAAY;QACR,OAAO,yBAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,KAAe;QAC1D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC;YACzC,SAAS;YACT,IAAI,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf;SACJ,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,IAAI,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,CAAA;QACrF,OAAO,MAAM,CAAC;IAClB,CAAC;;AA1EL,kDA2EC;AAlEG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;+CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2DACJ;AAGvB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;iDACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wDACX;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,qBAAQ,CAAC,EAAE,CAAC;sDACpC;AAG1B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;uDACd;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;yDACZ;AAYhC;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;KACJ,CAAC;sDACa;AAUf;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;sDACa"}

package/dist/src/models/addresses/City.js

@@ -6,19 +6,20 @@ const simple_database_1 = require("@simonbackx/simple-database");
 const uuid_1 = require("uuid");
 const Province_1 = require("./Province");
 class City extends simple_database_1.Model {
-    constructor() {
-        super(...arguments);
-        this.parentCityId = null;
-    }
+    static table = "cities";
+    id;
+    name;
+    provinceId;
+    parentCityId = null;
+    country;
+    static parentCity = new simple_database_1.ManyToOneRelation(City, "parentCity");
+    static province = new simple_database_1.ManyToOneRelation(Province_1.Province, "province");
 }
 exports.City = City;
-City.table = "cities";
-City.parentCity = new simple_database_1.ManyToOneRelation(City, "parentCity");
-City.province = new simple_database_1.ManyToOneRelation(Province_1.Province, "province");
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], City.prototype, "id", void 0);

package/dist/src/models/addresses/City.js.map

@@ -1 +1 @@
-{"version":3,"file":"City.js","sourceRoot":"","sources":["../../../../src/models/addresses/City.ts"],"names":[],"mappings":";;;;AAAA,iEAA6E;AAE7E,+BAAoC;AAEpC,yCAAsC;AAEtC,MAAa,IAAK,SAAQ,uBAAK;IAA/B;;QAiBI,iBAAY,GAAkB,IAAI,CAAC;IAOvC,CAAC;;AAxBD,oBAwBC;AAvBU,UAAK,GAAG,QAAQ,AAAX,CAAW;AAqBhB,eAAU,GAAG,IAAI,mCAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,AAA5C,CAA4C;AACtD,aAAQ,GAAG,IAAI,mCAAiB,CAAC,mBAAQ,EAAE,UAAU,CAAC,AAA9C,CAA8C;AAf7D;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;gCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;wCACnC;AAGnB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0CACrC;AAGnC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACV"}
+{"version":3,"file":"City.js","sourceRoot":"","sources":["../../../../src/models/addresses/City.ts"],"names":[],"mappings":";;;;AAAA,iEAA6E;AAE7E,+BAAoC;AAEpC,yCAAsC;AAEtC,MAAa,IAAK,SAAQ,uBAAK;IAC3B,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAA;IAOvB,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,UAAU,CAAS;IAGnB,YAAY,GAAkB,IAAI,CAAC;IAGnC,OAAO,CAAU;IAEjB,MAAM,CAAC,UAAU,GAAG,IAAI,mCAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IAC7D,MAAM,CAAC,QAAQ,GAAG,IAAI,mCAAiB,CAAC,mBAAQ,EAAE,UAAU,CAAC,CAAA;;AAvBjE,oBAwBC;AAhBG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;gCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;wCACnC;AAGnB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0CACrC;AAGnC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACV"}

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

@@ -9,6 +9,12 @@ const utility_1 = require("@stamhoofd/utility");
 const uuid_1 = require("uuid");
 const City_1 = require("./City");
 class PostalCode extends simple_database_1.Model {
+    static table = "postal_codes";
+    id;
+    postalCode;
+    cityId;
+    country;
+    static city = new simple_database_1.ManyToOneRelation(City_1.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)
      */
@@ -117,12 +123,10 @@ class PostalCode extends simple_database_1.Model {
     }
 }
 exports.PostalCode = PostalCode;
-PostalCode.table = "postal_codes";
-PostalCode.city = new simple_database_1.ManyToOneRelation(City_1.City, "city");
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], PostalCode.prototype, "id", void 0);

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

@@ -1 +1 @@
-{"version":3,"file":"PostalCode.js","sourceRoot":"","sources":["../../../../src/models/addresses/PostalCode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PostalCode.js","sourceRoot":"","sources":["../../../../src/models/addresses/PostalCode.ts"],"names":[],"mappings":";;;;AAAA,iEAAsF;AACtF,6DAAwD;AACxD,sDAAgD;AAChD,gDAA8D;AAC9D,+BAAoC;AAEpC,iCAA8B;AAE9B,MAAa,UAAW,SAAQ,uBAAK;IACjC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAA;IAO7B,EAAE,CAAU;IAGZ,UAAU,CAAS;IAGnB,MAAM,CAAS;IAGf,OAAO,CAAU;IAEjB,MAAM,CAAC,IAAI,GAAG,IAAI,mCAAiB,CAAC,WAAI,EAAE,MAAM,CAAC,CAAA;IAEjD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAkB,EAAE,QAAgB,EAAE,OAAgB;QACvE,IAAI,KAAK,GAAG,UAAU,WAAI,CAAC,gBAAgB,EAAE,UAAU,UAAU,CAAC,KAAK,MAAM,CAAC;QAC9E,KAAK,IAAI,UAAU,WAAI,CAAC,KAAK,WAAW,UAAU,CAAC,KAAK,QAAQ,UAAU,CAAC,IAAI,CAAC,UAAU,UAAU,WAAI,CAAC,KAAK,QAAQ,WAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;QAE7I,uIAAuI;QACvI,KAAK,IAAI,WAAW,UAAU,CAAC,KAAK,+BAA+B,UAAU,CAAC,KAAK,oBAAoB,CAAA;QAEvG,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;QAErE,MAAM,MAAM,GAAG,WAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAI,CAAC,KAAK,CAAC,CAAA;QAEjD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QACpB,CAAC;QAED,6DAA6D;QAC7D,IAAI,SAAS,GAAG,CAAC,CAAA;QACjB,IAAI,QAAQ,GAAgB,IAAI,CAAA;QAEhC,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,uBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YACzD,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO,IAAI,CAAA;YACf,CAAC;YAED,IAAI,QAAQ,KAAK,IAAI,IAAI,IAAI,GAAG,SAAS,EAAE,CAAC;gBACxC,QAAQ,GAAG,IAAI,CAAA;gBACf,SAAS,GAAG,IAAI,CAAA;YACpB,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;YACpI,OAAO,QAAQ,CAAA;QACnB,CAAC;QAED,SAAS,GAAG,CAAC,CAAA;QACb,QAAQ,GAAG,IAAI,CAAA;QAEf,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,uBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAE3D,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,GAAG,SAAS,EAAE,CAAC;gBACzC,QAAQ,GAAG,IAAI,CAAA;gBACf,SAAS,GAAG,KAAK,CAAA;YACrB,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAC,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACjG,OAAO,QAAQ,CAAA;QACnB,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;YACxH,kDAAkD;YAClD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;YACzD,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,IAAI,GAAG,uBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;gBAC3D,IAAI,IAAI,GAAG,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACpB,MAAM,IAAI,2BAAW,CAAC;4BAClB,IAAI,EAAE,eAAe;4BACrB,OAAO,EAAE,6BAA6B,GAAG,mBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,GAAG;4BACxG,KAAK,EAAE,oCAAoC,GAAG,mBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,GAAG;4BAC7G,KAAK,EAAE,MAAM;yBAChB,CAAC,CAAA;oBACN,CAAC;oBACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA,CAAC,kEAAkE;gBACvF,CAAC;YACL,CAAC;QACL,CAAC;QAED,gCAAgC;QAChC,IAAI,OAAO,IAAI,oBAAO,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,QAAgB,EAAE,OAAgB;QAC/E,IAAI,KAAK,GAAG,UAAU,WAAI,CAAC,gBAAgB,EAAE,UAAU,UAAU,CAAC,KAAK,MAAM,CAAC;QAC9E,KAAK,IAAI,UAAU,WAAI,CAAC,KAAK,qBAAqB,UAAU,CAAC,KAAK,QAAQ,UAAU,CAAC,IAAI,CAAC,UAAU,qBAAqB,WAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;QAChJ,KAAK,IAAI,UAAU,WAAI,CAAC,KAAK,sBAAsB,WAAI,CAAC,OAAO,CAAC,IAAI,UAAU,WAAI,CAAC,KAAK,QAAQ,WAAI,CAAC,UAAU,CAAC,UAAU,MAAM,CAAA;QAEhI,uIAAuI;QACvI,KAAK,IAAI,WAAW,UAAU,CAAC,KAAK,+BAA+B,UAAU,CAAC,KAAK,oBAAoB,CAAA;QAEvG,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;QAErE,MAAM,MAAM,GAAG,WAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAI,CAAC,KAAK,CAAC,CAAA;QAEjD,6DAA6D;QAC7D,IAAI,SAAS,GAAG,CAAC,CAAA;QACjB,IAAI,QAAQ,GAAgB,IAAI,CAAA;QAEhC,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,uBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YACzD,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO,IAAI,CAAA;YACf,CAAC;YAED,IAAI,QAAQ,KAAK,IAAI,IAAI,IAAI,GAAG,SAAS,EAAE,CAAC;gBACxC,QAAQ,GAAG,IAAI,CAAA;gBACf,SAAS,GAAG,IAAI,CAAA;YACpB,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;YACpI,OAAO,QAAQ,CAAA;QACnB,CAAC;QAED,SAAS,GAAG,CAAC,CAAA;QACb,QAAQ,GAAG,IAAI,CAAA;QAEf,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,uBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAE3D,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,GAAG,SAAS,EAAE,CAAC;gBACzC,QAAQ,GAAG,IAAI,CAAA;gBACf,SAAS,GAAG,KAAK,CAAA;YACrB,CAAC;QACL,CAAC;QAED,IAAI,QAAQ,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAC,CAAC,IAAI,uBAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACjG,OAAO,QAAQ,CAAA;QACnB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;;AA1JL,gCA2JC;AAnJG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;sCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;8CACR;AAGnB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;0CACzC;AAGf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;2CACV"}

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

@@ -5,13 +5,16 @@ const tslib_1 = require("tslib");
 const simple_database_1 = require("@simonbackx/simple-database");
 const uuid_1 = require("uuid");
 class Province extends simple_database_1.Model {
+    static table = "provinces";
+    id;
+    name;
+    country;
 }
 exports.Province = Province;
-Province.table = "provinces";
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], Province.prototype, "id", void 0);

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

@@ -1 +1 @@
-{"version":3,"file":"Province.js","sourceRoot":"","sources":["../../../../src/models/addresses/Province.ts"],"names":[],"mappings":";;;;AAAA,iEAA2D;AAE3D,+BAAoC;AAEpC,MAAa,QAAS,SAAQ,uBAAK;;AAAnC,4BAeC;AAdU,cAAK,GAAG,WAAW,CAAA;AAO1B;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;oCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;yCACV"}
+{"version":3,"file":"Province.js","sourceRoot":"","sources":["../../../../src/models/addresses/Province.ts"],"names":[],"mappings":";;;;AAAA,iEAA2D;AAE3D,+BAAoC;AAEpC,MAAa,QAAS,SAAQ,uBAAK;IAC/B,MAAM,CAAC,KAAK,GAAG,WAAW,CAAA;IAO1B,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,OAAO,CAAU;;AAdrB,4BAeC;AAPG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;oCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;sCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;yCACV"}

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

@@ -6,14 +6,17 @@ const simple_database_1 = require("@simonbackx/simple-database");
 const uuid_1 = require("uuid");
 const City_1 = require("./City");
 class Street extends simple_database_1.Model {
+    static table = "streets";
+    id;
+    name;
+    cityId;
+    static city = new simple_database_1.ManyToOneRelation(City_1.City, "city");
 }
 exports.Street = Street;
-Street.table = "streets";
-Street.city = new simple_database_1.ManyToOneRelation(City_1.City, "city");
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         primary: true, type: "string", beforeSave(value) {
-            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+            return value ?? (0, uuid_1.v4)();
         }
     })
 ], Street.prototype, "id", void 0);

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

@@ -1 +1 @@
-{"version":3,"file":"Street.js","sourceRoot":"","sources":["../../../../src/models/addresses/Street.ts"],"names":[],"mappings":";;;;AAAA,iEAA+E;AAC/E,+BAAoC;AAEpC,iCAA8B;AAE9B,MAAa,MAAO,SAAQ,uBAAK;;AAAjC,wBAmBC;AAlBU,YAAK,GAAG,SAAS,CAAA;AAejB,WAAI,GAAG,IAAI,mCAAiB,CAAC,WAAI,EAAE,MAAM,CAAC,CAAA;AARjD;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;kCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;sCACrC"}
+{"version":3,"file":"Street.js","sourceRoot":"","sources":["../../../../src/models/addresses/Street.ts"],"names":[],"mappings":";;;;AAAA,iEAA+E;AAC/E,+BAAoC;AAEpC,iCAA8B;AAE9B,MAAa,MAAO,SAAQ,uBAAK;IAC7B,MAAM,CAAC,KAAK,GAAG,SAAS,CAAA;IAOxB,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,MAAM,CAAS;IAEf,MAAM,CAAC,IAAI,GAAG,IAAI,mCAAiB,CAAC,WAAI,EAAE,MAAM,CAAC,CAAA;;AAhBrD,wBAmBC;AAXG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;kCACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;sCACrC"}

package/dist/src/structures/OrganizationServerMetaData.js

@@ -5,10 +5,8 @@ const tslib_1 = require("tslib");
 const simple_encoding_1 = require("@simonbackx/simple-encoding");
 const structures_1 = require("@stamhoofd/structures");
 class DripEmail extends simple_encoding_1.AutoEncoder {
-    constructor() {
-        super(...arguments);
-        this.date = new Date();
-    }
+    id;
+    date = new Date();
 }
 exports.DripEmail = DripEmail;
 tslib_1.__decorate([
@@ -18,32 +16,38 @@ tslib_1.__decorate([
     (0, simple_encoding_1.field)({ decoder: simple_encoding_1.DateDecoder })
 ], DripEmail.prototype, "date", void 0);
 class OrganizationServerMetaData extends simple_encoding_1.AutoEncoder {
-    constructor() {
-        super(...arguments);
-        /**
-         * Whether an email has been send to say that the domain is setup correctly
-         * Set back to false when changing the domain
-         */
-        this.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
-         */
-        this.DNSRecordWarningCount = 0;
-        this.isDNSUnstable = false;
-        this.ssoConfiguration = null;
-        /**
-         * List of specific emails that were send to this organization
-         */
-        this.dripEmailList = new Map();
-    }
+    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;
+    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() {
-        var _a;
         if (this.firstInvalidDNSRecords) {
             // Hasn't been valid
             return;
@@ -53,16 +57,15 @@ class OrganizationServerMetaData extends simple_encoding_1.AutoEncoder {
         // 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 = [...((_a = this.lastInvalidDNSDates) !== null && _a !== void 0 ? _a : []), new Date()].filter(d => d > d14).slice(0, maxLength);
+        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() {
-        var _a;
         const d14 = new Date(Date.now() - 1000 * 60 * 60 * 24 * 14);
-        return ((_a = this.lastInvalidDNSDates) !== null && _a !== void 0 ? _a : []).filter(d => d > d14).length > (this.isDNSUnstable ? 0 : 4);
+        return (this.lastInvalidDNSDates ?? []).filter(d => d > d14).length > (this.isDNSUnstable ? 0 : 4);
     }
     addEmail(identifier) {
         console.log("Marked email ", identifier);

package/dist/src/structures/OrganizationServerMetaData.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.13.0",
+    "version": "2.17.0",
     "main": "./dist/src/index.js",
     "types": "./dist/src/index.d.ts",
     "license": "UNLICENCED",
@@ -24,7 +24,10 @@
         "base-x": "^3.0.9"
     },
     "devDependencies": {
-        "@simonbackx/simple-database": "1.24.0"
+        "@simonbackx/simple-database": "1.25.0"
     },
-    "gitHead": "2b130616eebea8cd30feb0f361c7bb0f48b534ba"
+    "publishConfig": {
+        "access": "public"
+    },
+    "gitHead": "5f940486646acd12e23e96a750bc12ca2be4df44"
 }

package/src/helpers/EmailBuilder.ts

@@ -1,18 +1,91 @@
 import { EmailAddress, EmailBuilder } from "@stamhoofd/email";
-import { Recipient, Replacement } from "@stamhoofd/structures";
+import { EmailTemplateType, Recipient, Replacement } from "@stamhoofd/structures";
 import { Formatter } from "@stamhoofd/utility";
 
-import { Organization, Platform, User } from "../models";
 import { SimpleError } from "@simonbackx/simple-errors";
+import { EmailTemplate, Organization, Platform, User } from "../models";
 
-export async function getEmailBuilder(organization: Organization|null, email: {
+export type EmailTemplateOptions = {
+    type: EmailTemplateType,
+    webshopId?: string | null,
+    groupId?: string | null,
+    organizationId?: string | null
+}
+
+export async function getEmailTemplate(data: EmailTemplateOptions) {
+    // Most specific template: for specific group
+    const q = EmailTemplate.select()
+        .where('type', data.type)
+
+    if (data.groupId) {
+        q.where('groupId', data.groupId)
+    }
+
+    if (data.organizationId) {
+        q.where('organizationId', data.organizationId)
+    }
+
+    if (data.webshopId) {
+        q.where('webshopId', data.webshopId)
+    }
+
+    let templates = await q.limit(1).fetch()
+    
+    // Specific for organization
+    if (templates.length == 0 && (data.groupId || data.webshopId) && data.organizationId) {
+        templates = await EmailTemplate.select()
+            .where('type', data.type)
+            .where('organizationId', data.organizationId)
+            .where('groupId', null)
+            .where('webshopId', null)
+            .limit(1)
+            .fetch()
+    }
+
+    // Default for platform
+    if (templates.length == 0 && (data.groupId || data.webshopId || data.organizationId)) {
+        templates = await EmailTemplate.select()
+            .where('type', data.type)
+            .where('organizationId', null)
+            .where('groupId', null)
+            .where('webshopId', null)
+            .limit(1)
+            .fetch()
+    }
+
+    if (templates.length == 0) {
+        console.error("Could not find email template for type "+data.type)
+        return
+    }
+
+    return templates[0]
+}
+
+
+export async function getEmailBuilderForTemplate(organization: Organization|null, options: Omit<EmailBuilderOptions, "subject" | "html"> & { template: Omit<EmailTemplateOptions, "organizationId"> }) {
+    const template = await getEmailTemplate({
+        ...options.template,
+        organizationId: organization?.id ?? null
+    })
+
+    if (!template) {
+        return undefined
+    }
+
+    return await getEmailBuilder(organization, {
+        ...options,
+        subject: template.subject,
+        html: template.html
+    })
+}
+
+export type EmailBuilderOptions = {
     defaultReplacements?: Replacement[],
     recipients: Recipient[], 
     from: string, 
     replyTo?: string|null, 
     subject: string, 
-    //text: string | null, 
-    html: string | null,
+    html: string,
     attachments?: {
         filename: string;
         content: string;
@@ -23,8 +96,14 @@ export async function getEmailBuilder(organization: Organization|null, email: {
     unsubscribeType?: 'all'|'marketing',
     fromStamhoofd?: boolean,
     singleBcc?: string,
+    replaceAll?: {from: string, to: string}[], // replace in all e-mails, not recipient dependent
     callback?: (error: Error|null) => void; // for each email
-}) {
+}
+
+/**
+ * @param organization defines replacements and unsubsribe behaviour
+ */
+export async function getEmailBuilder(organization: Organization|null, email: EmailBuilderOptions) {
     const platform = await Platform.getSharedStruct()
     // Update recipients
     const cleaned: Recipient[] = []
@@ -86,16 +165,21 @@ export async function getEmailBuilder(organization: Organization|null, email: {
         if (organization) {
             const extra = organization.meta.getEmailReplacements()
             recipient.replacements.push(...extra)
-        } else {
-            const extra = platform.config.getEmailReplacements()
-            recipient.replacements.push(...extra)
-        }
+        } 
+
+        // Defaults
+        const extra = platform.config.getEmailReplacements()
+        recipient.replacements.push(...extra)
     }
 
     const queue = email.recipients.slice()
 
     let emailIndex = 0;
 
+    for (const s of email.replaceAll ?? []) {
+        email.html = email.html.replaceAll(s.from, s.to)
+    }
+
     // Create e-mail builder
     const builder: EmailBuilder = () => {
         const recipient = queue.shift()
@@ -105,15 +189,9 @@ export async function getEmailBuilder(organization: Organization|null, email: {
 
         let replacedHtml = email.html
         let replacedSubject = email.subject
-        //let replacedText = email.text
 
         for (const replacement of recipient.replacements) {
-            if (replacedHtml) {
-                replacedHtml = replacedHtml.replaceAll("{{"+replacement.token+"}}", replacement.html ?? Formatter.escapeHtml(replacement.value))
-            }
-            //if (replacedText) {
-            //    replacedText = replacedText.replaceAll("{{"+replacement.token+"}}", replacement.value)
-            //}
+            replacedHtml = replacedHtml.replaceAll("{{"+replacement.token+"}}", replacement.html ?? Formatter.escapeHtml(replacement.value))
             replacedSubject = replacedSubject.replaceAll("{{"+replacement.token+"}}", replacement.value)
         }
 

package/src/helpers/RateLimiter.ts

@@ -42,6 +42,7 @@ export class RateLimitWindow {
             throw new SimpleError({
                 code: 'rate_limit',
                 message: `Rate limit exceeded (${w} ${amount > 1 ? '('+amount+' added)' : ''} requests in ${Math.round(this.age/1000)}s). Retry after ${retryAfter}s. Check your code and try to reduce the number of (parallel) requests you make. Add waiting periods if needed.`,
+                human: `Oeps! Te veel aanvragen. Om spam te vermijden is jouw aanvraag tijdelijk geblokkeerd. Probeer het over ${retryAfter} seconden opnieuw.`,
                 statusCode: 429
             })
         }