diff options
| -rw-r--r-- | backend/controllers/mapController.go | 11 | ||||
| -rw-r--r-- | backend/models/models.go | 1 | ||||
| -rw-r--r-- | docs/docs.go | 3 | ||||
| -rw-r--r-- | docs/swagger.json | 3 | ||||
| -rw-r--r-- | 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) { | |||
| 26 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 26 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 27 | return | 27 | return |
| 28 | } | 28 | } |
| 29 | // ( | ||
| 30 | // SELECT COALESCE(avg(rating), 0.0) | ||
| 31 | // FROM route_ratings | ||
| 32 | // WHERE map_id = $1 | ||
| 33 | // ) | ||
| 34 | // Get map data | 29 | // Get map data |
| 35 | response.Map.ID = intID | 30 | response.Map.ID = intID |
| 36 | sql := `SELECT m.id, g.name, c.name, m.name | 31 | sql := `SELECT m.id, g.name, c.name, m.name |
| @@ -44,11 +39,11 @@ func FetchMapSummary(c *gin.Context) { | |||
| 44 | return | 39 | return |
| 45 | } | 40 | } |
| 46 | // Get map routes and histories | 41 | // Get map routes and histories |
| 47 | 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 | 42 | 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 |
| 48 | INNER JOIN categories c ON r.category_id = c.id | 43 | INNER JOIN categories c ON r.category_id = c.id |
| 49 | INNER JOIN map_history h ON r.map_id = h.map_id AND r.category_id = h.category_id | 44 | INNER JOIN map_history h ON r.map_id = h.map_id AND r.category_id = h.category_id |
| 50 | LEFT JOIN map_ratings rt ON r.map_id = rt.map_id AND r.category_id = rt.category_id | 45 | LEFT JOIN map_ratings rt ON r.map_id = rt.map_id AND r.category_id = rt.category_id |
| 51 | 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 | 46 | 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 |
| 52 | ORDER BY h.record_date ASC;` | 47 | ORDER BY h.record_date ASC;` |
| 53 | rows, err := database.DB.Query(sql, id) | 48 | rows, err := database.DB.Query(sql, id) |
| 54 | if err != nil { | 49 | if err != nil { |
| @@ -57,7 +52,7 @@ func FetchMapSummary(c *gin.Context) { | |||
| 57 | } | 52 | } |
| 58 | for rows.Next() { | 53 | for rows.Next() { |
| 59 | route := models.MapRoute{Category: models.Category{}, History: models.MapHistory{}} | 54 | route := models.MapRoute{Category: models.Category{}, History: models.MapHistory{}} |
| 60 | 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) | 55 | err = rows.Scan(&route.Category.ID, &route.Category.Name, &route.History.RunnerName, &route.History.ScoreCount, &route.History.Date, &route.Description, &route.Showcase, &route.Rating) |
| 61 | if err != nil { | 56 | if err != nil { |
| 62 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 57 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 63 | return | 58 | 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 { | |||
| 44 | Category Category `json:"category"` | 44 | Category Category `json:"category"` |
| 45 | History MapHistory `json:"history"` | 45 | History MapHistory `json:"history"` |
| 46 | Rating float32 `json:"rating"` | 46 | Rating float32 `json:"rating"` |
| 47 | ScoreCount int `json:"score_count"` | ||
| 48 | Description string `json:"description"` | 47 | Description string `json:"description"` |
| 49 | Showcase string `json:"showcase"` | 48 | Showcase string `json:"showcase"` |
| 50 | } | 49 | } |
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 = `{ | |||
| 914 | "rating": { | 914 | "rating": { |
| 915 | "type": "number" | 915 | "type": "number" |
| 916 | }, | 916 | }, |
| 917 | "score_count": { | ||
| 918 | "type": "integer" | ||
| 919 | }, | ||
| 920 | "showcase": { | 917 | "showcase": { |
| 921 | "type": "string" | 918 | "type": "string" |
| 922 | } | 919 | } |
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 @@ | |||
| 907 | "rating": { | 907 | "rating": { |
| 908 | "type": "number" | 908 | "type": "number" |
| 909 | }, | 909 | }, |
| 910 | "score_count": { | ||
| 911 | "type": "integer" | ||
| 912 | }, | ||
| 913 | "showcase": { | 910 | "showcase": { |
| 914 | "type": "string" | 911 | "type": "string" |
| 915 | } | 912 | } |
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: | |||
| 78 | $ref: '#/definitions/models.MapHistory' | 78 | $ref: '#/definitions/models.MapHistory' |
| 79 | rating: | 79 | rating: |
| 80 | type: number | 80 | type: number |
| 81 | score_count: | ||
| 82 | type: integer | ||
| 83 | showcase: | 81 | showcase: |
| 84 | type: string | 82 | type: string |
| 85 | type: object | 83 | type: object |