add filters

Prakharnagore · Aug 24, 2024 · ae79c0b · ae79c0b
1 parent e327646
commit ae79c0b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
@@ -1,4 +1,4 @@
-import { Repository } from "typeorm";
+import { Brackets, Repository } from "typeorm";
 import { User } from "../entity/User";
 import { LimitedUserData, UserData, UserQueryParams } from "../types";
 import createHttpError from "http-errors";
@@ -84,11 +84,32 @@ export class UserService {
     }
     async getAll(validateQuery: UserQueryParams) {
         const queryBuilder = this.userRepository.createQueryBuilder("user");
+
+        if (validateQuery.q) {
+            const searchTerm = `%${validateQuery.q}%`;
+            queryBuilder.where(
+                new Brackets((qb) => {
+                    qb.where(
+                        "CONCAT(user.firstName, ' ', user.lastName) ILike :q",
+                        { q: searchTerm },
+                    ).orWhere("user.email ILike :q", { q: searchTerm });
+                }),
+            );
+        }
+
+        if (validateQuery.role) {
+            queryBuilder.andWhere("user.role = :role", {
+                role: validateQuery.role,
+            });
+        }
+
         const result = await queryBuilder
             .skip((validateQuery.currentPage - 1) * validateQuery.perPage)
             .take(validateQuery.perPage)
+            .orderBy("user.id", "DESC")
             .getManyAndCount();
 
+        // console.log("Query", queryBuilder.getSql());
         return result;
     }
 

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -56,4 +56,6 @@ export interface UpdateUserRequest extends Request {
 export interface UserQueryParams {
     perPage: number;
     currentPage: number;
+    q: string;
+    role: string;
 }
diff --git a/src/validators/list-users-validator.ts b/src/validators/list-users-validator.ts
@@ -2,6 +2,21 @@ import { checkSchema } from "express-validator";
 
 export default checkSchema(
     {
+        q: {
+            trim: true,
+            customSanitizer: {
+                options: (value: unknown) => {
+                    return value ? value : "";
+                },
+            },
+        },
+        role: {
+            customSanitizer: {
+                options: (value: unknown) => {
+                    return value ? value : "";
+                },
+            },
+        },
         currentPage: {
             customSanitizer: {
                 options: (value) => {