From 9af2c7d17f02be98998d388b421b3d055a96f83e Mon Sep 17 00:00:00 2001
From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com>
Date: Tue, 20 Jun 2023 20:57:10 +0300
Subject: fix: remove duplicate score count in routes (#46)

---
 backend/controllers/mapController.go | 11 +++--------
 backend/models/models.go             |  1 -
 docs/docs.go                         |  3 ---
 docs/swagger.json                    |  3 ---
 docs/swagger.yaml                    |  2 --
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/backend/controllers/mapController.go b/backend/controllers/mapController.go
index e46b766..b5984dc 100644
--- a/backend/controllers/mapController.go
+++ b/backend/controllers/mapController.go
@@ -26,11 +26,6 @@ func FetchMapSummary(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
 		return
 	}
-	// (
-	// 	SELECT COALESCE(avg(rating), 0.0)
-	// 	FROM route_ratings
-	// 	WHERE map_id = $1
-	// )
 	// Get map data
 	response.Map.ID = intID
 	sql := `SELECT m.id, g.name, c.name, m.name
@@ -44,11 +39,11 @@ func FetchMapSummary(c *gin.Context) {
 		return
 	}
 	// Get map routes and histories
-	sql = `SELECT c.id, c.name, h.user_name, h.score_count, h.record_date, r.score_count, r.description, r.showcase, COALESCE(avg(rating), 0.0) FROM map_routes r
+	sql = `SELECT c.id, c.name, h.user_name, h.score_count, h.record_date, r.description, r.showcase, COALESCE(avg(rating), 0.0) FROM map_routes r
     INNER JOIN categories c ON r.category_id = c.id
     INNER JOIN map_history h ON r.map_id = h.map_id AND r.category_id = h.category_id
     LEFT JOIN map_ratings rt ON r.map_id = rt.map_id AND r.category_id = rt.category_id 
-	WHERE r.map_id = $1 AND h.score_count = r.score_count GROUP BY c.id, h.user_name, h.score_count, h.record_date, r.score_count, r.description, r.showcase
+	WHERE r.map_id = $1 AND h.score_count = r.score_count GROUP BY c.id, h.user_name, h.score_count, h.record_date, r.description, r.showcase
 	ORDER BY h.record_date ASC;`
 	rows, err := database.DB.Query(sql, id)
 	if err != nil {
@@ -57,7 +52,7 @@ func FetchMapSummary(c *gin.Context) {
 	}
 	for rows.Next() {
 		route := models.MapRoute{Category: models.Category{}, History: models.MapHistory{}}
-		err = rows.Scan(&route.Category.ID, &route.Category.Name, &route.History.RunnerName, &route.History.ScoreCount, &route.History.Date, &route.ScoreCount, &route.Description, &route.Showcase, &route.Rating)
+		err = rows.Scan(&route.Category.ID, &route.Category.Name, &route.History.RunnerName, &route.History.ScoreCount, &route.History.Date, &route.Description, &route.Showcase, &route.Rating)
 		if err != nil {
 			c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
 			return
diff --git a/backend/models/models.go b/backend/models/models.go
index 783c339..0727468 100644
--- a/backend/models/models.go
+++ b/backend/models/models.go
@@ -44,7 +44,6 @@ type MapRoute struct {
 	Category    Category   `json:"category"`
 	History     MapHistory `json:"history"`
 	Rating      float32    `json:"rating"`
-	ScoreCount  int        `json:"score_count"`
 	Description string     `json:"description"`
 	Showcase    string     `json:"showcase"`
 }
diff --git a/docs/docs.go b/docs/docs.go
index b7dc7ab..a0aad6f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -914,9 +914,6 @@ const docTemplate = `{
                 "rating": {
                     "type": "number"
                 },
-                "score_count": {
-                    "type": "integer"
-                },
                 "showcase": {
                     "type": "string"
                 }
diff --git a/docs/swagger.json b/docs/swagger.json
index ffcf55a..2279ff6 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -907,9 +907,6 @@
                 "rating": {
                     "type": "number"
                 },
-                "score_count": {
-                    "type": "integer"
-                },
                 "showcase": {
                     "type": "string"
                 }
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3dfe421..ba4775a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -78,8 +78,6 @@ definitions:
         $ref: '#/definitions/models.MapHistory'
       rating:
         type: number
-      score_count:
-        type: integer
       showcase:
         type: string
     type: object
-- 
cgit v1.2.3