-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: migrate sessions repository to kysely (#15268)
* wip: search * wip: getByToken * wip: getByToken * wip: getByUserId * wip: create/update/delete * remove unused code * clean up and pr feedback * fix: test * fix: e2e test * pr feedback
- Loading branch information
1 parent
36eef98
commit 79726ac
Showing
7 changed files
with
185 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,6 +129,8 @@ describe('/users', () => { | |
expect(body).toEqual({ | ||
...before, | ||
updatedAt: expect.any(String), | ||
profileChangedAt: expect.any(String), | ||
createdAt: expect.any(String), | ||
name: 'Name', | ||
}); | ||
}); | ||
|
@@ -177,6 +179,8 @@ describe('/users', () => { | |
...before, | ||
email: '[email protected]', | ||
updatedAt: expect.anything(), | ||
createdAt: expect.anything(), | ||
profileChangedAt: expect.anything(), | ||
}); | ||
}); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,64 +1,97 @@ | ||
-- NOTE: This file is auto generated by ./sql-generator | ||
|
||
-- SessionRepository.search | ||
SELECT | ||
"SessionEntity"."id" AS "SessionEntity_id", | ||
"SessionEntity"."userId" AS "SessionEntity_userId", | ||
"SessionEntity"."createdAt" AS "SessionEntity_createdAt", | ||
"SessionEntity"."updatedAt" AS "SessionEntity_updatedAt", | ||
"SessionEntity"."deviceType" AS "SessionEntity_deviceType", | ||
"SessionEntity"."deviceOS" AS "SessionEntity_deviceOS" | ||
FROM | ||
"sessions" "SessionEntity" | ||
WHERE | ||
(("SessionEntity"."updatedAt" <= $1)) | ||
select | ||
* | ||
from | ||
"sessions" | ||
where | ||
"sessions"."updatedAt" <= $1 | ||
|
||
-- SessionRepository.getByToken | ||
SELECT DISTINCT | ||
"distinctAlias"."SessionEntity_id" AS "ids_SessionEntity_id" | ||
FROM | ||
( | ||
SELECT | ||
"SessionEntity"."id" AS "SessionEntity_id", | ||
"SessionEntity"."userId" AS "SessionEntity_userId", | ||
"SessionEntity"."createdAt" AS "SessionEntity_createdAt", | ||
"SessionEntity"."updatedAt" AS "SessionEntity_updatedAt", | ||
"SessionEntity"."deviceType" AS "SessionEntity_deviceType", | ||
"SessionEntity"."deviceOS" AS "SessionEntity_deviceOS", | ||
"SessionEntity__SessionEntity_user"."id" AS "SessionEntity__SessionEntity_user_id", | ||
"SessionEntity__SessionEntity_user"."name" AS "SessionEntity__SessionEntity_user_name", | ||
"SessionEntity__SessionEntity_user"."isAdmin" AS "SessionEntity__SessionEntity_user_isAdmin", | ||
"SessionEntity__SessionEntity_user"."email" AS "SessionEntity__SessionEntity_user_email", | ||
"SessionEntity__SessionEntity_user"."storageLabel" AS "SessionEntity__SessionEntity_user_storageLabel", | ||
"SessionEntity__SessionEntity_user"."oauthId" AS "SessionEntity__SessionEntity_user_oauthId", | ||
"SessionEntity__SessionEntity_user"."profileImagePath" AS "SessionEntity__SessionEntity_user_profileImagePath", | ||
"SessionEntity__SessionEntity_user"."shouldChangePassword" AS "SessionEntity__SessionEntity_user_shouldChangePassword", | ||
"SessionEntity__SessionEntity_user"."createdAt" AS "SessionEntity__SessionEntity_user_createdAt", | ||
"SessionEntity__SessionEntity_user"."deletedAt" AS "SessionEntity__SessionEntity_user_deletedAt", | ||
"SessionEntity__SessionEntity_user"."status" AS "SessionEntity__SessionEntity_user_status", | ||
"SessionEntity__SessionEntity_user"."updatedAt" AS "SessionEntity__SessionEntity_user_updatedAt", | ||
"SessionEntity__SessionEntity_user"."quotaSizeInBytes" AS "SessionEntity__SessionEntity_user_quotaSizeInBytes", | ||
"SessionEntity__SessionEntity_user"."quotaUsageInBytes" AS "SessionEntity__SessionEntity_user_quotaUsageInBytes", | ||
"SessionEntity__SessionEntity_user"."profileChangedAt" AS "SessionEntity__SessionEntity_user_profileChangedAt", | ||
"469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."userId" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_userId", | ||
"469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."key" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_key", | ||
"469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."value" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_value" | ||
FROM | ||
"sessions" "SessionEntity" | ||
LEFT JOIN "users" "SessionEntity__SessionEntity_user" ON "SessionEntity__SessionEntity_user"."id" = "SessionEntity"."userId" | ||
AND ( | ||
"SessionEntity__SessionEntity_user"."deletedAt" IS NULL | ||
) | ||
LEFT JOIN "user_metadata" "469e6aa7ff79eff78f8441f91ba15bb07d3634dd" ON "469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."userId" = "SessionEntity__SessionEntity_user"."id" | ||
WHERE | ||
(("SessionEntity"."token" = $1)) | ||
) "distinctAlias" | ||
ORDER BY | ||
"SessionEntity_id" ASC | ||
LIMIT | ||
1 | ||
select | ||
"sessions".*, | ||
to_json("user") as "user" | ||
from | ||
"sessions" | ||
inner join lateral ( | ||
select | ||
"id", | ||
"email", | ||
"createdAt", | ||
"profileImagePath", | ||
"isAdmin", | ||
"shouldChangePassword", | ||
"deletedAt", | ||
"oauthId", | ||
"updatedAt", | ||
"storageLabel", | ||
"name", | ||
"quotaSizeInBytes", | ||
"quotaUsageInBytes", | ||
"status", | ||
"profileChangedAt", | ||
( | ||
select | ||
array_agg("user_metadata") as "metadata" | ||
from | ||
"user_metadata" | ||
where | ||
"users"."id" = "user_metadata"."userId" | ||
) as "metadata" | ||
from | ||
"users" | ||
where | ||
"users"."id" = "sessions"."userId" | ||
and "users"."deletedAt" is null | ||
) as "user" on true | ||
where | ||
"sessions"."token" = $1 | ||
|
||
-- SessionRepository.getByUserId | ||
select | ||
"sessions".*, | ||
to_json("user") as "user" | ||
from | ||
"sessions" | ||
inner join lateral ( | ||
select | ||
"id", | ||
"email", | ||
"createdAt", | ||
"profileImagePath", | ||
"isAdmin", | ||
"shouldChangePassword", | ||
"deletedAt", | ||
"oauthId", | ||
"updatedAt", | ||
"storageLabel", | ||
"name", | ||
"quotaSizeInBytes", | ||
"quotaUsageInBytes", | ||
"status", | ||
"profileChangedAt", | ||
( | ||
select | ||
array_agg("user_metadata") as "metadata" | ||
from | ||
"user_metadata" | ||
where | ||
"users"."id" = "user_metadata"."userId" | ||
) as "metadata" | ||
from | ||
"users" | ||
where | ||
"users"."id" = "sessions"."userId" | ||
and "users"."deletedAt" is null | ||
) as "user" on true | ||
where | ||
"sessions"."userId" = $1 | ||
order by | ||
"sessions"."updatedAt" desc, | ||
"sessions"."createdAt" desc | ||
|
||
-- SessionRepository.delete | ||
DELETE FROM "sessions" | ||
WHERE | ||
"id" = $1 | ||
delete from "sessions" | ||
where | ||
"id" = $1::uuid |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,70 @@ | ||
import { Injectable } from '@nestjs/common'; | ||
import { InjectRepository } from '@nestjs/typeorm'; | ||
import { Insertable, Kysely, Updateable } from 'kysely'; | ||
import { InjectKysely } from 'nestjs-kysely'; | ||
import { DB, Sessions } from 'src/db'; | ||
import { DummyValue, GenerateSql } from 'src/decorators'; | ||
import { SessionEntity } from 'src/entities/session.entity'; | ||
import { SessionEntity, withUser } from 'src/entities/session.entity'; | ||
import { ISessionRepository, SessionSearchOptions } from 'src/interfaces/session.interface'; | ||
import { LessThanOrEqual, Repository } from 'typeorm'; | ||
import { asUuid } from 'src/utils/database'; | ||
|
||
@Injectable() | ||
export class SessionRepository implements ISessionRepository { | ||
constructor(@InjectRepository(SessionEntity) private repository: Repository<SessionEntity>) {} | ||
constructor(@InjectKysely() private db: Kysely<DB>) {} | ||
|
||
@GenerateSql({ params: [DummyValue.DATE] }) | ||
@GenerateSql({ params: [{ updatedBefore: DummyValue.DATE }] }) | ||
search(options: SessionSearchOptions): Promise<SessionEntity[]> { | ||
return this.repository.find({ where: { updatedAt: LessThanOrEqual(options.updatedBefore) } }); | ||
return this.db | ||
.selectFrom('sessions') | ||
.selectAll() | ||
.where('sessions.updatedAt', '<=', options.updatedBefore) | ||
.execute() as Promise<SessionEntity[]>; | ||
} | ||
|
||
@GenerateSql({ params: [DummyValue.STRING] }) | ||
getByToken(token: string): Promise<SessionEntity | null> { | ||
return this.repository.findOne({ | ||
where: { token }, | ||
relations: { | ||
user: { | ||
metadata: true, | ||
}, | ||
}, | ||
}); | ||
getByToken(token: string): Promise<SessionEntity | undefined> { | ||
return this.db | ||
.selectFrom('sessions') | ||
.innerJoinLateral(withUser, (join) => join.onTrue()) | ||
.selectAll('sessions') | ||
.select((eb) => eb.fn.toJson('user').as('user')) | ||
.where('sessions.token', '=', token) | ||
.executeTakeFirst() as Promise<SessionEntity | undefined>; | ||
} | ||
|
||
@GenerateSql({ params: [DummyValue.UUID] }) | ||
getByUserId(userId: string): Promise<SessionEntity[]> { | ||
return this.repository.find({ | ||
where: { | ||
userId, | ||
}, | ||
relations: { | ||
user: true, | ||
}, | ||
order: { | ||
updatedAt: 'desc', | ||
createdAt: 'desc', | ||
}, | ||
}); | ||
return this.db | ||
.selectFrom('sessions') | ||
.innerJoinLateral(withUser, (join) => join.onTrue()) | ||
.selectAll('sessions') | ||
.select((eb) => eb.fn.toJson('user').as('user')) | ||
.where('sessions.userId', '=', userId) | ||
.orderBy('sessions.updatedAt', 'desc') | ||
.orderBy('sessions.createdAt', 'desc') | ||
.execute() as unknown as Promise<SessionEntity[]>; | ||
} | ||
|
||
create<T extends Partial<SessionEntity>>(dto: T): Promise<T & { id: string }> { | ||
return this.repository.save(dto); | ||
async create(dto: Insertable<Sessions>): Promise<SessionEntity> { | ||
const { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } = await this.db | ||
.insertInto('sessions') | ||
.values(dto) | ||
.returningAll() | ||
.executeTakeFirstOrThrow(); | ||
|
||
return { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } as SessionEntity; | ||
} | ||
|
||
update<T extends Partial<SessionEntity>>(dto: T): Promise<T> { | ||
return this.repository.save(dto); | ||
update(id: string, dto: Updateable<Sessions>): Promise<SessionEntity> { | ||
return this.db | ||
.updateTable('sessions') | ||
.set(dto) | ||
.where('sessions.id', '=', asUuid(id)) | ||
.returningAll() | ||
.executeTakeFirstOrThrow() as Promise<SessionEntity>; | ||
} | ||
|
||
@GenerateSql({ params: [DummyValue.UUID] }) | ||
async delete(id: string): Promise<void> { | ||
await this.repository.delete({ id }); | ||
await this.db.deleteFrom('sessions').where('id', '=', asUuid(id)).execute(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters