Merge pull request #222 from souravbhowmik1999/statusChangeAdd

User Management: Changes status field value
tekdi · Jun 20, 2024 · 4280f5c · 4280f5c
2 parents dac21fc + 53cfa3b
commit 4280f5c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/adapters/postgres/user-adapter.ts b/src/adapters/postgres/user-adapter.ts
@@ -136,7 +136,7 @@ export class PostgresUserService implements IServicelocator {
       INNER JOIN public."UserRolesMapping" UR
       ON UR."userId" = U."userId"
       INNER JOIN public."Roles" R
-      ON R."roleId" = UR."roleId" ${whereCondition} AND U."status"='true'`
+      ON R."roleId" = UR."roleId" ${whereCondition} AND U."status"='active'`
     let results = await this.usersRepository.query(query);
 
     if (!query) {
@@ -240,8 +240,8 @@ export class PostgresUserService implements IServicelocator {
     return role;
   }
 
-  async findUserDetails(userId, username?: any,tenantId?: string
-    ){
+  async findUserDetails(userId, username?: any, tenantId?: string
+  ) {
     let whereClause: any = { userId: userId };
     if (username && userId === null) {
       delete whereClause.userId;
@@ -255,7 +255,7 @@ export class PostgresUserService implements IServicelocator {
       return false;
     }
     const tenentDetails = await this.userTenantRoleData(userDetails.userId);
-    if(!tenentDetails) {
+    if (!tenentDetails) {
       return userDetails;
     }
     const tenantData = tenantId ? tenentDetails.filter(item => item.tenantId === tenantId) : tenentDetails;
@@ -280,9 +280,8 @@ export class PostgresUserService implements IServicelocator {
   WHERE 
     UTM."userId" = $1
   ORDER BY 
-    T."tenantId", UTM."Id";
-`;
-
+    T."tenantId", UTM."Id";`;
+
     const result = await this.usersRepository.query(query, [userId]);
     const combinedResult = [];
     let roleArray = []