refactor: new types
This commit is contained in:
parent
e6dc27fd55
commit
4949a3c25f
3 changed files with 21 additions and 12 deletions
|
|
@ -57,21 +57,25 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) {
|
|||
return &t, nil
|
||||
}
|
||||
|
||||
type TileNames *map[string][]string
|
||||
|
||||
// unmarshall jsonb to map[string][]string
|
||||
func jsonb2map4names(b []byte) (*map[string][]string, error) {
|
||||
var t map[string][]string
|
||||
if err := json.Unmarshal(b, &t); err != nil {
|
||||
func jsonb2TitleNames(b []byte) (TileNames, error) {
|
||||
var t TileNames
|
||||
if err := json.Unmarshal(b, t); err != nil {
|
||||
return nil, fmt.Errorf("invalid title_names JSON for title: %w", err)
|
||||
}
|
||||
return &t, nil
|
||||
return t, nil
|
||||
}
|
||||
|
||||
func jsonb2map4len(b []byte) (*map[string]float64, error) {
|
||||
var t map[string]float64
|
||||
if err := json.Unmarshal(b, &t); err != nil {
|
||||
type EpisodeLens *map[string]float64
|
||||
|
||||
func jsonb2EpisodeLens(b []byte) (EpisodeLens, error) {
|
||||
var t EpisodeLens
|
||||
if err := json.Unmarshal(b, t); err != nil {
|
||||
return nil, fmt.Errorf("invalid episodes_len JSON for title: %w", err)
|
||||
}
|
||||
return &t, nil
|
||||
return t, nil
|
||||
}
|
||||
|
||||
func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) {
|
||||
|
|
@ -95,6 +99,8 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject
|
|||
Rating: request.Params.Rating,
|
||||
ReleaseYear: request.Params.ReleaseYear,
|
||||
ReleaseSeason: season,
|
||||
Offset: request.Params.Offset,
|
||||
Limit: request.Params.Limit,
|
||||
})
|
||||
if err != nil {
|
||||
return oapi.GetTitle500Response{}, nil
|
||||
|
|
@ -104,12 +110,12 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject
|
|||
}
|
||||
|
||||
for _, title := range titles {
|
||||
title_names, err := jsonb2map4names(title.TitleNames)
|
||||
title_names, err := jsonb2TitleNames(title.TitleNames)
|
||||
if err != nil {
|
||||
log.Errorf("%v", err)
|
||||
return oapi.GetTitle500Response{}, err
|
||||
}
|
||||
episodes_lens, err := jsonb2map4len(title.EpisodesLen)
|
||||
episodes_lens, err := jsonb2EpisodeLens(title.EpisodesLen)
|
||||
if err != nil {
|
||||
log.Errorf("%v", err)
|
||||
return oapi.GetTitle500Response{}, err
|
||||
|
|
@ -122,6 +128,7 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject
|
|||
ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason),
|
||||
ReleaseYear: title.ReleaseYear,
|
||||
StudioId: &title.StudioID,
|
||||
// StudioName: ,
|
||||
TitleNames: title_names,
|
||||
TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus),
|
||||
EpisodesAired: title.EpisodesAired,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue