nemunaire/idfm-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Handle bad status code in schedule response
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
nemunaire 2023-01-16 02:13:11 +01:00
parent 27b5cb5d11
commit 286d1af908
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/schedules.go
View File

@ -3,6 +3,8 @@ package api
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"log"
"net/http" "net/http"
"net/url" "net/url"
"sort" "sort"
@ -34,6 +36,7 @@ type IDFMRealTimeData struct {
type IDFMRealTime struct { type IDFMRealTime struct {
NextDepartures struct { NextDepartures struct {
StatusCode int `json:"statusCode"` StatusCode int `json:"statusCode"`
ErrorMessage string `json:"errorMessage"`
Data []IDFMRealTimeData `json:"data"` Data []IDFMRealTimeData `json:"data"`
} `json:"nextDepartures"` } `json:"nextDepartures"`
CrowdsourcingReports struct { CrowdsourcingReports struct {
@ -114,6 +117,8 @@ func getRealTime(code, station string) (*IDFMRealTime, error) {
defer res.Body.Close() defer res.Body.Close()
if res.StatusCode >= 400 { if res.StatusCode >= 400 {
v, _ := io.ReadAll(res.Body)
log.Println("Schedule not found: ", string(v))
return nil, fmt.Errorf("Schedule not found") return nil, fmt.Errorf("Schedule not found")
} }
@ -124,13 +129,18 @@ func getRealTime(code, station string) (*IDFMRealTime, error) {
return nil, err return nil, err
} }
if schedules.NextDepartures.StatusCode >= 400 {
log.Println("Schedule not found: ", schedules)
return nil, fmt.Errorf("Schedule not found: %s", schedules.NextDepartures.ErrorMessage)
}
return &schedules, nil return &schedules, nil
} }
func declareSchedulesRoutes(router *gin.RouterGroup) { func declareSchedulesRoutes(router *gin.RouterGroup) {
router.GET("/schedules/:type/:code/:station/:way", func(c *gin.Context) { router.GET("/schedules/:type/:code/:station/:way", func(c *gin.Context) {
t := convertLineType(string(c.Param("type"))) t := convertLineType(string(c.Param("type")))
code := string(c.Param("code")) code := convertCode(t, string(c.Param("code")))
station := string(c.Param("station")) station := string(c.Param("station"))
way := string(c.Param("way")) way := string(c.Param("way"))
@ -154,6 +164,7 @@ func declareSchedulesRoutes(router *gin.RouterGroup) {
} }
} }
log.Println("search", code, station)
schedules, err := getRealTime(code, station) schedules, err := getRealTime(code, station)
if err != nil { if err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": err.Error()}) c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": err.Error()})