From 04e350b204ba6dc2a9ed95d005c7515f2ed951de Mon Sep 17 00:00:00 2001
From: gerardPolloRebozado <gerardit4@gmail.com>
Date: Wed, 6 Mar 2024 10:08:16 +0100
Subject: [PATCH] feat: Now returns user list with it's roles

\
---
 apps/api/src/app/admin/admin.service.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 320601667..47ffa0b15 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -440,13 +440,14 @@ export class AdminService {
         },
         createdAt: true,
         id: true,
-        Subscription: true
+        Subscription: true,
+        role: true
       },
       take: 30
     });
 
     return usersWithAnalytics.map(
-      ({ _count, Analytics, createdAt, id, Subscription }) => {
+      ({ _count, Analytics, createdAt, id, Subscription, role }) => {
         const daysSinceRegistration =
           differenceInDays(new Date(), createdAt) + 1;
         const engagement = Analytics
@@ -470,7 +471,8 @@ export class AdminService {
           accountCount: _count.Account || 0,
           country: Analytics?.country,
           lastActivity: Analytics?.updatedAt,
-          transactionCount: _count.Order || 0
+          transactionCount: _count.Order || 0,
+          role: role
         };
       }
     );