refactor: migrate user repository to kysely

server/src/decorators.ts

@@ -99,6 +99,7 @@ export const DummyValue = {
   BUFFER: Buffer.from('abcdefghi'),
   DATE: new Date(),
   TIME_BUCKET: '2024-01-01T00:00:00.000Z',
+  BOOLEAN: true,
 };
 
 export const GENERATE_SQL_KEY = 'generate-sql-key';

server/src/entities/user.entity.ts

@@ -1,3 +1,6 @@
+import { ExpressionBuilder } from 'kysely';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
+import { DB } from 'src/db';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { TagEntity } from 'src/entities/tag.entity';
 import { UserMetadataEntity } from 'src/entities/user-metadata.entity';
@@ -71,3 +74,11 @@ export class UserEntity {
   @Column({ type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' })
   profileChangedAt!: Date;
 }
+
+export const withMetadata = (eb: ExpressionBuilder<DB, 'users'>) => {
+  return eb
+    .selectFrom('user_metadata')
+    .whereRef('users.id', '=', 'user_metadata.userId')
+    .select((eb) => jsonArrayFrom(eb.table('user_metadata')).as('metadata'))
+    .as('metadata');
+};

server/src/interfaces/user.interface.ts

@@ -1,3 +1,5 @@
+import { Insertable, Updateable } from 'kysely';
+import { Users } from 'src/db';
 import { UserMetadata } from 'src/entities/user-metadata.entity';
 import { UserEntity } from 'src/entities/user.entity';
 
@@ -23,17 +25,17 @@ export interface UserFindOptions {
 export const IUserRepository = 'IUserRepository';
 
 export interface IUserRepository {
-  get(id: string, options: UserFindOptions): Promise<UserEntity | null>;
-  getAdmin(): Promise<UserEntity | null>;
+  get(id: string, options: UserFindOptions): Promise<UserEntity | undefined>;
+  getAdmin(): Promise<UserEntity | undefined>;
   hasAdmin(): Promise<boolean>;
-  getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | null>;
-  getByStorageLabel(storageLabel: string): Promise<UserEntity | null>;
-  getByOAuthId(oauthId: string): Promise<UserEntity | null>;
+  getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | undefined>;
+  getByStorageLabel(storageLabel: string): Promise<UserEntity | undefined>;
+  getByOAuthId(oauthId: string): Promise<UserEntity | undefined>;
   getDeletedUsers(): Promise<UserEntity[]>;
   getList(filter?: UserListFilter): Promise<UserEntity[]>;
   getUserStats(): Promise<UserStatsQueryResponse[]>;
-  create(user: Partial<UserEntity>): Promise<UserEntity>;
-  update(id: string, user: Partial<UserEntity>): Promise<UserEntity>;
+  create(user: Insertable<Users>): Promise<UserEntity>;
+  update(id: string, user: Updateable<Users>): Promise<UserEntity>;
   upsertMetadata<T extends keyof UserMetadata>(id: string, item: { key: T; value: UserMetadata[T] }): Promise<void>;
   deleteMetadata<T extends keyof UserMetadata>(id: string, key: T): Promise<void>;
   delete(user: UserEntity, hard?: boolean): Promise<UserEntity>;