@stamhoofd/models 2.121.0 → 2.122.1

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

@@ -1 +1 @@
-{"version":3,"file":"City.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/City.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,qBAAa,IAAK,SAAQ,cAAc;IACpC,MAAM,CAAC,KAAK,SAAY;IAOxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,EAAE,MAAM,CAAC;IAGnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGnC,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,UAAU,wCAA6C;IAC9D,MAAM,CAAC,QAAQ,0CAA+C;CACjE"}
+{"version":3,"file":"City.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/City.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,qBAAa,IAAK,SAAQ,cAAc;IACpC,MAAM,CAAC,KAAK,SAAY;IAOxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,EAAE,MAAM,CAAC;IAGnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGnC,OAAO,EAAE,OAAO,CAAC;IAGjB,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACzD,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;CAC5D"}

package/dist/models/addresses/City.js

@@ -1,8 +1,7 @@
 import { __decorate } from "tslib";
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { v4 as uuidv4 } from 'uuid';
 import { QueryableModel } from '@stamhoofd/sql';
-import { Province } from './Province.js';
 export class City extends QueryableModel {
     static table = 'cities';
     id;
@@ -10,8 +9,9 @@ export class City extends QueryableModel {
     provinceId;
     parentCityId = null;
     country;
-    static parentCity = new ManyToOneRelation(City, 'parentCity');
-    static province = new ManyToOneRelation(Province, 'province');
+    // Relations are wired up in _relations.ts (after the classes are defined) to avoid circular references.
+    static parentCity;
+    static province;
 }
 __decorate([
     column({
@@ -24,10 +24,10 @@ __decorate([
     column({ type: 'string' })
 ], City.prototype, "name", void 0);
 __decorate([
-    column({ type: 'string', foreignKey: City.province })
+    column({ type: 'string' })
 ], City.prototype, "provinceId", void 0);
 __decorate([
-    column({ type: 'string', foreignKey: City.parentCity, nullable: true })
+    column({ type: 'string', nullable: true })
 ], City.prototype, "parentCityId", void 0);
 __decorate([
     column({ type: 'string' })

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

@@ -1 +1 @@
-{"version":3,"file":"City.js","sourceRoot":"","sources":["../../../src/models/addresses/City.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,OAAO,IAAK,SAAQ,cAAc;IACpC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IAOxB,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,UAAU,CAAS;IAGnB,YAAY,GAAkB,IAAI,CAAC;IAGnC,OAAO,CAAU;IAEjB,MAAM,CAAC,UAAU,GAAG,IAAI,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9D,MAAM,CAAC,QAAQ,GAAG,IAAI,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;;AAf9D;IALC,MAAM,CAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,MAAM,EAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;gCACU;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kCACd;AAGb;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;wCACnC;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0CACrC;AAGnC;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACV"}
+{"version":3,"file":"City.js","sourceRoot":"","sources":["../../../src/models/addresses/City.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGrD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,OAAO,IAAK,SAAQ,cAAc;IACpC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IAOxB,EAAE,CAAU;IAGZ,IAAI,CAAS;IAGb,UAAU,CAAS;IAGnB,YAAY,GAAkB,IAAI,CAAC;IAGnC,OAAO,CAAU;IAEjB,wGAAwG;IACxG,MAAM,CAAC,UAAU,CAAwC;IACzD,MAAM,CAAC,QAAQ,CAA0C;;AAhBzD;IALC,MAAM,CAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,MAAM,EAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;gCACU;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kCACd;AAGb;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wCACR;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0CACR;AAGnC;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACV"}

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

@@ -1,4 +1,4 @@
-import { ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Country } from '@stamhoofd/types/Country';
 import { City } from './City.js';
@@ -8,7 +8,7 @@ export declare class PostalCode extends QueryableModel {
     postalCode: string;
     cityId: string;
     country: Country;
-    static city: ManyToOneRelation<"city", City>;
+    static city: 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)
      */

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

@@ -1 +1 @@
-{"version":3,"file":"PostalCode.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/PostalCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,qBAAa,UAAW,SAAQ,cAAc;IAC1C,MAAM,CAAC,KAAK,SAAkB;IAO9B,EAAE,EAAG,MAAM,CAAC;IAGZ,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,IAAI,kCAAuC;IAElD;;OAEG;WACU,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IA8ElG;;OAEG;WACU,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;CAkD7G"}
+{"version":3,"file":"PostalCode.d.ts","sourceRoot":"","sources":["../../../src/models/addresses/PostalCode.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,qBAAa,UAAW,SAAQ,cAAc;IAC1C,MAAM,CAAC,KAAK,SAAkB;IAO9B,EAAE,EAAG,MAAM,CAAC;IAGZ,UAAU,EAAE,MAAM,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,OAAO,EAAE,OAAO,CAAC;IAGjB,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE7C;;OAEG;WACU,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IA8ElG;;OAEG;WACU,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;CAkD7G"}

package/dist/models/addresses/PostalCode.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
+import { column, Database } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Country } from '@stamhoofd/types/Country';
@@ -12,7 +12,8 @@ export class PostalCode extends QueryableModel {
     postalCode;
     cityId;
     country;
-    static city = new ManyToOneRelation(City, 'city');
+    // Relation is wired up in _relations.ts (after the classes are defined) to avoid circular references.
+    static city;
     /**
      * Search for a given city via it's postal code and country, collecting information about the city (id), parentCity (id) and province (id)
      */
@@ -131,7 +132,7 @@ __decorate([
     column({ type: 'string' })
 ], PostalCode.prototype, "postalCode", void 0);
 __decorate([
-    column({ type: 'string', foreignKey: PostalCode.city })
+    column({ type: 'string' })
 ], PostalCode.prototype, "cityId", void 0);
 __decorate([
     column({ type: 'string' })

package/dist/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":"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"}

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

@@ -1,11 +1,11 @@
-import { ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
-import { City } from './City.js';
+import type { City } from './City.js';
 export declare class Street extends QueryableModel {
     static table: string;
     id: string;
     name: string;
     cityId: string;
-    static city: ManyToOneRelation<"city", City>;
+    static city: ManyToOneRelation<'city', City>;
 }
 //# sourceMappingURL=Street.d.ts.map

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

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

package/dist/models/addresses/Street.js

@@ -1,14 +1,14 @@
 import { __decorate } from "tslib";
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { v4 as uuidv4 } from 'uuid';
-import { City } from './City.js';
 export class Street extends QueryableModel {
     static table = 'streets';
     id;
     name;
     cityId;
-    static city = new ManyToOneRelation(City, 'city');
+    // Relation is wired up in _relations.ts (after the classes are defined) to avoid circular references.
+    static city;
 }
 __decorate([
     column({
@@ -21,6 +21,6 @@ __decorate([
     column({ type: 'string' })
 ], Street.prototype, "name", void 0);
 __decorate([
-    column({ type: 'string', foreignKey: Street.city })
+    column({ type: 'string' })
 ], Street.prototype, "cityId", void 0);
 //# sourceMappingURL=Street.js.map

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

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

package/dist/models/index.d.ts

@@ -52,5 +52,6 @@ export * from './UitpasClientCredential.js';
 export * from './Invoice.js';
 export * from './InvoicedBalanceItem.js';
 export * from './RegistrationInvitation.js';
+export * from './v1GroupMigrationData.js';
 import './_relations.js';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/models/index.js

@@ -52,5 +52,6 @@ export * from './UitpasClientCredential.js';
 export * from './Invoice.js';
 export * from './InvoicedBalanceItem.js';
 export * from './RegistrationInvitation.js';
+export * from './v1GroupMigrationData.js';
 import './_relations.js';
 //# sourceMappingURL=index.js.map

package/dist/models/index.js.map

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

package/dist/models/v1GroupMigrationData.d.ts

@@ -0,0 +1,22 @@
+import { QueryableModel } from '@stamhoofd/sql';
+/**
+ * Temporary table for the migration from v1 to v2.
+ * Keeps track of which combination of group id and cycle has been migrated to a new group.
+ */
+export declare class V1GroupMigrationData extends QueryableModel {
+    static table: string;
+    newGroupId: string;
+    oldGroupId: string;
+    oldCycle: number;
+}
+/**
+ * Temporary table for the migration from v1 to v2.
+ * Keeps track of which combination of waiting list group id and cycle has been migrated to a new group.
+ */
+export declare class V1WaitingListMigrationData extends QueryableModel {
+    static table: string;
+    newGroupId: string;
+    oldGroupId: string;
+    oldCycle: number;
+}
+//# sourceMappingURL=v1GroupMigrationData.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"v1GroupMigrationData.d.ts","sourceRoot":"","sources":["../../src/models/v1GroupMigrationData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;IACpD,MAAM,CAAC,KAAK,SAA8B;IAI1C,UAAU,EAAE,MAAM,CAAC;IAInB,UAAU,EAAE,MAAM,CAAC;IAInB,QAAQ,SAAK;CAChB;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,cAAc;IAC1D,MAAM,CAAC,KAAK,SAAoC;IAIhD,UAAU,EAAE,MAAM,CAAC;IAInB,UAAU,EAAE,MAAM,CAAC;IAInB,QAAQ,SAAK;CAChB"}

package/dist/models/v1GroupMigrationData.js

@@ -0,0 +1,48 @@
+import { __decorate } from "tslib";
+import { column } from '@simonbackx/simple-database';
+import { QueryableModel } from '@stamhoofd/sql';
+/**
+ * Temporary table for the migration from v1 to v2.
+ * Keeps track of which combination of group id and cycle has been migrated to a new group.
+ */
+export class V1GroupMigrationData extends QueryableModel {
+    static table = 'v1_groups_migration_data';
+    // new group id (can be same as old group id if no new group was created)
+    newGroupId;
+    // old group id from v1
+    oldGroupId;
+    // old cycle from v1
+    oldCycle = 0;
+}
+__decorate([
+    column({ primary: true, type: 'string' })
+], V1GroupMigrationData.prototype, "newGroupId", void 0);
+__decorate([
+    column({ type: 'string' })
+], V1GroupMigrationData.prototype, "oldGroupId", void 0);
+__decorate([
+    column({ type: 'integer' })
+], V1GroupMigrationData.prototype, "oldCycle", void 0);
+/**
+ * Temporary table for the migration from v1 to v2.
+ * Keeps track of which combination of waiting list group id and cycle has been migrated to a new group.
+ */
+export class V1WaitingListMigrationData extends QueryableModel {
+    static table = 'v1_waiting_list_migration_data';
+    // new group id (can be same as old group id if no new group was created)
+    newGroupId;
+    // old group id from v1
+    oldGroupId;
+    // old cycle from v1
+    oldCycle = 0;
+}
+__decorate([
+    column({ primary: true, type: 'string' })
+], V1WaitingListMigrationData.prototype, "newGroupId", void 0);
+__decorate([
+    column({ type: 'string' })
+], V1WaitingListMigrationData.prototype, "oldGroupId", void 0);
+__decorate([
+    column({ type: 'integer' })
+], V1WaitingListMigrationData.prototype, "oldCycle", void 0);
+//# sourceMappingURL=v1GroupMigrationData.js.map

package/dist/models/v1GroupMigrationData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"v1GroupMigrationData.js","sourceRoot":"","sources":["../../src/models/v1GroupMigrationData.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;;GAGG;AACH,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IACpD,MAAM,CAAC,KAAK,GAAG,0BAA0B,CAAC;IAE1C,yEAAyE;IAEzE,UAAU,CAAS;IAEnB,uBAAuB;IAEvB,UAAU,CAAS;IAEnB,oBAAoB;IAEpB,QAAQ,GAAG,CAAC,CAAC;;AARb;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wDACvB;AAInB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wDACR;AAInB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;sDACf;AAGjB;;;GAGG;AACH,MAAM,OAAO,0BAA2B,SAAQ,cAAc;IAC1D,MAAM,CAAC,KAAK,GAAG,gCAAgC,CAAC;IAEhD,yEAAyE;IAEzE,UAAU,CAAS;IAEnB,uBAAuB;IAEvB,UAAU,CAAS;IAEnB,oBAAoB;IAEpB,QAAQ,GAAG,CAAC,CAAC;;AARb;IADC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;8DACvB;AAInB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;8DACR;AAInB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;4DACf"}

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "@stamhoofd/models",
-    "version": "2.121.0",
+    "version": "2.122.1",
     "type": "module",
-    "types": "./dist/index.d.ts",
     "main": "./dist/index.js",
-    "license": "UNLICENCED",
+    "types": "./dist/index.d.ts",
     "sideEffects": [
         "./src/models/_relations.ts",
         "./dist/models/_relations.js"
@@ -24,23 +23,43 @@
     ],
     "scripts": {
         "build": "tsc --build tsconfig.build.json && mkdir -p ./dist/migrations && rsync --delete --exclude='*.ts' --exclude='*.js' --exclude='*.map' -r --checksum ./src/migrations/ ./dist/migrations/ && rsync -r --checksum ./src/assets/ ./dist/assets/",
+        "lint": "eslint",
         "test": "vitest",
-        "lint": "eslint"
-    },
-    "peerDependencies": {
-        "@simonbackx/simple-database": "1.36.12",
-        "@stamhoofd/email": "*",
-        "@stamhoofd/queues": "*"
+        "test:coverage": "vitest --coverage"
     },
     "dependencies": {
-        "@aws-sdk/client-s3": "^3.839.0",
-        "base-x": "^3.0.11"
+        "@aws-sdk/client-s3": "3.1068.0",
+        "@aws-sdk/client-sesv2": "3.1068.0",
+        "@bwip-js/node": "4.11.1",
+        "@mollie/api-client": "4.5.0",
+        "@simonbackx/simple-encoding": "2.26.10",
+        "@simonbackx/simple-endpoints": "1.21.1",
+        "@simonbackx/simple-errors": "1.5.0",
+        "argon2": "0.44.0",
+        "base-x": "3.0.11",
+        "handlebars": "4.7.9",
+        "sharp": "0.35.1"
     },
     "devDependencies": {
-        "@simonbackx/simple-database": "1.36.12"
+        "@simonbackx/simple-database": "1.37.1",
+        "@stamhoofd/test-utils": "2.122.1",
+        "@types/luxon": "3.7.1",
+        "@types/uuid": "8.3.4",
+        "vitest": "4.1.8"
     },
+    "peerDependencies": {
+        "@simonbackx/simple-database": "1.37.1",
+        "@stamhoofd/backend-i18n": "*",
+        "@stamhoofd/email": "*",
+        "@stamhoofd/queues": "*",
+        "@stamhoofd/sql": "*",
+        "@stamhoofd/structures": "*",
+        "@stamhoofd/types": "*",
+        "@stamhoofd/utility": "*"
+    },
+    "license": "UNLICENCED",
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "11a280f3924b9eaab5af78f265216c774df69266"
+    "gitHead": "7f9c0637e743d1f7b5f1b161ab6b09ecd7a199e5"
 }

package/src/factories/GroupFactory.ts

@@ -1,5 +1,5 @@
 import { Factory } from '@simonbackx/simple-database';
-import type { BundleDiscount, GroupPriceDiscount, GroupType} from '@stamhoofd/structures';
+import type { BundleDiscount, GroupPriceDiscount, GroupType } from '@stamhoofd/structures';
 import { BundleDiscountGroupPriceSettings, GroupPrice, GroupSettings, ReduceablePrice, TranslatedString } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
@@ -42,15 +42,14 @@ export class GroupFactory extends Factory<Options, Group> {
                 });
             }
             group.periodId = this.options.period.id;
-        }
-        else {
+        } else {
             group.periodId = organization.periodId;
         }
 
         group.waitingListId = this.options.waitingListId ?? null;
 
         group.settings = GroupSettings.create({
-            name: this.options.name ?? new TranslatedString('Group name'),
+            name: this.options.name ?? new TranslatedString('Group ' + this.randomString(5)),
             startDate: new Date(new Date().getTime() - 10 * 1000),
             endDate: new Date(new Date().getTime() + 10 * 1000),
             registrationStartDate: new Date(new Date().getTime() - 10 * 1000),
@@ -80,8 +79,7 @@ export class GroupFactory extends Factory<Options, Group> {
                 for (const discount of this.options.bundleDiscounts) {
                     map.set(discount, null);
                 }
-            }
-            else {
+            } else {
                 map = this.options.bundleDiscounts;
             }
 

package/src/factories/OrganizationFactory.ts

@@ -1,5 +1,5 @@
 import { Factory } from '@simonbackx/simple-database';
-import type { PermissionRoleDetailed } from '@stamhoofd/structures';
+import type { PermissionRoleDetailed, STPackageBundle, STPackageType } from '@stamhoofd/structures';
 import { Address, OrganizationMetaData, OrganizationType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -7,6 +7,7 @@ import { Organization } from '../models/Organization.js';
 import type { RegistrationPeriod } from '../models/RegistrationPeriod.js';
 import { RegistrationPeriodFactory } from './RegistrationPeriodFactory.js';
 import { Country } from '@stamhoofd/types/Country';
+import { STPackageFactory } from './STPackageFactory.js';
 
 class Options {
     uri?: string;
@@ -17,12 +18,13 @@ class Options {
     roles?: PermissionRoleDetailed[];
     period?: RegistrationPeriod;
     tags?: string[];
+    packages?: STPackageBundle[];
 }
 
 export class OrganizationFactory extends Factory<Options, Organization> {
     async create(): Promise<Organization> {
         const organization = new Organization();
-        organization.name = this.options.name ?? 'Organization ' + (new Date().getTime() + Math.floor(Math.random() * 999999));
+        organization.name = this.options.name ?? 'Organization ' + (new Date().getTime() + '-' + Math.floor(Math.random() * 999999) + '-' + Math.floor(Math.random() * 999999));
         organization.website = 'https://domain.com';
         organization.registerDomain = this.options.domain ?? null;
         organization.uri = this.options.uri ?? Formatter.slug(organization.name);
@@ -45,8 +47,7 @@ export class OrganizationFactory extends Factory<Options, Organization> {
 
         if (this.options.period) {
             period = this.options.period;
-        }
-        else {
+        } else {
             period = await new RegistrationPeriodFactory({}).create();
         }
 
@@ -68,6 +69,13 @@ export class OrganizationFactory extends Factory<Options, Organization> {
             await period.save();
         }
 
+        for (const bundle of this.options.packages ?? []) {
+            await new STPackageFactory({
+                organization,
+                bundle,
+            }).create();
+        }
+
         return organization;
     }
 }

package/src/factories/STPackageFactory.ts

@@ -24,8 +24,7 @@ export class STPackageFactory extends Factory<Options, STPackage> {
 
         if (this.options.removeAt) {
             pack.validAt = new Date(this.options.removeAt.getTime() - 365 * 1000 * 60 * 60 * 24);
-        }
-        else {
+        } else {
             pack.validAt = this.options.validAt !== undefined ? this.options.validAt : new Date();
         }
 
@@ -38,6 +37,7 @@ export class STPackageFactory extends Factory<Options, STPackage> {
         }
 
         await pack.save();
+
         return pack;
     }
 }

package/src/factories/UserFactory.ts

@@ -1,5 +1,5 @@
 import { Factory } from '@simonbackx/simple-database';
-import type { Permissions} from '@stamhoofd/structures';
+import type { Permissions } from '@stamhoofd/structures';
 import { NewUser, UserPermissions } from '@stamhoofd/structures';
 
 import type { Organization } from '../models/Organization.js';
@@ -22,13 +22,12 @@ class Options {
 
 export class UserFactory extends Factory<Options, User> {
     async create(): Promise<User> {
-        let organization: Organization | null = null;
+        let organization: Organization | null;
 
         if (!this.options.organization && STAMHOOFD.userMode !== 'platform' && !this.options.globalPermissions) {
             const organizationFactory = new OrganizationFactory({});
             organization = await organizationFactory.create();
-        }
-        else {
+        } else {
             organization = this.options.organization ?? null;
         }
 
@@ -40,7 +39,7 @@ export class UserFactory extends Factory<Options, User> {
             organizationId: organization?.id ?? null,
             password,
         }), {
-            allowPlatform: !!this.options.globalPermissions
+            allowPlatform: !!this.options.globalPermissions,
         });
         if (!user) {
             throw new Error('Unexpected failure when creating user in factory');