@stamhoofd/models 2.1.1 → 2.1.3

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

@@ -34,4 +34,8 @@ export * from "./StripeCheckoutSession";
 export * from "./Document";
 export * from "./DocumentTemplate";
 export * from "./WebshopDiscountCode";
+export * from "./Platform";
+export * from "./MemberResponsibilityRecord";
+export * from "./OrganizationRegistrationPeriod";
+export * from "./RegistrationPeriod";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,MAAM,EAAE,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAA;AAEhF,cAAc,yBAAyB,CAAA;AAEvC,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,SAAS,CAAA;AAC5C,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAE7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AAEpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAElC,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,MAAM,EAAE,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,UAAU,CAAA;AAEhF,cAAc,yBAAyB,CAAA;AAEvC,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,SAAS,CAAA;AAC5C,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAE7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AAEpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAElC,cAAc,uBAAuB,CAAA;AAErC,cAAc,YAAY,CAAA;AAC1B,cAAc,8BAA8B,CAAA;AAE5C,cAAc,kCAAkC,CAAA;AAChD,cAAc,sBAAsB,CAAA"}

package/dist/src/models/index.js

@@ -50,4 +50,8 @@ tslib_1.__exportStar(require("./StripeCheckoutSession"), exports);
 tslib_1.__exportStar(require("./Document"), exports);
 tslib_1.__exportStar(require("./DocumentTemplate"), exports);
 tslib_1.__exportStar(require("./WebshopDiscountCode"), exports);
+tslib_1.__exportStar(require("./Platform"), exports);
+tslib_1.__exportStar(require("./MemberResponsibilityRecord"), exports);
+tslib_1.__exportStar(require("./OrganizationRegistrationPeriod"), exports);
+tslib_1.__exportStar(require("./RegistrationPeriod"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;AAAA,+CAA+C;AAC/C,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,+BAA2B;AAAnB,4FAAA,IAAI,OAAA;AACZ,qCAAiC;AAAzB,kGAAA,OAAO,OAAA;AACf,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,mCAAgF;AAAxE,gGAAA,MAAM,OAAA;AAEd,kEAAuC;AAEvC,kDAAuB;AACvB,0DAA+B;AAC/B,wDAA6B;AAC7B,iCAA6B;AAArB,8FAAA,KAAK,OAAA;AACb,0DAA+B;AAC/B,4DAAiC;AACjC,yDAA8B;AAC9B,sDAA2B;AAC3B,sDAA2B;AAC3B,uDAAmD;AAA3C,oHAAA,gBAAgB,OAAA;AACxB,iCAA4C;AAApC,8FAAA,KAAK,OAAA;AACb,oDAAyB;AACzB,qDAA0B;AAC1B,6DAAkC;AAClC,mDAAwB;AACxB,0DAA+B;AAC/B,4DAAiC;AACjC,6CAAyC;AAAjC,0GAAA,WAAW,OAAA;AACnB,2DAAuD;AAA/C,wHAAA,kBAAkB,OAAA;AAC1B,iCAA6B;AAArB,8FAAA,KAAK,OAAA;AAEb,6DAAkC;AAClC,2DAAgC;AAChC,iEAAsC;AACtC,+DAAoC;AAEpC,0DAA+B;AAC/B,gEAAqC;AACrC,kEAAuC;AAEvC,qDAA0B;AAC1B,6DAAkC;AAElC,gEAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;AAAA,+CAA+C;AAC/C,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,+BAA2B;AAAnB,4FAAA,IAAI,OAAA;AACZ,qCAAiC;AAAzB,kGAAA,OAAO,OAAA;AACf,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,mCAAgF;AAAxE,gGAAA,MAAM,OAAA;AAEd,kEAAuC;AAEvC,kDAAuB;AACvB,0DAA+B;AAC/B,wDAA6B;AAC7B,iCAA6B;AAArB,8FAAA,KAAK,OAAA;AACb,0DAA+B;AAC/B,4DAAiC;AACjC,yDAA8B;AAC9B,sDAA2B;AAC3B,sDAA2B;AAC3B,uDAAmD;AAA3C,oHAAA,gBAAgB,OAAA;AACxB,iCAA4C;AAApC,8FAAA,KAAK,OAAA;AACb,oDAAyB;AACzB,qDAA0B;AAC1B,6DAAkC;AAClC,mDAAwB;AACxB,0DAA+B;AAC/B,4DAAiC;AACjC,6CAAyC;AAAjC,0GAAA,WAAW,OAAA;AACnB,2DAAuD;AAA/C,wHAAA,kBAAkB,OAAA;AAC1B,iCAA6B;AAArB,8FAAA,KAAK,OAAA;AAEb,6DAAkC;AAClC,2DAAgC;AAChC,iEAAsC;AACtC,+DAAoC;AAEpC,0DAA+B;AAC/B,gEAAqC;AACrC,kEAAuC;AAEvC,qDAA0B;AAC1B,6DAAkC;AAElC,gEAAqC;AAErC,qDAA0B;AAC1B,uEAA4C;AAE5C,2EAAgD;AAChD,+DAAoC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.1.1",
+    "version": "2.1.3",
     "main": "./dist/src/index.js",
     "types": "./dist/src/index.d.ts",
     "license": "UNLICENCED",
@@ -26,5 +26,6 @@
     },
     "devDependencies": {
         "@simonbackx/simple-database": "1.24.0"
-    }
+    },
+    "gitHead": "b5773c547dceaae52b9c2a098b222417fcd42e4f"
 }

