-
-
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 shared-link repository to kysely
- Loading branch information
1 parent
cab2012
commit 7789963
Showing
7 changed files
with
347 additions
and
400 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
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,12 +1,14 @@ | ||
| import { Insertable } from 'kysely'; | ||
| import { SharedLinks } from 'src/db'; | ||
| import { SharedLinkEntity } from 'src/entities/shared-link.entity'; | ||
|
|
||
| export const ISharedLinkRepository = 'ISharedLinkRepository'; | ||
|
|
||
| export interface ISharedLinkRepository { | ||
| getAll(userId: string): Promise<SharedLinkEntity[]>; | ||
| get(userId: string, id: string): Promise<SharedLinkEntity | null>; | ||
| getByKey(key: Buffer): Promise<SharedLinkEntity | null>; | ||
| create(entity: Partial<SharedLinkEntity>): Promise<SharedLinkEntity>; | ||
| update(entity: Partial<SharedLinkEntity>): Promise<SharedLinkEntity>; | ||
| get(userId: string, id: string): Promise<SharedLinkEntity | undefined>; | ||
| getByKey(key: Buffer): Promise<SharedLinkEntity | undefined>; | ||
| create(entity: Insertable<SharedLinks> & { assetIds?: string[] }): Promise<SharedLinkEntity>; | ||
| update(entity: Partial<SharedLinkEntity> & { id: string }): Promise<SharedLinkEntity>; | ||
| remove(entity: SharedLinkEntity): Promise<void>; | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
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,90 +1,215 @@ | ||
| import { Injectable } from '@nestjs/common'; | ||
| import { InjectRepository } from '@nestjs/typeorm'; | ||
| import { Insertable, Kysely, sql } from 'kysely'; | ||
| import { jsonObjectFrom } from 'kysely/helpers/postgres'; | ||
| import _ from 'lodash'; | ||
| import { InjectKysely } from 'nestjs-kysely'; | ||
| import { DB, SharedLinks } from 'src/db'; | ||
| import { DummyValue, GenerateSql } from 'src/decorators'; | ||
| import { SharedLinkEntity } from 'src/entities/shared-link.entity'; | ||
| import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface'; | ||
| import { Repository } from 'typeorm'; | ||
|
|
||
| @Injectable() | ||
| export class SharedLinkRepository implements ISharedLinkRepository { | ||
| constructor(@InjectRepository(SharedLinkEntity) private repository: Repository<SharedLinkEntity>) {} | ||
| constructor(@InjectKysely() private db: Kysely<DB>) {} | ||
|
|
||
| @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] }) | ||
| get(userId: string, id: string): Promise<SharedLinkEntity | null> { | ||
| return this.repository.findOne({ | ||
| where: { | ||
| id, | ||
| userId, | ||
| }, | ||
| relations: { | ||
| assets: { | ||
| exifInfo: true, | ||
| }, | ||
| album: { | ||
| assets: { | ||
| exifInfo: true, | ||
| }, | ||
| owner: true, | ||
| }, | ||
| }, | ||
| order: { | ||
| createdAt: 'DESC', | ||
| assets: { | ||
| fileCreatedAt: 'ASC', | ||
| }, | ||
| album: { | ||
| assets: { | ||
| fileCreatedAt: 'ASC', | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| get(userId: string, id: string): Promise<SharedLinkEntity | undefined> { | ||
| return this.db | ||
| .selectFrom('shared_links') | ||
| .selectAll('shared_links') | ||
| .leftJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('shared_link__asset') | ||
| .whereRef('shared_links.id', '=', 'shared_link__asset.sharedLinksId') | ||
| .innerJoin('assets', 'assets.id', 'shared_link__asset.assetsId') | ||
| .selectAll('assets') | ||
| .innerJoinLateral( | ||
| (eb) => eb.selectFrom('exif').whereRef('exif.assetId', '=', 'assets.id').as('exifInfo'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('exifInfo').as('exifInfo')) | ||
| .as('a'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .leftJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('albums') | ||
| .selectAll('albums') | ||
| .whereRef('albums.id', '=', 'shared_links.albumId') | ||
| .innerJoin('albums_assets_assets', 'albums_assets_assets.albumsId', 'albums.id') | ||
| .innerJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('assets') | ||
| .selectAll('assets') | ||
| .whereRef('albums_assets_assets.assetsId', '=', 'assets.id') | ||
| .innerJoinLateral( | ||
| (eb) => eb.selectFrom('exif').whereRef('exif.assetId', '=', 'assets.id').as('exifInfo'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('exifInfo').as('exifInfo')) | ||
| .orderBy('a.fileCreatedAt', 'asc') | ||
| .as('assets'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .innerJoinLateral( | ||
| (eb) => eb.selectFrom('users').selectAll('users').whereRef('users.id', '=', 'a.ownerId').as('owner'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('assets').as('assets')) | ||
| .select((eb) => eb.fn.toJson('owner').as('owner')) | ||
| .as('album'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('a').as('assets')) | ||
| .select((eb) => eb.fn.toJson('album').as('album')) | ||
| .where('shared_links.id', '=', id) | ||
| .where('shared_links.userId', '=', userId) | ||
| .orderBy('shared_links.createdAt', 'desc') | ||
| .orderBy('a.fileCreatedAt', 'asc') | ||
| .executeTakeFirst() as Promise<SharedLinkEntity | undefined>; | ||
| } | ||
|
|
||
| @GenerateSql({ params: [DummyValue.UUID] }) | ||
| getAll(userId: string): Promise<SharedLinkEntity[]> { | ||
| return this.repository.find({ | ||
| where: { | ||
| userId, | ||
| }, | ||
| relations: { | ||
| assets: true, | ||
| album: { | ||
| owner: true, | ||
| }, | ||
| }, | ||
| order: { | ||
| createdAt: 'DESC', | ||
| }, | ||
| }); | ||
| return this.db | ||
| .selectFrom('shared_links') | ||
| .selectAll('shared_links') | ||
| .where('shared_links.userId', '=', userId) | ||
| .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id') | ||
| .leftJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('assets') | ||
| .whereRef('assets.id', '=', 'shared_link__asset.assetsId') | ||
| .selectAll('assets') | ||
| .as('assets'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .leftJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('albums') | ||
| .selectAll('albums') | ||
| .whereRef('albums.id', '=', 'shared_links.albumId') | ||
| .innerJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('users') | ||
| .select([ | ||
| 'users.id', | ||
| 'users.email', | ||
| 'users.createdAt', | ||
| 'users.profileImagePath', | ||
| 'users.isAdmin', | ||
| 'users.shouldChangePassword', | ||
| 'users.deletedAt', | ||
| 'users.oauthId', | ||
| 'users.updatedAt', | ||
| 'users.storageLabel', | ||
| 'users.name', | ||
| 'users.quotaSizeInBytes', | ||
| 'users.quotaUsageInBytes', | ||
| 'users.status', | ||
| 'users.profileChangedAt', | ||
| ]) | ||
| .whereRef('users.id', '=', 'albums.ownerId') | ||
| .as('owner'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('owner').as('owner')) | ||
| .as('album'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => eb.fn.toJson('album').as('album')) | ||
| .orderBy('album.createdAt', 'desc') | ||
| .execute() as unknown as Promise<SharedLinkEntity[]>; | ||
| } | ||
|
|
||
| @GenerateSql({ params: [DummyValue.BUFFER] }) | ||
| async getByKey(key: Buffer): Promise<SharedLinkEntity | null> { | ||
| return await this.repository.findOne({ | ||
| where: { | ||
| key, | ||
| }, | ||
| relations: { | ||
| user: true, | ||
| }, | ||
| }); | ||
| async getByKey(key: Buffer): Promise<SharedLinkEntity | undefined> { | ||
| return this.db | ||
| .selectFrom('shared_links') | ||
| .selectAll('shared_links') | ||
| .where('shared_links.key', '=', key) | ||
| .select((eb) => | ||
| jsonObjectFrom( | ||
| eb | ||
| .selectFrom('users') | ||
| .select([ | ||
| 'users.id', | ||
| 'users.email', | ||
| 'users.createdAt', | ||
| 'users.profileImagePath', | ||
| 'users.isAdmin', | ||
| 'users.shouldChangePassword', | ||
| 'users.deletedAt', | ||
| 'users.oauthId', | ||
| 'users.updatedAt', | ||
| 'users.storageLabel', | ||
| 'users.name', | ||
| 'users.quotaSizeInBytes', | ||
| 'users.quotaUsageInBytes', | ||
| 'users.status', | ||
| 'users.profileChangedAt', | ||
| ]) | ||
| .whereRef('users.id', '=', 'shared_links.userId'), | ||
| ).as('user'), | ||
| ) | ||
| .execute() as unknown as Promise<SharedLinkEntity | undefined>; | ||
| } | ||
|
|
||
| create(entity: Partial<SharedLinkEntity>): Promise<SharedLinkEntity> { | ||
| return this.save(entity); | ||
| } | ||
| async create(entity: Insertable<SharedLinks> & { assetIds?: string[] }): Promise<SharedLinkEntity> { | ||
| const { id } = await this.db | ||
| .insertInto('shared_links') | ||
| .values(_.omit(entity, 'assetIds')) | ||
| .returningAll() | ||
| .executeTakeFirstOrThrow(); | ||
|
|
||
| if (entity.assetIds && entity.assetIds.length > 0) { | ||
| await this.db | ||
| .insertInto('shared_link__asset') | ||
| .values(entity.assetIds!.map((assetsId) => ({ assetsId, sharedLinksId: id }))) | ||
| .execute(); | ||
| } | ||
|
|
||
| update(entity: Partial<SharedLinkEntity>): Promise<SharedLinkEntity> { | ||
| return this.save(entity); | ||
| return this.db | ||
| .selectFrom('shared_links') | ||
| .selectAll('shared_links') | ||
| .where('shared_links.id', '=', id) | ||
| .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id') | ||
| .leftJoinLateral( | ||
| (eb) => | ||
| eb | ||
| .selectFrom('assets') | ||
| .whereRef('assets.id', '=', 'shared_link__asset.assetsId') | ||
| .selectAll('assets') | ||
| .innerJoinLateral( | ||
| (eb) => eb.selectFrom('exif').whereRef('exif.assetId', '=', 'assets.id').selectAll().as('exif'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .as('assets'), | ||
| (join) => join.onTrue(), | ||
| ) | ||
| .select((eb) => | ||
| eb.fn.coalesce(eb.fn.jsonAgg('assets').filterWhere('assets.id', 'is not', null), sql`'[]'`).as('assets'), | ||
| ) | ||
| .groupBy('shared_links.id') | ||
| .executeTakeFirstOrThrow() as unknown as Promise<SharedLinkEntity>; | ||
| } | ||
|
|
||
| async remove(entity: SharedLinkEntity): Promise<void> { | ||
| await this.repository.remove(entity); | ||
| update(entity: Partial<SharedLinkEntity> & { id: string }): Promise<SharedLinkEntity> { | ||
| return this.db | ||
| .updateTable('shared_links') | ||
| .set(entity) | ||
| .where('shared_links.id', '=', entity.id) | ||
| .returningAll() | ||
| .executeTakeFirstOrThrow() as Promise<SharedLinkEntity>; | ||
| } | ||
|
|
||
| private async save(entity: Partial<SharedLinkEntity>): Promise<SharedLinkEntity> { | ||
| await this.repository.save(entity); | ||
| return this.repository.findOneOrFail({ where: { id: entity.id } }); | ||
| async remove(entity: SharedLinkEntity): Promise<void> { | ||
| await this.db.deleteFrom('shared_links').where('shared_links.id', '=', entity.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
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