refactor: better types for getList and getDeletedAfter (#16926)

server/src/repositories/activity.repository.ts

@@ -18,7 +18,7 @@ const withUser = (eb: ExpressionBuilder<DB, 'activity'>) => {
   return jsonObjectFrom(
     eb
       .selectFrom('users')
-      .select(columns.userDto)
+      .select(columns.user)
       .whereRef('users.id', '=', 'activity.userId')
       .where('users.deletedAt', 'is', null),
   ).as('user');

server/src/repositories/partner.repository.ts

@@ -18,16 +18,13 @@ export enum PartnerDirection {
 
 const withSharedBy = (eb: ExpressionBuilder<DB, 'partners'>) => {
   return jsonObjectFrom(
-    eb.selectFrom('users as sharedBy').select(columns.userDto).whereRef('sharedBy.id', '=', 'partners.sharedById'),
+    eb.selectFrom('users as sharedBy').select(columns.user).whereRef('sharedBy.id', '=', 'partners.sharedById'),
   ).as('sharedBy');
 };
 
 const withSharedWith = (eb: ExpressionBuilder<DB, 'partners'>) => {
   return jsonObjectFrom(
-    eb
-      .selectFrom('users as sharedWith')
-      .select(columns.userDto)
-      .whereRef('sharedWith.id', '=', 'partners.sharedWithId'),
+    eb.selectFrom('users as sharedWith').select(columns.user).whereRef('sharedWith.id', '=', 'partners.sharedWithId'),
   ).as('sharedWith');
 };
 

server/src/repositories/user.repository.ts

@@ -1,6 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, sql, Updateable } from 'kysely';
+import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
+import { columns, UserAdmin } from 'src/database';
 import { DB, UserMetadata as DbUserMetadata, Users } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { UserMetadata, UserMetadataItem } from 'src/entities/user-metadata.entity';
@@ -8,24 +10,6 @@ import { UserEntity, withMetadata } from 'src/entities/user.entity';
 import { AssetType, UserStatus } from 'src/enum';
 import { asUuid } from 'src/utils/database';
 
-const columns = [
-  'id',
-  'email',
-  'createdAt',
-  'profileImagePath',
-  'isAdmin',
-  'shouldChangePassword',
-  'deletedAt',
-  'oauthId',
-  'updatedAt',
-  'storageLabel',
-  'name',
-  'quotaSizeInBytes',
-  'quotaUsageInBytes',
-  'status',
-  'profileChangedAt',
-] as const;
-
 type Upsert = Insertable<DbUserMetadata>;
 
 export interface UserListFilter {
@@ -57,7 +41,7 @@ export class UserRepository {
 
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .select(withMetadata)
       .where('users.id', '=', userId)
       .$if(!options.withDeleted, (eb) => eb.where('users.deletedAt', 'is', null))
@@ -76,7 +60,7 @@ export class UserRepository {
   getAdmin(): Promise<UserEntity | undefined> {
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .where('users.isAdmin', '=', true)
       .where('users.deletedAt', 'is', null)
       .executeTakeFirst() as Promise<UserEntity | undefined>;
@@ -98,7 +82,7 @@ export class UserRepository {
   getByEmail(email: string, withPassword?: boolean): Promise<UserEntity | undefined> {
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .$if(!!withPassword, (eb) => eb.select('password'))
       .where('email', '=', email)
       .where('users.deletedAt', 'is', null)
@@ -109,7 +93,7 @@ export class UserRepository {
   getByStorageLabel(storageLabel: string): Promise<UserEntity | undefined> {
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .where('users.storageLabel', '=', storageLabel)
       .where('users.deletedAt', 'is', null)
       .executeTakeFirst() as Promise<UserEntity | undefined>;
@@ -119,35 +103,36 @@ export class UserRepository {
   getByOAuthId(oauthId: string): Promise<UserEntity | undefined> {
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .where('users.oauthId', '=', oauthId)
       .where('users.deletedAt', 'is', null)
       .executeTakeFirst() as Promise<UserEntity | undefined>;
   }
 
-  getDeletedUsers(): Promise<UserEntity[]> {
-    return this.db
-      .selectFrom('users')
-      .select(columns)
-      .where('users.deletedAt', 'is not', null)
-      .execute() as unknown as Promise<UserEntity[]>;
+  @GenerateSql({ params: [DateTime.now().minus({ years: 1 })] })
+  getDeletedAfter(target: DateTime) {
+    return this.db.selectFrom('users').select(['id']).where('users.deletedAt', '<', target.toJSDate()).execute();
   }
 
-  getList({ withDeleted }: UserListFilter = {}): Promise<UserEntity[]> {
+  @GenerateSql(
+    { name: 'with deleted', params: [{ withDeleted: true }] },
+    { name: 'without deleted', params: [{ withDeleted: false }] },
+  )
+  getList({ withDeleted }: UserListFilter = {}) {
     return this.db
       .selectFrom('users')
-      .select(columns)
+      .select(columns.userAdmin)
       .select(withMetadata)
       .$if(!withDeleted, (eb) => eb.where('users.deletedAt', 'is', null))
       .orderBy('createdAt', 'desc')
-      .execute() as unknown as Promise<UserEntity[]>;
+      .execute() as Promise<UserAdmin[]>;
   }
 
   async create(dto: Insertable<Users>): Promise<UserEntity> {
     return this.db
       .insertInto('users')
       .values(dto)
-      .returning(columns)
+      .returning(columns.userAdmin)
       .executeTakeFirst() as unknown as Promise<UserEntity>;
   }
 
@@ -157,7 +142,7 @@ export class UserRepository {
       .set(dto)
       .where('users.id', '=', asUuid(id))
       .where('users.deletedAt', 'is', null)
-      .returning(columns)
+      .returning(columns.userAdmin)
       .returning(withMetadata)
       .executeTakeFirst() as unknown as Promise<UserEntity>;
   }
@@ -167,7 +152,7 @@ export class UserRepository {
       .updateTable('users')
       .set({ status: UserStatus.ACTIVE, deletedAt: null })
       .where('users.id', '=', asUuid(id))
-      .returning(columns)
+      .returning(columns.userAdmin)
       .returning(withMetadata)
       .executeTakeFirst() as unknown as Promise<UserEntity>;
   }