Merge pull request #165 from Sourav-Tekdi/roleFilter

Search users based on there Role
tekdi · Feb 26, 2025 · 724d57a · 724d57a
2 parents b0cf032 + 6c11f14
commit 724d57a
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/adapters/postgres/user-adapter.ts b/src/adapters/postgres/user-adapter.ts
@@ -376,8 +376,6 @@ export class PostgresUserService implements IServicelocator {
         API_RESPONSES.USER_GET_SUCCESSFULLY
       );
     } catch (e) {
-      console.log(e);
-
       LoggerUtil.error(
         `${API_RESPONSES.SERVER_ERROR}: ${request.url}`,
         `Error: ${e.message}`,
@@ -422,15 +420,14 @@ export class PostgresUserService implements IServicelocator {
     if (filters && Object.keys(filters).length > 0) {
       //Fwtch all core fields
       let coreFields = await this.getCoreColumnNames();
-      const allCoreField = [...coreFields, 'fromDate', 'toDate'];
+      const allCoreField = [...coreFields, 'fromDate', 'toDate', 'role'];
 
       for (const [key, value] of Object.entries(filters)) {
         //Check request filter are proesent on core file or cutom fields
         if (allCoreField.includes(key)) {
           if (index > 0 && index < Object.keys(filters).length) {
             whereCondition += ` AND `;
           }
-
           switch (key) {
             case "firstName":
               whereCondition += ` U."${key}" ILIKE '%${value}%'`;
@@ -454,6 +451,10 @@ export class PostgresUserService implements IServicelocator {
               whereCondition += ` R."name" = '${value}'`;
               index++;
               break;
+
+            case "status":
+              whereCondition += ` U."status" IN('${value}')`;
+              index++;
 
             case "fromDate":
               whereCondition += ` DATE(U."createdAt") >= '${value}'`;
@@ -476,8 +477,6 @@ export class PostgresUserService implements IServicelocator {
         }
       }
     }
-    console.log("wherecond", searchCustomFields);
-
 
     if (exclude && Object.keys(exclude).length > 0) {
       Object.entries(exclude).forEach(([key, value]) => {
@@ -552,12 +551,8 @@ export class PostgresUserService implements IServicelocator {
       ON UR."userId" = U."userId"
       LEFT JOIN public."Roles" R
       ON R."roleId" = UR."roleId" ${whereCondition} GROUP BY U."userId", R."name" ${orderingCondition} ${offset} ${limit}`;
-
-      console.log(query);
-
+
     const userDetails = await this.usersRepository.query(query);
-    // console.log(userDetails);
-
 
     if (userDetails.length > 0) {
       result.totalCount = parseInt(userDetails[0].total_count, 10);