From 77358eed65ffcfb75ee0d00bd96649fa86d792ef Mon Sep 17 00:00:00 2001
From: Gerard Du Pre <37554513+GerardPolloRebozado@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:38:57 +0100
Subject: [PATCH] Feature/Include user role in admin endpoint (#3107)

* Include user role in admin endpoint
---
 apps/api/src/app/admin/admin.service.ts                | 4 +++-
 libs/common/src/lib/interfaces/admin-data.interface.ts | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 320601667..f78d1b61d 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,
+        role: true,
         Subscription: true
       },
       take: 30
     });
 
     return usersWithAnalytics.map(
-      ({ _count, Analytics, createdAt, id, Subscription }) => {
+      ({ _count, Analytics, createdAt, id, role, Subscription }) => {
         const daysSinceRegistration =
           differenceInDays(new Date(), createdAt) + 1;
         const engagement = Analytics
@@ -466,6 +467,7 @@ export class AdminService {
           createdAt,
           engagement,
           id,
+          role,
           subscription,
           accountCount: _count.Account || 0,
           country: Analytics?.country,
diff --git a/libs/common/src/lib/interfaces/admin-data.interface.ts b/libs/common/src/lib/interfaces/admin-data.interface.ts
index 6d51d5d52..2c6a5c501 100644
--- a/libs/common/src/lib/interfaces/admin-data.interface.ts
+++ b/libs/common/src/lib/interfaces/admin-data.interface.ts
@@ -1,3 +1,5 @@
+import { Role } from '@prisma/client';
+
 import { UniqueAsset } from './unique-asset.interface';
 
 export interface AdminData {
@@ -16,6 +18,7 @@ export interface AdminData {
     engagement: number;
     id: string;
     lastActivity: Date;
+    role: Role;
     transactionCount: number;
   }[];
   version: string;