From c2af4a07e94601e4d72c4341025b43f401a04760 Mon Sep 17 00:00:00 2001
From: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:25:46 +1000
Subject: [PATCH] Made changes to server to allow admin panel to retrieve last
 activity instead of last logged in date (#58)

* Made changes to server to allow admin panel to retrieve last activity instead of last logged in date

* Added TODO comment for lastLoggedIn json result

* Updated variable names as per Pancake's comments
---
 db/account.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/account.go b/db/account.go
index 69c0d94..8a98f5a 100644
--- a/db/account.go
+++ b/db/account.go
@@ -199,28 +199,28 @@ func FetchLastLoggedInDateByUsername(username string) (string, error) {
 }
 
 type AdminSearchResponse struct {
-	Username     string `json:"username"`
-	DiscordId    string `json:"discordId"`
-	GoogleId     string `json:"googleId"`
-	LastLoggedIn string `json:"lastLoggedIn"`
-	Registered   string `json:"registered"`
+	Username        string `json:"username"`
+	DiscordId       string `json:"discordId"`
+	GoogleId        string `json:"googleId"`
+	LastActivity	string `json:"lastLoggedIn"` // TODO: this is currently lastLoggedIn to match server PR #54 with pokerogue PR #4198. We're hotfixing the server with this PR to return lastActivity, but we're not hotfixing the client, so are leaving this as lastLoggedIn so that it still talks to the client properly
+	Registered		string `json:"registered"`
 }
 
 func FetchAdminDetailsByUsername(dbUsername string) (AdminSearchResponse, error) {
-	var resultUsername, resultDiscordId, resultGoogleId, resultLastLoggedIn, resultRegistered sql.NullString
+	var username, discordId, googleId, lastActivity, registered sql.NullString
 	var adminResponse AdminSearchResponse
 
-	err := handle.QueryRow("SELECT username, discordId, googleId, lastLoggedIn, registered from accounts WHERE username = ?", dbUsername).Scan(&resultUsername, &resultDiscordId, &resultGoogleId, &resultLastLoggedIn, &resultRegistered)
+	err := handle.QueryRow("SELECT username, discordId, googleId, lastActivity, registered from accounts WHERE username = ?", dbUsername).Scan(&username, &discordId, &googleId, &lastActivity, &registered)
 	if err != nil {
 		return adminResponse, err
 	}
 
 	adminResponse = AdminSearchResponse{
-		Username:     resultUsername.String,
-		DiscordId:    resultDiscordId.String,
-		GoogleId:     resultGoogleId.String,
-		LastLoggedIn: resultLastLoggedIn.String,
-		Registered:   resultRegistered.String,
+		Username:        username.String,
+		DiscordId:       discordId.String,
+		GoogleId:        googleId.String,
+		LastActivity:    lastActivity.String,
+		Registered:		 registered.String,
 	}
 
 	return adminResponse, nil