nihonium/nyanimedb
1
0
Fork 1
Code Issues 11 Pull requests Releases Packages 3 Activity Actions

refactor: new types

Browse source
This commit is contained in:
Iron_Felix 2025-11-15 23:00:40 +03:00
parent e6dc27fd55
commit 4949a3c25f
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/api.gen.go
View file

@ -94,8 +94,8 @@ type GetTitleParams struct {
Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"` Rating *float64 `form:"rating,omitempty" json:"rating,omitempty"`
ReleaseYear *int32 `form:"release_year,omitempty" json:"release_year,omitempty"` ReleaseYear *int32 `form:"release_year,omitempty" json:"release_year,omitempty"`
ReleaseSeason *ReleaseSeason `form:"release_season,omitempty" json:"release_season,omitempty"` ReleaseSeason *ReleaseSeason `form:"release_season,omitempty" json:"release_season,omitempty"`
Limit *int `form:"limit,omitempty" json:"limit,omitempty"` Limit *int32 `form:"limit,omitempty" json:"limit,omitempty"`
Offset *int `form:"offset,omitempty" json:"offset,omitempty"` Offset *int32 `form:"offset,omitempty" json:"offset,omitempty"`
Fields *string `form:"fields,omitempty" json:"fields,omitempty"` Fields *string `form:"fields,omitempty" json:"fields,omitempty"`
} }

2
api/openapi.yaml
View file

@ -35,11 +35,13 @@ paths:
name: limit name: limit
schema: schema:
type: integer type: integer
format: int32
default: 10 default: 10
- in: query - in: query
name: offset name: offset
schema: schema:
type: integer type: integer
format: int32
default: 0 default: 0
- in: query - in: query
name: fields name: fields

27
modules/backend/handlers/titles.go
View file

@ -57,21 +57,25 @@ func ReleaseSeason2sqlc(s *oapi.ReleaseSeason) (*sqlc.ReleaseSeasonT, error) {
return &t, nil return &t, nil
} }
type TileNames *map[string][]string
// unmarshall jsonb to map[string][]string // unmarshall jsonb to map[string][]string
func jsonb2map4names(b []byte) (*map[string][]string, error) { func jsonb2TitleNames(b []byte) (TileNames, error) {
var t map[string][]string var t TileNames
if err := json.Unmarshal(b, &t); err != nil { if err := json.Unmarshal(b, t); err != nil {
return nil, fmt.Errorf("invalid title_names JSON for title: %w", err) 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) { type EpisodeLens *map[string]float64
var t map[string]float64
if err := json.Unmarshal(b, &t); err != nil { 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 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) { 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, Rating: request.Params.Rating,
ReleaseYear: request.Params.ReleaseYear, ReleaseYear: request.Params.ReleaseYear,
ReleaseSeason: season, ReleaseSeason: season,
Offset: request.Params.Offset,
Limit: request.Params.Limit,
}) })
if err != nil { if err != nil {
return oapi.GetTitle500Response{}, nil return oapi.GetTitle500Response{}, nil
@ -104,12 +110,12 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject
} }
for _, title := range titles { for _, title := range titles {
title_names, err := jsonb2map4names(title.TitleNames) title_names, err := jsonb2TitleNames(title.TitleNames)
if err != nil { if err != nil {
log.Errorf("%v", err) log.Errorf("%v", err)
return oapi.GetTitle500Response{}, err return oapi.GetTitle500Response{}, err
} }
episodes_lens, err := jsonb2map4len(title.EpisodesLen) episodes_lens, err := jsonb2EpisodeLens(title.EpisodesLen)
if err != nil { if err != nil {
log.Errorf("%v", err) log.Errorf("%v", err)
return oapi.GetTitle500Response{}, err return oapi.GetTitle500Response{}, err
@ -122,6 +128,7 @@ func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject
ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason), ReleaseSeason: (*oapi.ReleaseSeason)(title.ReleaseSeason),
ReleaseYear: title.ReleaseYear, ReleaseYear: title.ReleaseYear,
StudioId: &title.StudioID, StudioId: &title.StudioID,
// StudioName: ,
TitleNames: title_names, TitleNames: title_names,
TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus), TitleStatus: (*oapi.TitleStatus)(&title.TitleStatus),
EpisodesAired: title.EpisodesAired, EpisodesAired: title.EpisodesAired,