@stamhoofd/models 2.115.1 → 2.116.0

package/src/models/Platform.test.ts

@@ -69,7 +69,7 @@ describe('Model.Platform', () => {
         });
     });
 
-    describe('Creating fresh platform', () => {
+    describe('it creates the first platform in the database', () => {
         beforeEach(async () => {
             await Database.delete('DELETE FROM platform');
             await Platform.clearCacheWithoutRefresh();
@@ -82,14 +82,14 @@ describe('Model.Platform', () => {
             const editable = await Platform.getForEditing();
             expect(editable.id).toBe('1');
 
-            expect(await Platform.getByID('1')).toEqual(editable);
+            expect((await Platform.getByID('1'))?.id).toEqual(editable.id);
         });
 
         test('when requesting getShared', async () => {
             const shared = await Platform.getShared();
             expect(shared.id).toBe('1');
 
-            expect(await Platform.getByID('1')).toMatchObject(shared);
+            expect((await Platform.getByID('1'))?.id).toEqual(shared.id);
         });
 
         test('when requesting getSharedPrivateStruct', async () => {

package/src/models/Registration.ts

@@ -189,7 +189,7 @@ export class Registration extends QueryableModel {
     async getRecipients(organization: Organization, group: import('./').Group) {
         const { Member } = await import('./Member.js');
 
-        const member = await Member.getWithRegistrations(this.memberId);
+        const member = await Member.getByIdWithUsers(this.memberId);
 
         if (!member) {
             return [];

package/src/models/User.ts

@@ -1,6 +1,6 @@
 import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
 import { EmailInterfaceRecipient } from '@stamhoofd/email';
-import { QueryableModel, SQL, SQLJSONNull } from '@stamhoofd/sql';
+import { ModelCache, QueryableModel, SQL, SQLJSONNull } from '@stamhoofd/sql';
 import { LoginProviderType, NewUser, Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from '@stamhoofd/structures';
 import argon2 from 'argon2';
 import { v4 as uuidv4 } from 'uuid';
@@ -11,6 +11,7 @@ import { Organization } from './index.js';
 
 export class User extends QueryableModel {
     static table = 'users';
+    // static cache = new ModelCache<User>();
 
     // Columns
     @column({