From f1fd7a79c9be4c99942ce0ef687ffe9ae1c45833 Mon Sep 17 00:00:00 2001
From: gerardPolloRebozado <gerardit4@gmail.com>
Date: Wed, 6 Mar 2024 21:07:03 +0100
Subject: [PATCH] refactor: Reorder user list to keep the alphabetical order

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

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