@stamhoofd/models 2.78.4 → 2.79.0

package/dist/src/models/Platform.js

@@ -6,6 +6,7 @@ const simple_database_1 = require("@simonbackx/simple-database");
 const queues_1 = require("@stamhoofd/queues");
 const sql_1 = require("@stamhoofd/sql");
 const structures_1 = require("@stamhoofd/structures");
+const utility_1 = require("@stamhoofd/utility");
 const uuid_1 = require("uuid");
 const RegistrationPeriod_1 = require("./RegistrationPeriod");
 class Platform extends sql_1.QueryableModel {
@@ -20,38 +21,37 @@ class Platform extends sql_1.QueryableModel {
      * Invisible data for the frontend / structs - no matter your auhtorization level
      */
     serverConfig = structures_1.PlatformServerConfig.create({});
+    static shared = null;
+    static sharedPrivateStruct = null;
     static sharedStruct = null;
     static async getSharedStruct() {
-        const struct = await this.getSharedPrivateStruct();
-        const clone = struct.clone();
-        clone.privateConfig = null;
-        clone.setShared();
-        return clone;
+        if (!this.sharedStruct) {
+            await this.loadCaches();
+        }
+        if (!this.sharedStruct || !!this.sharedStruct.privateConfig) {
+            throw new Error('[Platform] Failed to load platform shared struct');
+        }
+        return this.sharedStruct;
     }
     async setPreviousPeriodId() {
         const period = await RegistrationPeriod_1.RegistrationPeriod.getByID(this.periodId);
         this.previousPeriodId = period?.previousPeriodId ?? null;
     }
     static async getSharedPrivateStruct() {
-        if (this.sharedStruct && this.sharedStruct.privateConfig) {
-            return this.sharedStruct;
+        if (!this.sharedPrivateStruct) {
+            await this.loadCaches();
         }
-        return await queues_1.QueueHandler.schedule('Platform.getSharedStruct', async () => {
-            const model = await this.getShared();
-            const period = await RegistrationPeriod_1.RegistrationPeriod.getByID(model.periodId);
-            const struct = structures_1.Platform.create({
-                ...model,
-                period: period?.getStructure() ?? undefined,
-            });
-            this.sharedStruct = struct;
-            return struct;
-        });
+        if (!this.sharedPrivateStruct || !this.sharedPrivateStruct.privateConfig) {
+            throw new Error('[Platform] Failed to load platform shared private struct');
+        }
+        return this.sharedPrivateStruct;
     }
-    static async getShared() {
-        return queues_1.QueueHandler.schedule('Platform.getShared', async () => {
+    static async getForEditing() {
+        return queues_1.QueueHandler.schedule('Platform.getModel', async () => {
             // Build a new one
             let model = await this.getByID('1');
             if (!model) {
+                console.info('[Platform] Creating new platform');
                 // Create a new platform
                 model = new Platform();
                 model.id = '1';
@@ -61,14 +61,66 @@ class Platform extends sql_1.QueryableModel {
             return model;
         });
     }
-    static clearCache() {
-        this.sharedStruct = null;
+    static async getShared() {
+        return queues_1.QueueHandler.schedule('Platform.getShared', async () => {
+            if (this.shared) {
+                return this.shared;
+            }
+            // Build a new one
+            const model = await this.getForEditing();
+            (0, utility_1.deepFreeze)(model);
+            this.shared = model;
+            return model;
+        });
+    }
+    static async loadCaches() {
+        await queues_1.QueueHandler.schedule('Platform.loadCaches', async () => {
+            if (this.sharedPrivateStruct && this.sharedStruct) {
+                // Already loaded (possible if multiple calls to loadCaches were made)
+                return;
+            }
+            // Build a new one
+            const model = await this.getForEditing();
+            await this.setCachesFromModel(model);
+        });
+    }
+    static async setCachesFromModel(model) {
+        // Set structure cache
+        const period = await RegistrationPeriod_1.RegistrationPeriod.getByID(model.periodId);
+        const struct = structures_1.Platform.create({
+            ...model,
+            period: period?.getStructure() ?? undefined,
+        });
+        // We clone to avoid the chance of updating the platform model
+        this.sharedPrivateStruct = struct.clone();
+        const clone = struct.clone();
+        clone.privateConfig = null;
+        clone.setShared();
+        this.sharedStruct = clone;
+    }
+    static async clearCache() {
+        await this.clearCacheWithoutRefresh();
+        await this.loadCaches();
+    }
+    static async clearCacheWithoutRefresh() {
+        await queues_1.QueueHandler.schedule('Platform.loadCaches', async () => {
+            this.sharedStruct = null;
+            this.sharedPrivateStruct = null;
+        });
+        await queues_1.QueueHandler.schedule('Platform.getShared', async () => {
+            this.shared = null;
+        });
     }
     async save() {
+        let update = false;
+        if (this.existsInDatabase) {
+            update = true;
+        }
         const s = await super.save();
-        Platform.clearCache();
-        // Force update cache immediately
-        await Platform.getSharedStruct();
+        if (update) {
+            // Force update cache immediately
+            await Platform.clearCache();
+        }
         return s;
     }
 }

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

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

package/dist/src/models/Platform.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Platform.test.d.ts.map

package/dist/src/models/Platform.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Platform.test.d.ts","sourceRoot":"","sources":["../../../src/models/Platform.test.ts"],"names":[],"mappings":""}

package/dist/src/models/Platform.test.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const structures_1 = require("@stamhoofd/structures");
+const Platform_1 = require("./Platform");
+const simple_database_1 = require("@simonbackx/simple-database");
+describe('Model.Platform', () => {
+    describe('Shared caches', () => {
+        beforeEach(async () => {
+            const platform = await Platform_1.Platform.getByID('1');
+            platform.config = structures_1.PlatformConfig.create({});
+            await platform.save();
+        });
+        test('Editable model changes do not propagate', async () => {
+            const editable = await Platform_1.Platform.getForEditing();
+            editable.config.membershipTypes = [
+                structures_1.PlatformMembershipType.create({ id: '1', name: 'Test' }),
+            ];
+            const shared = (await Platform_1.Platform.getShared());
+            expect(shared.config.membershipTypes).toHaveLength(0);
+        });
+        test('Shared model is immutable', async () => {
+            const editable = await Platform_1.Platform.getForEditing();
+            editable.config.membershipTypes = [
+                structures_1.PlatformMembershipType.create({ id: '1', name: 'Test' }),
+            ];
+            await editable.save();
+            const shared = (await Platform_1.Platform.getShared());
+            expect(() => {
+                shared.privateConfig.roles = [];
+            }).toThrow();
+            expect(() => {
+                shared.membershipOrganizationId = '2';
+            }).toThrow();
+            expect(shared.config.membershipTypes).toHaveLength(1);
+            expect(() => {
+                shared.concat.membershipTypes[0].name = 'Test2';
+            }).toThrow();
+        });
+        test('Saving changes propagates to all shared states', async () => {
+            const structBefore = await Platform_1.Platform.getSharedStruct();
+            const privateStructBefore = await Platform_1.Platform.getSharedPrivateStruct();
+            const sharedModelBefore = await Platform_1.Platform.getShared();
+            const editable = await Platform_1.Platform.getForEditing();
+            editable.config.membershipTypes = [
+                structures_1.PlatformMembershipType.create({ id: '1', name: 'Hey there' }),
+            ];
+            await editable.save();
+            const structAfter = await Platform_1.Platform.getSharedStruct();
+            const privateStructAfter = await Platform_1.Platform.getSharedPrivateStruct();
+            const sharedModelAfter = await Platform_1.Platform.getShared();
+            expect(structAfter.config.membershipTypes[0].name).toEqual('Hey there');
+            expect(privateStructAfter.config.membershipTypes[0].name).toEqual('Hey there');
+            expect(sharedModelAfter.config.membershipTypes[0].name).toEqual('Hey there');
+            // Test before state not altered
+            expect(structBefore.config.membershipTypes).toHaveLength(0);
+            expect(privateStructBefore.config.membershipTypes).toHaveLength(0);
+            expect(sharedModelBefore.config.membershipTypes).toHaveLength(0);
+        });
+    });
+    describe('Creating fresh platform', () => {
+        beforeEach(async () => {
+            await simple_database_1.Database.delete('DELETE FROM platform');
+            await Platform_1.Platform.clearCacheWithoutRefresh();
+            if (await Platform_1.Platform.getByID('1')) {
+                throw new Error('Platform 1 should not exist');
+            }
+        });
+        test('when requesting getForEditing', async () => {
+            const editable = await Platform_1.Platform.getForEditing();
+            expect(editable.id).toBe('1');
+            expect(await Platform_1.Platform.getByID('1')).toEqual(editable);
+        });
+        test('when requesting getShared', async () => {
+            const shared = await Platform_1.Platform.getShared();
+            expect(shared.id).toBe('1');
+            expect(await Platform_1.Platform.getByID('1')).toMatchObject(shared);
+        });
+        test('when requesting getSharedPrivateStruct', async () => {
+            const editable = await Platform_1.Platform.getSharedPrivateStruct();
+            expect(editable).toBeDefined();
+            expect(await Platform_1.Platform.getByID('1')).toBeDefined();
+        });
+        test('when requesting getSharedStruct', async () => {
+            const editable = await Platform_1.Platform.getSharedStruct();
+            expect(editable).toBeDefined();
+            expect(await Platform_1.Platform.getByID('1')).toBeDefined();
+        });
+    });
+});
+//# sourceMappingURL=Platform.test.js.map

package/dist/src/models/Platform.test.js.map

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

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

@@ -2,7 +2,7 @@ export { Organization } from './Organization';
 export { User } from './User';
 export { Payment } from './Payment';
 export { Registration } from './Registration';
-export { Member, RegistrationWithMember, MemberWithRegistrations } from './Member';
+export * from './Member';
 export { MergedMember } from './MergedMember';
 export * from './EmailVerificationCode';
 export * from './Image';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,cAAc,yBAAyB,CAAC;AAExC,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/C,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AAErC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AAExC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAE7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,cAAc,yBAAyB,CAAC;AAExC,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/C,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AAErC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AAExC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,uBAAuB,CAAC;AAEtC,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAE7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}

package/dist/src/models/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Group = exports.BalanceItemPayment = exports.BalanceItem = exports.Token = exports.STPendingInvoice = exports.Order = exports.MergedMember = exports.Member = exports.Registration = exports.Payment = exports.User = exports.Organization = void 0;
+exports.Group = exports.BalanceItemPayment = exports.BalanceItem = exports.Token = exports.STPendingInvoice = exports.Order = exports.MergedMember = exports.Registration = exports.Payment = exports.User = exports.Organization = void 0;
 const tslib_1 = require("tslib");
 var Organization_1 = require("./Organization");
 Object.defineProperty(exports, "Organization", { enumerable: true, get: function () { return Organization_1.Organization; } });
@@ -10,8 +10,7 @@ var Payment_1 = require("./Payment");
 Object.defineProperty(exports, "Payment", { enumerable: true, get: function () { return Payment_1.Payment; } });
 var Registration_1 = require("./Registration");
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
-var Member_1 = require("./Member");
-Object.defineProperty(exports, "Member", { enumerable: true, get: function () { return Member_1.Member; } });
+tslib_1.__exportStar(require("./Member"), exports);
 var MergedMember_1 = require("./MergedMember");
 Object.defineProperty(exports, "MergedMember", { enumerable: true, get: function () { return MergedMember_1.MergedMember; } });
 tslib_1.__exportStar(require("./EmailVerificationCode"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,mCAAmF;AAA1E,gGAAA,MAAM,OAAA;AACf,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AAErB,kEAAwC;AAExC,kDAAwB;AACxB,0DAAgC;AAChC,wDAA8B;AAC9B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,0DAAgC;AAChC,4DAAkC;AAClC,yDAA+B;AAC/B,sDAA4B;AAC5B,sDAA4B;AAC5B,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iCAA+C;AAAtC,8FAAA,KAAK,OAAA;AACd,oDAA0B;AAC1B,qDAA2B;AAC3B,6DAAmC;AACnC,mDAAyB;AACzB,0DAAgC;AAChC,4DAAkC;AAClC,6CAA4C;AAAnC,0GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,6DAAmC;AACnC,2DAAiC;AACjC,iEAAuC;AACvC,+DAAqC;AAErC,0DAAgC;AAChC,gEAAsC;AACtC,kEAAwC;AAExC,qDAA2B;AAC3B,6DAAmC;AAEnC,gEAAsC;AAEtC,qDAA2B;AAC3B,uEAA6C;AAE7C,2EAAiD;AACjD,+DAAqC;AACrC,qEAA2C;AAC3C,kDAAwB;AACxB,2DAAiC;AACjC,kDAAwB;AACxB,8DAAoC;AACpC,0DAAgC;AAChC,qDAA2B;AAC3B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,mDAAyB;AACzB,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AAErB,kEAAwC;AAExC,kDAAwB;AACxB,0DAAgC;AAChC,wDAA8B;AAC9B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,0DAAgC;AAChC,4DAAkC;AAClC,yDAA+B;AAC/B,sDAA4B;AAC5B,sDAA4B;AAC5B,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iCAA+C;AAAtC,8FAAA,KAAK,OAAA;AACd,oDAA0B;AAC1B,qDAA2B;AAC3B,6DAAmC;AACnC,mDAAyB;AACzB,0DAAgC;AAChC,4DAAkC;AAClC,6CAA4C;AAAnC,0GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,6DAAmC;AACnC,2DAAiC;AACjC,iEAAuC;AACvC,+DAAqC;AAErC,0DAAgC;AAChC,gEAAsC;AACtC,kEAAwC;AAExC,qDAA2B;AAC3B,6DAAmC;AAEnC,gEAAsC;AAEtC,qDAA2B;AAC3B,uEAA6C;AAE7C,2EAAiD;AACjD,+DAAqC;AACrC,qEAA2C;AAC3C,kDAAwB;AACxB,2DAAiC;AACjC,kDAAwB;AACxB,8DAAoC;AACpC,0DAAgC;AAChC,qDAA2B;AAC3B,uDAA6B"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/factories/addressfactory.ts","../src/factories/balanceitemfactory.ts","../src/factories/emergencycontactfactory.ts","../src/factories/groupfactory.ts","../src/factories/memberfactory.ts","../src/factories/organizationfactory.ts","../src/factories/organizationtagfactory.ts","../src/factories/parentfactory.ts","../src/factories/recordfactory.ts","../src/factories/registercodefactory.ts","../src/factories/registrationfactory.ts","../src/factories/registrationperiodfactory.ts","../src/factories/userfactory.ts","../src/factories/webshopfactory.ts","../src/factories/index.ts","../src/helpers/dnsvalidator.ts","../src/helpers/emailbuilder.ts","../src/helpers/groupbuilder.ts","../src/helpers/handlebars.ts","../src/helpers/membermerger.test.ts","../src/helpers/membermerger.ts","../src/helpers/ratelimiter.ts","../src/helpers/webshopcounter.ts","../src/migrations/1605262045-import-postcodes.ts","../src/migrations/1605262046-import-postcodes-nl.ts","../src/models/auditlog.ts","../src/models/balanceitem.ts","../src/models/balanceitempayment.ts","../src/models/buckaroopayment.ts","../src/models/cachedbalance.ts","../src/models/document.ts","../src/models/documenttemplate.ts","../src/models/email.test.ts","../src/models/email.ts","../src/models/emailrecipient.ts","../src/models/emailtemplate.ts","../src/models/emailverificationcode.ts","../src/models/event.ts","../src/models/eventnotification.ts","../src/models/group.ts","../src/models/image.ts","../src/models/member.ts","../src/models/memberplatformmembership.ts","../src/models/memberresponsibilityrecord.ts","../src/models/memberuser.ts","../src/models/mergedmember.ts","../src/models/molliepayment.ts","../src/models/mollietoken.ts","../src/models/onetimetoken.ts","../src/models/order.ts","../src/models/organization.ts","../src/models/organizationregistrationperiod.ts","../src/models/passwordtoken.ts","../src/models/payconiqpayment.ts","../src/models/payment.ts","../src/models/platform.ts","../src/models/registercode.ts","../src/models/registration.ts","../src/models/registrationperiod.ts","../src/models/stcredit.ts","../src/models/stinvoice.ts","../src/models/stpackage.ts","../src/models/stpendinginvoice.ts","../src/models/stripeaccount.ts","../src/models/stripecheckoutsession.ts","../src/models/stripepaymentintent.ts","../src/models/ticket.ts","../src/models/token.test.ts","../src/models/token.ts","../src/models/usedregistercode.ts","../src/models/user.ts","../src/models/userpermissions.ts","../src/models/webshop.ts","../src/models/webshopdiscountcode.ts","../src/models/index.ts","../src/models/addresses/city.ts","../src/models/addresses/postalcode.test.ts","../src/models/addresses/postalcode.ts","../src/models/addresses/province.ts","../src/models/addresses/street.ts","../src/structures/organizationservermetadata.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.6.2"}
+{"root":["../src/index.ts","../src/factories/addressfactory.ts","../src/factories/balanceitemfactory.ts","../src/factories/emergencycontactfactory.ts","../src/factories/groupfactory.ts","../src/factories/memberfactory.ts","../src/factories/memberresponsibilityrecordfactory.ts","../src/factories/organizationfactory.ts","../src/factories/organizationregistrationperiodfactory.ts","../src/factories/organizationtagfactory.ts","../src/factories/parentfactory.ts","../src/factories/platformresponsibilityfactory.ts","../src/factories/recordfactory.ts","../src/factories/registercodefactory.ts","../src/factories/registrationfactory.ts","../src/factories/registrationperiodfactory.ts","../src/factories/userfactory.ts","../src/factories/webshopfactory.ts","../src/factories/index.ts","../src/helpers/dnsvalidator.ts","../src/helpers/emailbuilder.ts","../src/helpers/groupbuilder.ts","../src/helpers/handlebars.ts","../src/helpers/membermerger.test.ts","../src/helpers/membermerger.ts","../src/helpers/ratelimiter.ts","../src/helpers/webshopcounter.ts","../src/migrations/1605262045-import-postcodes.ts","../src/migrations/1605262046-import-postcodes-nl.ts","../src/models/auditlog.ts","../src/models/balanceitem.ts","../src/models/balanceitempayment.ts","../src/models/buckaroopayment.ts","../src/models/cachedbalance.ts","../src/models/document.ts","../src/models/documenttemplate.ts","../src/models/email.test.ts","../src/models/email.ts","../src/models/emailrecipient.ts","../src/models/emailtemplate.ts","../src/models/emailverificationcode.ts","../src/models/event.ts","../src/models/eventnotification.ts","../src/models/group.ts","../src/models/image.ts","../src/models/member.ts","../src/models/memberplatformmembership.ts","../src/models/memberresponsibilityrecord.ts","../src/models/memberuser.ts","../src/models/mergedmember.ts","../src/models/molliepayment.ts","../src/models/mollietoken.ts","../src/models/onetimetoken.ts","../src/models/order.ts","../src/models/organization.ts","../src/models/organizationregistrationperiod.ts","../src/models/passwordtoken.ts","../src/models/payconiqpayment.ts","../src/models/payment.ts","../src/models/platform.test.ts","../src/models/platform.ts","../src/models/registercode.ts","../src/models/registration.ts","../src/models/registrationperiod.ts","../src/models/stcredit.ts","../src/models/stinvoice.ts","../src/models/stpackage.ts","../src/models/stpendinginvoice.ts","../src/models/stripeaccount.ts","../src/models/stripecheckoutsession.ts","../src/models/stripepaymentintent.ts","../src/models/ticket.ts","../src/models/token.test.ts","../src/models/token.ts","../src/models/usedregistercode.ts","../src/models/user.ts","../src/models/userpermissions.ts","../src/models/webshop.ts","../src/models/webshopdiscountcode.ts","../src/models/index.ts","../src/models/addresses/city.ts","../src/models/addresses/postalcode.test.ts","../src/models/addresses/postalcode.ts","../src/models/addresses/province.ts","../src/models/addresses/street.ts","../src/structures/organizationservermetadata.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.6.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.78.4",
+    "version": "2.79.0",
     "main": "./dist/src/index.js",
     "types": "./dist/src/index.d.ts",
     "license": "UNLICENCED",
@@ -16,7 +16,7 @@
         "lint": "eslint"
     },
     "peerDependencies": {
-        "@simonbackx/simple-database": "1.29.0",
+        "@simonbackx/simple-database": "1.29.1",
         "@stamhoofd/email": "*",
         "@stamhoofd/queues": "*"
     },
@@ -25,10 +25,10 @@
         "base-x": "^3.0.9"
     },
     "devDependencies": {
-        "@simonbackx/simple-database": "1.29.0"
+        "@simonbackx/simple-database": "1.29.1"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e8c207be8fd75320024f670d5c663eaa8306ba29"
+    "gitHead": "1ba7d80ded3676ecdc63741f3e8972bd378b5ea6"
 }

package/src/factories/GroupFactory.ts

@@ -1,6 +1,7 @@
 import { Factory } from '@simonbackx/simple-database';
-import { GroupPrice, GroupSettings, OldGroupPrice, OldGroupPrices, ReduceablePrice } from '@stamhoofd/structures';
+import { GroupPrice, GroupSettings, GroupType, ReduceablePrice } from '@stamhoofd/structures';
 
+import { RegistrationPeriod } from '../models';
 import { Group } from '../models/Group';
 import { Organization } from '../models/Organization';
 import { OrganizationFactory } from './OrganizationFactory';
@@ -10,9 +11,10 @@ class Options {
     price?: number;
     reducedPrice?: number;
     stock?: number;
-
+    type?: GroupType;
     skipCategory?: boolean;
     maxMembers?: number | null;
+    period?: RegistrationPeriod;
 }
 
 export class GroupFactory extends Factory<Options, Group> {
@@ -21,7 +23,14 @@ export class GroupFactory extends Factory<Options, Group> {
 
         const group = new Group();
         group.organizationId = organization.id;
-        group.periodId = organization.periodId;
+
+        if (this.options.period) {
+            group.periodId = this.options.period.id;
+        }
+        else {
+            group.periodId = organization.periodId;
+        }
+
         group.settings = GroupSettings.create({
             name: 'Group name',
             startDate: new Date(new Date().getTime() - 10 * 1000),
@@ -40,6 +49,10 @@ export class GroupFactory extends Factory<Options, Group> {
             maxMembers: this.options.maxMembers === undefined ? null : this.options.maxMembers,
         });
 
+        if (this.options.type) {
+            group.type = this.options.type;
+        }
+
         await group.save();
 
         if (!this.options.skipCategory) {

package/src/factories/MemberResponsibilityRecordFactory.ts

@@ -0,0 +1,35 @@
+import { Factory } from '@simonbackx/simple-database';
+import { MemberResponsibility } from '@stamhoofd/structures';
+
+import { Member, MemberResponsibilityRecord } from '../models';
+import { PlatformResponsibilityFactory } from './PlatformResponsibilityFactory';
+
+class Options {
+    name?: string;
+    responsibility?: MemberResponsibility;
+    member: Member;
+    organizationId?: string;
+}
+
+export class MemberResponsibilityRecordFactory extends Factory<Options, MemberResponsibilityRecord> {
+    async create(): Promise<MemberResponsibilityRecord> {
+        const record = new MemberResponsibilityRecord();
+        const responsibility = this.options.responsibility ?? (await new PlatformResponsibilityFactory({
+            organizationBased: !!this.options.organizationId,
+        }).create());
+        record.responsibilityId = this.options.responsibility?.id ?? responsibility.id;
+        record.memberId = this.options.member.id;
+        record.startDate = new Date();
+        record.endDate = null;
+        record.organizationId = this.options.organizationId ?? this.options.member.organizationId;
+
+        if (record.organizationId) {
+            if (responsibility.organizationBased) {
+                throw new Error('This responsibility is organization based. Please also provider the organizationId option when creating the record with MemberResponsibilityRecordFactory');
+            }
+        }
+
+        await record.save();
+        return record;
+    }
+}

package/src/factories/OrganizationRegistrationPeriodFactory.ts

@@ -0,0 +1,22 @@
+import { Factory } from '@simonbackx/simple-database';
+
+import { OrganizationRegistrationPeriod } from '../models';
+import { Organization } from '../models/Organization';
+import { RegistrationPeriod } from '../models/RegistrationPeriod';
+
+class Options {
+    organization: Organization;
+    period: RegistrationPeriod;
+}
+
+export class OrganizationRegistrationPeriodFactory extends Factory<Options, OrganizationRegistrationPeriod> {
+    async create(): Promise<OrganizationRegistrationPeriod> {
+        const organizationRegistrationPeriod = new OrganizationRegistrationPeriod();
+
+        organizationRegistrationPeriod.organizationId = this.options.organization.id;
+        organizationRegistrationPeriod.periodId = this.options.period.id;
+
+        await organizationRegistrationPeriod.save();
+        return organizationRegistrationPeriod;
+    }
+}

package/src/factories/OrganizationTagFactory.ts

@@ -14,7 +14,7 @@ export class OrganizationTagFactory extends Factory<Options, OrganizationTag> {
         });
 
         // Add to platform
-        const platform = await Platform.getShared();
+        const platform = await Platform.getForEditing();
         platform.config.tags.push(tag);
         await platform.save();
 

package/src/factories/PlatformResponsibilityFactory.ts

@@ -0,0 +1,25 @@
+import { Factory } from '@simonbackx/simple-database';
+import { MemberResponsibility } from '@stamhoofd/structures';
+
+import { Platform } from '../models/Platform';
+
+class Options {
+    name?: string;
+    organizationBased?: boolean;
+}
+
+export class PlatformResponsibilityFactory extends Factory<Options, MemberResponsibility> {
+    async create(): Promise<MemberResponsibility> {
+        const responsibility = MemberResponsibility.create({
+            name: this.options.name ?? ('Responsibility ' + (new Date().getTime() + Math.floor(Math.random() * 999999))),
+            organizationBased: this.options.organizationBased ?? true,
+        });
+
+        // Add to platform
+        const platform = await Platform.getForEditing();
+        platform.config.responsibilities.push(responsibility);
+        await platform.save();
+
+        return responsibility;
+    }
+}

package/src/factories/RegistrationPeriodFactory.ts

@@ -6,6 +6,7 @@ import { RegistrationPeriod } from '../models';
 class Options {
     startDate?: Date;
     endDate?: Date;
+    previousPeriodId?: string;
 }
 
 export class RegistrationPeriodFactory extends Factory<Options, RegistrationPeriod> {
@@ -15,6 +16,9 @@ export class RegistrationPeriodFactory extends Factory<Options, RegistrationPeri
         period.organizationId = null;
         period.startDate = this.options.startDate ?? new Date(2024, 0, 1, 0, 0, 0, 0);
         period.endDate = this.options.endDate ?? new Date(2024, 11, 31, 59, 59, 59, 999);
+        if (this.options.previousPeriodId) {
+            period.previousPeriodId = this.options.previousPeriodId;
+        }
         period.settings = RegistrationPeriodSettings.create({});
 
         await period.save();

package/src/factories/index.ts

@@ -12,3 +12,6 @@ export * from './WebshopFactory';
 export * from './BalanceItemFactory';
 export * from './RegistrationPeriodFactory';
 export * from './OrganizationTagFactory';
+export * from './OrganizationRegistrationPeriodFactory';
+export * from './MemberResponsibilityRecordFactory';
+export * from './PlatformResponsibilityFactory';