From 4ba6cecbb20a5af1e598a2d67f3d2476a2b1f5e1 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:49:17 +0300 Subject: feat: add is_deleted data to map summary (#109) Former-commit-id: de8434e14fc35df28e2cc5ed0c4f31bfa741c7d6 --- backend/handlers/map.go | 4 ++-- backend/models/models.go | 1 + docs/docs.go | 8 ++++++-- docs/swagger.json | 8 ++++++-- docs/swagger.yaml | 6 ++++-- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/backend/handlers/map.go b/backend/handlers/map.go index c0776d1..954d720 100644 --- a/backend/handlers/map.go +++ b/backend/handlers/map.go @@ -71,12 +71,12 @@ func FetchMapSummary(c *gin.Context) { } // Get map data response.Map.ID = intID - sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop + sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop, m.is_disabled FROM maps m INNER JOIN games g ON m.game_id = g.id INNER JOIN chapters c ON m.chapter_id = c.id WHERE m.id = $1` - err = database.DB.QueryRow(sql, id).Scan(&response.Map.ID, &response.Map.GameName, &response.Map.ChapterName, &response.Map.MapName, &response.Map.Image, &response.Map.IsCoop) + err = database.DB.QueryRow(sql, id).Scan(&response.Map.ID, &response.Map.GameName, &response.Map.ChapterName, &response.Map.MapName, &response.Map.Image, &response.Map.IsCoop, &response.Map.IsDisabled) if err != nil { c.JSON(http.StatusOK, models.ErrorResponse(err.Error())) return diff --git a/backend/models/models.go b/backend/models/models.go index 8e16c1c..fa26be3 100644 --- a/backend/models/models.go +++ b/backend/models/models.go @@ -46,6 +46,7 @@ type Map struct { MapName string `json:"map_name"` Image string `json:"image"` IsCoop bool `json:"is_coop"` + IsDisabled bool `json:"is_disabled"` } type MapShort struct { diff --git a/docs/docs.go b/docs/docs.go index 8dba198..83d3a5c 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1307,7 +1307,6 @@ const docTemplate = `{ "category_id", "description", "record_date", - "score_count", "user_name" ], "properties": { @@ -1374,7 +1373,6 @@ const docTemplate = `{ "description", "record_date", "route_id", - "score_count", "user_name" ], "properties": { @@ -1426,6 +1424,9 @@ const docTemplate = `{ "detail": { "type": "string" }, + "message": { + "type": "string" + }, "user": { "$ref": "#/definitions/models.UserShort" } @@ -1829,6 +1830,9 @@ const docTemplate = `{ "is_coop": { "type": "boolean" }, + "is_disabled": { + "type": "boolean" + }, "map_name": { "type": "string" } diff --git a/docs/swagger.json b/docs/swagger.json index 3697ab0..48e337f 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1300,7 +1300,6 @@ "category_id", "description", "record_date", - "score_count", "user_name" ], "properties": { @@ -1367,7 +1366,6 @@ "description", "record_date", "route_id", - "score_count", "user_name" ], "properties": { @@ -1419,6 +1417,9 @@ "detail": { "type": "string" }, + "message": { + "type": "string" + }, "user": { "$ref": "#/definitions/models.UserShort" } @@ -1822,6 +1823,9 @@ "is_coop": { "type": "boolean" }, + "is_disabled": { + "type": "boolean" + }, "map_name": { "type": "string" } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 0ed6ef4..b34a80c 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -46,7 +46,6 @@ definitions: - category_id - description - record_date - - score_count - user_name type: object handlers.DeleteMapSummaryRequest: @@ -91,7 +90,6 @@ definitions: - description - record_date - route_id - - score_count - user_name type: object handlers.LoginResponse: @@ -112,6 +110,8 @@ definitions: type: string detail: type: string + message: + type: string user: $ref: '#/definitions/models.UserShort' type: object @@ -374,6 +374,8 @@ definitions: type: string is_coop: type: boolean + is_disabled: + type: boolean map_name: type: string type: object -- cgit v1.2.3