github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-29 00:44:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

refactor(identity): lazy-load relations

Browse source 
Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2021-12-05 22:10:59 +01:00
parent 3539216cf3
commit dcfb00adc1
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/identity/identity.entity.ts
View file

@ -32,7 +32,7 @@ export class Identity {
@ManyToOne((_) => User, (user) => user.identities, { @ManyToOne((_) => User, (user) => user.identities, {
onDelete: 'CASCADE', // This deletes the Identity, when the associated User is deleted onDelete: 'CASCADE', // This deletes the Identity, when the associated User is deleted
}) })
user: User; user: Promise<User>;
/** /**
* The ProviderType of the identity * The ProviderType of the identity
@ -103,7 +103,7 @@ export class Identity {
syncSource: boolean, syncSource: boolean,
): Omit<Identity, 'id' | 'createdAt' | 'updatedAt'> { ): Omit<Identity, 'id' | 'createdAt' | 'updatedAt'> {
const newIdentity = new Identity(); const newIdentity = new Identity();
newIdentity.user = user; newIdentity.user = Promise.resolve(user);
newIdentity.providerType = providerType; newIdentity.providerType = providerType;
newIdentity.providerName = null; newIdentity.providerName = null;
newIdentity.syncSource = syncSource; newIdentity.syncSource = syncSource;

4
src/identity/identity.service.spec.ts
View file

@ -60,7 +60,7 @@ describe('IdentityService', () => {
await checkPassword(password, identity.passwordHash ?? '').then( await checkPassword(password, identity.passwordHash ?? '').then(
(result) => expect(result).toBeTruthy(), (result) => expect(result).toBeTruthy(),
); );
expect(identity.user).toEqual(user); expect(await identity.user).toEqual(user);
}); });
}); });
@ -83,7 +83,7 @@ describe('IdentityService', () => {
await checkPassword(newPassword, identity.passwordHash ?? '').then( await checkPassword(newPassword, identity.passwordHash ?? '').then(
(result) => expect(result).toBeTruthy(), (result) => expect(result).toBeTruthy(),
); );
expect(identity.user).toEqual(user); expect(await identity.user).toEqual(user);
}); });
it('fails, when user has no local identity', async () => { it('fails, when user has no local identity', async () => {
user.identities = Promise.resolve([]); user.identities = Promise.resolve([]);