diff options
Diffstat (limited to 'pkg/adapters/json')
| -rw-r--r-- | pkg/adapters/json/json.go | 4 | ||||
| -rw-r--r-- | pkg/adapters/json/model.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkg/adapters/json/json.go b/pkg/adapters/json/json.go index c0ea4e4..47a563e 100644 --- a/pkg/adapters/json/json.go +++ b/pkg/adapters/json/json.go @@ -100,7 +100,7 @@ type JsonCard struct { func (r *JsonRoot) DumpToDb(ctx context.Context, s *store.Store) { var err error for _, user := range r.ForumProfiles { - dbUser := user.ToUser() + dbUser, _ := user.ToUser() dbUser, err = s.CreateOrGetUser(ctx, dbUser) if err != nil { panic(err) @@ -120,7 +120,7 @@ func (r *JsonRoot) DumpToDb(ctx context.Context, s *store.Store) { } for _, flight := range user.RegisteredFlights { - dbFlight := flight.ToFlight() + dbFlight, _ := flight.ToFlight() _, err = s.AddFlightToUser(ctx, dbUser.ID, dbFlight) if err != nil { fmt.Println(err) diff --git a/pkg/adapters/json/model.go b/pkg/adapters/json/model.go index 2a91f21..2cc5d8e 100644 --- a/pkg/adapters/json/model.go +++ b/pkg/adapters/json/model.go @@ -32,7 +32,7 @@ func onlyDigits(s string) string { return string(out) } -func (jp JsonProfile) ToUser() *model.User { +func (jp JsonProfile) ToUser() (*model.User, error) { return &model.User{ Name: sOrEmpty(jp.RealName.FirstName), Surname: sOrEmpty(jp.RealName.LastName), @@ -40,10 +40,10 @@ func (jp JsonProfile) ToUser() *model.User { Fathersname: "", Sex: jp.Sex, Birthday: model.SentinelBirthday(), - } + }, nil } -func (jf JsonFlight) ToFlight() *model.Flight { +func (jf JsonFlight) ToFlight() (*model.Flight, error) { return &model.Flight{ Number: jf.Flight, From: jf.Departure.Airport, @@ -53,7 +53,7 @@ func (jf JsonFlight) ToFlight() *model.Flight { ToCity: jf.Arrival.City, ToCountry: jf.Arrival.Country, Date: jf.Date.ToDateUTC(), - } + }, nil } func (jc JsonCard) ToCard() (*model.Card, error) { |