From 8e55ebc4b78a0331474899f4f22237cf12b78e5d Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Sun, 5 Nov 2023 00:18:01 +0100
Subject: [PATCH] Added active member count #413

---
 bot/src/bot_graphql/graphql/server.gql                        | 1 +
 bot/src/bot_graphql/queries/server_query.py                   | 4 ++++
 web/src/app/models/data/server.model.ts                       | 1 +
 web/src/app/models/graphql/queries.model.ts                   | 1 +
 .../dashboard/components/dashboard/dashboard.component.html   | 1 +
 .../server/server-dashboard/server-dashboard.component.html   | 4 ++--
 web/src/assets/i18n/de.json                                   | 1 +
 web/src/assets/i18n/en.json                                   | 1 +
 8 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bot/src/bot_graphql/graphql/server.gql b/bot/src/bot_graphql/graphql/server.gql
index 2dda4cef..1e80be20 100644
--- a/bot/src/bot_graphql/graphql/server.gql
+++ b/bot/src/bot_graphql/graphql/server.gql
@@ -26,6 +26,7 @@ type Server implements TableWithHistoryQuery {
     gameServers: [GameServer]
 
     userCount: Int
+    activeUserCount: Int
     users(filter: UserFilter, page: Page, sort: Sort): [User]
 
     achievementCount: Int
diff --git a/bot/src/bot_graphql/queries/server_query.py b/bot/src/bot_graphql/queries/server_query.py
index edd647cd..1398fa08 100644
--- a/bot/src/bot_graphql/queries/server_query.py
+++ b/bot/src/bot_graphql/queries/server_query.py
@@ -76,6 +76,10 @@ class ServerQuery(DataQueryWithHistoryABC):
             lambda server, *_: self._levels.get_levels_by_server_id(server.id),
             LevelFilter,
         )
+        self.set_field(
+            "activeUserCount",
+            lambda server, *_: self._users.get_users_by_server_id(server.id).where(lambda x: not x.left_server).count(),
+        )
         self.add_collection(
             "user",
             lambda server, *_: self._users.get_users_by_server_id(server.id),
diff --git a/web/src/app/models/data/server.model.ts b/web/src/app/models/data/server.model.ts
index 483a6e46..024a1a6e 100644
--- a/web/src/app/models/data/server.model.ts
+++ b/web/src/app/models/data/server.model.ts
@@ -23,6 +23,7 @@ export interface Server extends Data {
   levelCount?: number;
   levels?: Level[];
   userCount?: number;
+  activeUserCount?: number;
   users?: User[];
   config?: ServerConfig;
   hasFeatureFlag?: FeatureFlag;
diff --git a/web/src/app/models/graphql/queries.model.ts b/web/src/app/models/graphql/queries.model.ts
index f2a4f32a..d16e94c1 100644
--- a/web/src/app/models/graphql/queries.model.ts
+++ b/web/src/app/models/graphql/queries.model.ts
@@ -68,6 +68,7 @@ export class Queries {
         name
         iconURL
         userCount
+        activeUserCount
         clients {
           id
           discordId
diff --git a/web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.html b/web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.html
index 743d265f..7d02f084 100644
--- a/web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.html
+++ b/web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.html
@@ -40,6 +40,7 @@
                             <i class="pi pi-users"></i>
                             {{server.userCount}}
                             {{'view.dashboard.server.member_count' | translate}}
+                            {{'view.dashboard.server.active_members' | translate}} {{server ? server.activeUserCount : ''}}
                         </div>
                     </div>
 
diff --git a/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html b/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html
index f8263f8d..69fe099e 100644
--- a/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html
+++ b/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html
@@ -23,9 +23,9 @@
             </h3>
 
             <div class="data">
-              <i class="pi pi-users"></i>
-              {{server ? server.userCount : ''}}
+              <i class="pi pi-users"></i> {{server ? server.userCount : ''}}
               {{'view.dashboard.server.member_count' | translate}}
+              {{'view.dashboard.server.active_members' | translate}} {{server ? server.activeUserCount : ''}}
             </div>
 
             <div class="client-data"
diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json
index 7e9fc08b..aec55e53 100644
--- a/web/src/assets/i18n/de.json
+++ b/web/src/assets/i18n/de.json
@@ -360,6 +360,7 @@
       },
       "header": "Dashboard",
       "server": {
+        "active_members": "davon aktiv:",
         "header": "Server",
         "member_count": "Mitglied(er)"
       },
diff --git a/web/src/assets/i18n/en.json b/web/src/assets/i18n/en.json
index 4b847847..a236d8e3 100644
--- a/web/src/assets/i18n/en.json
+++ b/web/src/assets/i18n/en.json
@@ -360,6 +360,7 @@
       },
       "header": "Dashboard",
       "server": {
+        "active_members": "active:",
         "header": "Server",
         "member_count": "Member(s)"
       },