fix: update query builder

masb0ymas · masb0ymas · commit f0f2a38dbe36 · 2025-04-01T21:46:56.000+07:00
diff --git a/src/app/handler/role.ts b/src/app/handler/role.ts
@@ -9,7 +9,8 @@ const service = new RoleService()
 route.get(
   '/',
   asyncHandler(async (req: Request, res: Response) => {
-    const records = await service.find()
+    const { page, pageSize, filtered, sorted } = req.getQuery()
+    const records = await service.find({ page, pageSize, filtered, sorted })
     const httpResponse = HttpResponse.get({ data: records })
     res.status(200).json(httpResponse)
   })
diff --git a/src/app/handler/session.ts b/src/app/handler/session.ts
@@ -9,7 +9,8 @@ const service = new SessionService()
 route.get(
   '/',
   asyncHandler(async (req: Request, res: Response) => {
-    const records = await service.find()
+    const { page, pageSize, filtered, sorted } = req.getQuery()
+    const records = await service.find({ page, pageSize, filtered, sorted })
     const httpResponse = HttpResponse.get({ data: records })
     res.status(200).json(httpResponse)
   })
diff --git a/src/app/handler/upload.ts b/src/app/handler/upload.ts
@@ -9,7 +9,8 @@ const service = new UploadService()
 route.get(
   '/',
   asyncHandler(async (req: Request, res: Response) => {
-    const records = await service.find()
+    const { page, pageSize, filtered, sorted } = req.getQuery()
+    const records = await service.find({ page, pageSize, filtered, sorted })
     const httpResponse = HttpResponse.get({ data: records })
     res.status(200).json(httpResponse)
   })
diff --git a/src/app/handler/user.ts b/src/app/handler/user.ts
@@ -9,7 +9,8 @@ const service = new UserService()
 route.get(
   '/',
   asyncHandler(async (req: Request, res: Response) => {
-    const records = await service.find()
+    const { page, pageSize, filtered, sorted } = req.getQuery()
+    const records = await service.find({ page, pageSize, filtered, sorted })
     const httpResponse = HttpResponse.get({ data: records })
     res.status(200).json(httpResponse)
   })
diff --git a/src/app/service/base.ts b/src/app/service/base.ts
@@ -2,6 +2,7 @@ import _ from 'lodash'
 import { FindOneOptions, In, ObjectLiteral, Repository } from 'typeorm'
 import { z } from 'zod'
 import ErrorResponse from '~/lib/http/errors'
+import { QueryBuilder } from '~/lib/query-builder'
 import { validate } from '~/lib/validate'
 
 type IProps<T extends ObjectLiteral> = {
@@ -10,6 +11,18 @@ type IProps<T extends ObjectLiteral> = {
   model: string
 }
 
+type FindParams = {
+  page: number
+  pageSize: number
+  filtered: any
+  sorted: any
+}
+
+type DtoFindAll<T extends ObjectLiteral> = {
+  data: T[]
+  total: number
+}
+
 export default class BaseService<T extends ObjectLiteral> {
   public repository: Repository<T>
   private _schema: z.ZodType<any>
@@ -24,8 +37,20 @@ export default class BaseService<T extends ObjectLiteral> {
   /**
    * Find all
    */
-  async find(): Promise<T[]> {
-    return this.repository.find()
+  async find({ page, pageSize, filtered = [], sorted = [] }: FindParams): Promise<DtoFindAll<T>> {
+    const query = this.repository.createQueryBuilder(this._model)
+    const newQuery = QueryBuilder({
+      params: {
+        query,
+        model: this._model,
+        reqQuery: { page, pageSize, filtered, sorted },
+      },
+    })
+
+    const data = await newQuery.getMany()
+    const total = await newQuery.getCount()
+
+    return { data, total }
   }
 
   /**
diff --git a/src/lib/query-builder/index.ts b/src/lib/query-builder/index.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { ObjectLiteral } from 'typeorm'
+import { ObjectLiteral, SelectQueryBuilder } from 'typeorm'
 import { validate } from '../validate'
 import { applyFilter } from './filtered'
 import { applyPagination } from './pagination'
@@ -9,7 +9,10 @@ import { QueryBuilderParams } from './types'
 /**
  * Query builder for TypeORM
  */
-export function QueryBuilder<T extends ObjectLiteral>({ params, options }: QueryBuilderParams<T>) {
+export function QueryBuilder<T extends ObjectLiteral>({
+  params,
+  options,
+}: QueryBuilderParams<T>): SelectQueryBuilder<T> {
   const { query, model, reqQuery, options: opt } = params
 
   const queryPage = _.get(reqQuery, 'page', 1)
@@ -35,4 +38,6 @@ export function QueryBuilder<T extends ObjectLiteral>({ params, options }: Query
     pageSize: validate.number(queryPageSize),
     limit,
   })
+
+  return query
 }
