From ca973edc28b5fe543c583217896590f4a2e98897 Mon Sep 17 00:00:00 2001
From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com>
Date: Thu, 24 Aug 2023 22:34:05 +0300
Subject: fix: mod flag for easy check (#49)

Former-commit-id: 06ee23ee9659834252d3cb5c3c255797e9f93b62
---
 backend/controllers/userController.go | 95 +++++++++++++++++------------------
 1 file changed, 46 insertions(+), 49 deletions(-)

(limited to 'backend/controllers/userController.go')

diff --git a/backend/controllers/userController.go b/backend/controllers/userController.go
index 0dae155..64f144a 100644
--- a/backend/controllers/userController.go
+++ b/backend/controllers/userController.go
@@ -17,8 +17,39 @@ type ProfileResponse struct {
 	UserName    string          `json:"user_name"`
 	AvatarLink  string          `json:"avatar_link"`
 	CountryCode string          `json:"country_code"`
-	ScoresSP    []ScoreResponse `json:"scores_sp"`
-	ScoresMP    []ScoreResponse `json:"scores_mp"`
+	Titles      []models.Title  `json:"titles"`
+	Links       models.Links    `json:"links"`
+	Rankings    ProfileRankings `json:"rankings"`
+	Records     ProfileRecords  `json:"records"`
+}
+
+type ProfileRankings struct {
+	Overall      ProfileRankingsDetails `json:"overall"`
+	Singleplayer ProfileRankingsDetails `json:"singleplayer"`
+	Cooperative  ProfileRankingsDetails `json:"cooperative"`
+}
+
+type ProfileRankingsDetails struct {
+	Rank            int `json:"rank"`
+	CompletionCount int `json:"completion_count"`
+	CompletionTotal int `json:"completion_total"`
+}
+
+type ProfileRecords struct {
+	P2Singleplayer ProfileRecordsDetails `json:"portal2_singleplayer"`
+	P2Cooperative  ProfileRecordsDetails `json:"portal2_cooperative"`
+}
+
+type ProfileRecordsDetails struct {
+	MapID  int             `json:"map_id"`
+	Scores []ProfileScores `json:"scores"`
+}
+
+type ProfileScores struct {
+	DemoID     string    `json:"demo_id"`
+	ScoreCount int       `json:"score_count"`
+	ScoreTime  int       `json:"score_time"`
+	Date       time.Time `json:"date"`
 }
 
 type ScoreResponse struct {
@@ -44,58 +75,22 @@ func Profile(c *gin.Context) {
 		c.JSON(http.StatusUnauthorized, models.ErrorResponse("User not logged in."))
 		return
 	}
-	// Retrieve singleplayer records
-	var scoresSP []ScoreResponse
-	sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id`
+	// Get user titles
+	titles := []models.Title{}
+	sql := `SELECT t.title_name, t.title_color FROM titles t
+	INNER JOIN user_titles ut ON t.id=ut.title_id WHERE ut.user_id = $1`
 	rows, err := database.DB.Query(sql, user.(models.User).SteamID)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
 		return
 	}
-	var recordsSP []models.RecordSP
-	for rows.Next() {
-		var mapID int
-		var record models.RecordSP
-		rows.Scan(&record.RecordID, &mapID, &record.ScoreCount, &record.ScoreTime, &record.DemoID, &record.RecordDate)
-		// More than one record in one map
-		if len(scoresSP) != 0 && mapID == scoresSP[len(scoresSP)-1].MapID {
-			scoresSP[len(scoresSP)-1].Records = append(scoresSP[len(scoresSP)-1].Records.([]models.RecordSP), record)
-			continue
-		}
-		// New map
-		recordsSP = []models.RecordSP{}
-		recordsSP = append(recordsSP, record)
-		scoresSP = append(scoresSP, ScoreResponse{
-			MapID:   mapID,
-			Records: recordsSP,
-		})
-	}
-	// Retrieve multiplayer records
-	var scoresMP []ScoreResponse
-	sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp
-	WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id`
-	rows, err = database.DB.Query(sql, user.(models.User).SteamID, user.(models.User).SteamID)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
-		return
-	}
-	var recordsMP []models.RecordMP
 	for rows.Next() {
-		var mapID int
-		var record models.RecordMP
-		rows.Scan(&record.RecordID, &mapID, &record.HostID, &record.PartnerID, &record.ScoreCount, &record.ScoreTime, &record.HostDemoID, &record.PartnerDemoID, &record.RecordDate)
-		// More than one record in one map
-		if len(scoresMP) != 0 && mapID == scoresMP[len(scoresMP)-1].MapID {
-			scoresMP[len(scoresMP)-1].Records = append(scoresMP[len(scoresMP)-1].Records.([]models.RecordMP), record)
-			continue
+		var title models.Title
+		if err := rows.Scan(&title.Name, &title.Color); err != nil {
+			c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+			return
 		}
-		// New map
-		recordsMP = []models.RecordMP{}
-		recordsMP = append(recordsMP, record)
-		scoresMP = append(scoresMP, ScoreResponse{
-			MapID:   mapID,
-			Records: recordsMP,
-		})
+		titles = append(titles, title)
 	}
 	c.JSON(http.StatusOK, models.Response{
 		Success: true,
@@ -106,8 +101,10 @@ func Profile(c *gin.Context) {
 			UserName:    user.(models.User).UserName,
 			AvatarLink:  user.(models.User).AvatarLink,
 			CountryCode: user.(models.User).CountryCode,
-			ScoresSP:    scoresSP,
-			ScoresMP:    scoresMP,
+			Titles:      user.(models.User).Titles,
+			Links:       models.Links{},
+			Rankings:    ProfileRankings{},
+			Records:     ProfileRecords{},
 		},
 	})
 	return
-- 
cgit v1.2.3