diff options
| author | Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> | 2023-09-28 18:49:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 18:49:17 +0300 |
| commit | 4ba6cecbb20a5af1e598a2d67f3d2476a2b1f5e1 (patch) | |
| tree | 4f88bd2105b54259c452e88cdef052c9d924b1bc | |
| parent | fix: actually get log message in modlogs (#110) (diff) | |
| download | lphub-4ba6cecbb20a5af1e598a2d67f3d2476a2b1f5e1.tar.gz lphub-4ba6cecbb20a5af1e598a2d67f3d2476a2b1f5e1.tar.bz2 lphub-4ba6cecbb20a5af1e598a2d67f3d2476a2b1f5e1.zip | |
feat: add is_deleted data to map summary (#109)
Former-commit-id: de8434e14fc35df28e2cc5ed0c4f31bfa741c7d6
| -rw-r--r-- | backend/handlers/map.go | 4 | ||||
| -rw-r--r-- | backend/models/models.go | 1 | ||||
| -rw-r--r-- | docs/docs.go | 8 | ||||
| -rw-r--r-- | docs/swagger.json | 8 | ||||
| -rw-r--r-- | 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) { | |||
| 71 | } | 71 | } |
| 72 | // Get map data | 72 | // Get map data |
| 73 | response.Map.ID = intID | 73 | response.Map.ID = intID |
| 74 | sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop | 74 | sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop, m.is_disabled |
| 75 | FROM maps m | 75 | FROM maps m |
| 76 | INNER JOIN games g ON m.game_id = g.id | 76 | INNER JOIN games g ON m.game_id = g.id |
| 77 | INNER JOIN chapters c ON m.chapter_id = c.id | 77 | INNER JOIN chapters c ON m.chapter_id = c.id |
| 78 | WHERE m.id = $1` | 78 | WHERE m.id = $1` |
| 79 | 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) | 79 | 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) |
| 80 | if err != nil { | 80 | if err != nil { |
| 81 | c.JSON(http.StatusOK, models.ErrorResponse(err.Error())) | 81 | c.JSON(http.StatusOK, models.ErrorResponse(err.Error())) |
| 82 | return | 82 | 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 { | |||
| 46 | MapName string `json:"map_name"` | 46 | MapName string `json:"map_name"` |
| 47 | Image string `json:"image"` | 47 | Image string `json:"image"` |
| 48 | IsCoop bool `json:"is_coop"` | 48 | IsCoop bool `json:"is_coop"` |
| 49 | IsDisabled bool `json:"is_disabled"` | ||
| 49 | } | 50 | } |
| 50 | 51 | ||
| 51 | type MapShort struct { | 52 | 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 = `{ | |||
| 1307 | "category_id", | 1307 | "category_id", |
| 1308 | "description", | 1308 | "description", |
| 1309 | "record_date", | 1309 | "record_date", |
| 1310 | "score_count", | ||
| 1311 | "user_name" | 1310 | "user_name" |
| 1312 | ], | 1311 | ], |
| 1313 | "properties": { | 1312 | "properties": { |
| @@ -1374,7 +1373,6 @@ const docTemplate = `{ | |||
| 1374 | "description", | 1373 | "description", |
| 1375 | "record_date", | 1374 | "record_date", |
| 1376 | "route_id", | 1375 | "route_id", |
| 1377 | "score_count", | ||
| 1378 | "user_name" | 1376 | "user_name" |
| 1379 | ], | 1377 | ], |
| 1380 | "properties": { | 1378 | "properties": { |
| @@ -1426,6 +1424,9 @@ const docTemplate = `{ | |||
| 1426 | "detail": { | 1424 | "detail": { |
| 1427 | "type": "string" | 1425 | "type": "string" |
| 1428 | }, | 1426 | }, |
| 1427 | "message": { | ||
| 1428 | "type": "string" | ||
| 1429 | }, | ||
| 1429 | "user": { | 1430 | "user": { |
| 1430 | "$ref": "#/definitions/models.UserShort" | 1431 | "$ref": "#/definitions/models.UserShort" |
| 1431 | } | 1432 | } |
| @@ -1829,6 +1830,9 @@ const docTemplate = `{ | |||
| 1829 | "is_coop": { | 1830 | "is_coop": { |
| 1830 | "type": "boolean" | 1831 | "type": "boolean" |
| 1831 | }, | 1832 | }, |
| 1833 | "is_disabled": { | ||
| 1834 | "type": "boolean" | ||
| 1835 | }, | ||
| 1832 | "map_name": { | 1836 | "map_name": { |
| 1833 | "type": "string" | 1837 | "type": "string" |
| 1834 | } | 1838 | } |
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 @@ | |||
| 1300 | "category_id", | 1300 | "category_id", |
| 1301 | "description", | 1301 | "description", |
| 1302 | "record_date", | 1302 | "record_date", |
| 1303 | "score_count", | ||
| 1304 | "user_name" | 1303 | "user_name" |
| 1305 | ], | 1304 | ], |
| 1306 | "properties": { | 1305 | "properties": { |
| @@ -1367,7 +1366,6 @@ | |||
| 1367 | "description", | 1366 | "description", |
| 1368 | "record_date", | 1367 | "record_date", |
| 1369 | "route_id", | 1368 | "route_id", |
| 1370 | "score_count", | ||
| 1371 | "user_name" | 1369 | "user_name" |
| 1372 | ], | 1370 | ], |
| 1373 | "properties": { | 1371 | "properties": { |
| @@ -1419,6 +1417,9 @@ | |||
| 1419 | "detail": { | 1417 | "detail": { |
| 1420 | "type": "string" | 1418 | "type": "string" |
| 1421 | }, | 1419 | }, |
| 1420 | "message": { | ||
| 1421 | "type": "string" | ||
| 1422 | }, | ||
| 1422 | "user": { | 1423 | "user": { |
| 1423 | "$ref": "#/definitions/models.UserShort" | 1424 | "$ref": "#/definitions/models.UserShort" |
| 1424 | } | 1425 | } |
| @@ -1822,6 +1823,9 @@ | |||
| 1822 | "is_coop": { | 1823 | "is_coop": { |
| 1823 | "type": "boolean" | 1824 | "type": "boolean" |
| 1824 | }, | 1825 | }, |
| 1826 | "is_disabled": { | ||
| 1827 | "type": "boolean" | ||
| 1828 | }, | ||
| 1825 | "map_name": { | 1829 | "map_name": { |
| 1826 | "type": "string" | 1830 | "type": "string" |
| 1827 | } | 1831 | } |
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: | |||
| 46 | - category_id | 46 | - category_id |
| 47 | - description | 47 | - description |
| 48 | - record_date | 48 | - record_date |
| 49 | - score_count | ||
| 50 | - user_name | 49 | - user_name |
| 51 | type: object | 50 | type: object |
| 52 | handlers.DeleteMapSummaryRequest: | 51 | handlers.DeleteMapSummaryRequest: |
| @@ -91,7 +90,6 @@ definitions: | |||
| 91 | - description | 90 | - description |
| 92 | - record_date | 91 | - record_date |
| 93 | - route_id | 92 | - route_id |
| 94 | - score_count | ||
| 95 | - user_name | 93 | - user_name |
| 96 | type: object | 94 | type: object |
| 97 | handlers.LoginResponse: | 95 | handlers.LoginResponse: |
| @@ -112,6 +110,8 @@ definitions: | |||
| 112 | type: string | 110 | type: string |
| 113 | detail: | 111 | detail: |
| 114 | type: string | 112 | type: string |
| 113 | message: | ||
| 114 | type: string | ||
| 115 | user: | 115 | user: |
| 116 | $ref: '#/definitions/models.UserShort' | 116 | $ref: '#/definitions/models.UserShort' |
| 117 | type: object | 117 | type: object |
| @@ -374,6 +374,8 @@ definitions: | |||
| 374 | type: string | 374 | type: string |
| 375 | is_coop: | 375 | is_coop: |
| 376 | type: boolean | 376 | type: boolean |
| 377 | is_disabled: | ||
| 378 | type: boolean | ||
| 377 | map_name: | 379 | map_name: |
| 378 | type: string | 380 | type: string |
| 379 | type: object | 381 | type: object |