package/src/migrations/1719931362-groups-default-age-group-id.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `groups`
+ADD COLUMN `defaultAgeGroupId` varchar(36) NULL AFTER `status`;

package/src/models/Group.ts

@@ -42,6 +42,9 @@ export class Group extends Model {
     @column({ type: "string" })
     periodId: string;
 
+    @column({ type: "string", nullable: true })
+    defaultAgeGroupId: string | null = null
+
     /**
      * Every time a new registration period starts, this number increases. This is used to mark all older registrations as 'out of date' automatically
      */

package/src/models/Organization.ts

@@ -299,65 +299,6 @@ export class Organization extends Model {
         return struct
     }
 
-    async cleanCategories(groups: {id: string}[]) {
-        const reachable = new Map<string, boolean>()
-        const queue = [this.meta.rootCategoryId]
-        reachable.set(this.meta.rootCategoryId, true)
-        let shouldSave = false;
-
-        const usedGroupIds = new Set<string>()
-
-        while (queue.length > 0) {
-            const id = queue.shift()
-            if (!id) {
-                break
-            }
-
-            const category = this.meta.categories.find(c => c.id === id)
-            if (!category) {
-                continue
-            }
-
-            for (const i of category.categoryIds) {
-                if (!reachable.get(i)) {
-                    reachable.set(i, true)
-                    queue.push(i)
-                }
-            }
-
-            // Remove groupIds that no longer exist or are in a different category already
-            let filtered = category.groupIds.filter(id => !!groups.find(g => g.id === id) && !usedGroupIds.has(id))
-
-            // Remove duplicate groups
-            filtered = Formatter.uniqueArray(filtered)
-
-            if (filtered.length !== category.groupIds.length) {
-                shouldSave = true;
-                console.log("Deleted "+ (category.groupIds.length - filtered.length) +" group ids from category " + category.id + ", in organization "+this.id)
-                category.groupIds = filtered
-            }
-
-            for (const groupId of category.groupIds) {
-                usedGroupIds.add(groupId)
-            }
-        }
-
-        const reachableCategoryIds = [...reachable.keys()]
-
-        // Delete all categories that are not reachable anymore
-        const beforeCount = this.meta.categories.length;
-        this.meta.categories = this.meta.categories.filter(c => reachableCategoryIds.includes(c.id))
-
-        if (this.meta.categories.length !== beforeCount) {
-            console.log("Deleted "+ (beforeCount - this.meta.categories.length) +" categories from organization "+this.id)
-            await this.save()
-        } else {
-            if (shouldSave) {
-                await this.save()
-            }
-        }
-    }
-
     async updateDNSRecords() {
         const organization = this;
 

package/src/models/OrganizationRegistrationPeriod.ts

@@ -2,6 +2,7 @@ import { column, Model } from '@simonbackx/simple-database';
 import { Group as GroupStruct, OrganizationRegistrationPeriodSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from "uuid";
 import { Group, RegistrationPeriod } from '.';
+import { Formatter } from '@stamhoofd/utility';
 
 export class OrganizationRegistrationPeriod extends Model {
     static table = "organization_registration_periods";
@@ -51,4 +52,63 @@ export class OrganizationRegistrationPeriod extends Model {
             groups: groups.map(g => g.getStructure()).sort(GroupStruct.defaultSort)
         })
     }
+
+    async cleanCategories(groups: {id: string}[]) {
+        const reachable = new Map<string, boolean>()
+        const queue = [this.settings.rootCategoryId]
+        reachable.set(this.settings.rootCategoryId, true)
+        let shouldSave = false;
+
+        const usedGroupIds = new Set<string>()
+
+        while (queue.length > 0) {
+            const id = queue.shift()
+            if (!id) {
+                break
+            }
+
+            const category = this.settings.categories.find(c => c.id === id)
+            if (!category) {
+                continue
+            }
+
+            for (const i of category.categoryIds) {
+                if (!reachable.get(i)) {
+                    reachable.set(i, true)
+                    queue.push(i)
+                }
+            }
+
+            // Remove groupIds that no longer exist or are in a different category already
+            let filtered = category.groupIds.filter(id => !!groups.find(g => g.id === id) && !usedGroupIds.has(id))
+
+            // Remove duplicate groups
+            filtered = Formatter.uniqueArray(filtered)
+
+            if (filtered.length !== category.groupIds.length) {
+                shouldSave = true;
+                console.log("Deleted "+ (category.groupIds.length - filtered.length) +" group ids from category " + category.id + ", in organization period "+this.id)
+                category.groupIds = filtered
+            }
+
+            for (const groupId of category.groupIds) {
+                usedGroupIds.add(groupId)
+            }
+        }
+
+        const reachableCategoryIds = [...reachable.keys()]
+
+        // Delete all categories that are not reachable anymore
+        const beforeCount = this.settings.categories.length;
+        this.settings.categories = this.settings.categories.filter(c => reachableCategoryIds.includes(c.id))
+
+        if (this.settings.categories.length !== beforeCount) {
+            console.log("Deleted "+ (beforeCount - this.settings.categories.length) +" categories from organizaton period "+this.id)
+            await this.save()
+        } else {
+            if (shouldSave) {
+                await this.save()
+            }
+        }
+    }
 }

package/src/models/Payment.ts

@@ -144,17 +144,17 @@ export class Payment extends Model {
                     const registration = balanceItem?.registrationId && registrations.find(r => r.id === balanceItem.registrationId)
                     const member = balanceItem?.memberId ? members.find(r => r.id === balanceItem.memberId) : undefined
                     const order = balanceItem?.orderId && orders.find(r => r.id === balanceItem.orderId)
-                    const group = registration && groups.find(g => g.id === registration.groupId)
+                    const group = registration ? groups.find(g => g.id === registration.groupId) : null
 
-                    if (!group) {
-                        throw new Error("Group not found")
+                    if (registration && !group) {
+                        throw new Error("Group "+registration.groupId+" not found")
                     }
 
                     return BalanceItemPaymentDetailed.create({
                         ...item,
                         balanceItem: BalanceItemDetailed.create({
                             ...balanceItem,
-                            registration: registration ? registration.setRelation(Registration.group, group).getStructure() : null,
+                            registration: registration ? registration.setRelation(Registration.group, group!).getStructure() : null,
                             member: member ? MemberStruct.create(member) : null,
                             order: order ? OrderStruct.create({...order, payment: null}) : null
                         })

package/src/models/Platform.ts

@@ -69,6 +69,10 @@ export class Platform extends Model {
         });
     }
 
+    static clearCache() {
+        this.sharedStruct = null;
+    }
+
     async save() {
         Platform.sharedStruct = null
         return await super.save()