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

fix: bad types from sql

Browse source
This commit is contained in:
Iron_Felix 2025-11-25 03:55:23 +03:00
parent 4c7d03cddc
commit 673ce48fac
5 changed files with 91 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/backend/handlers/common.go
View file

@ -17,6 +17,22 @@ func NewServer(db *sqlc.Queries) Server {
return Server{db: db}
}
func sql2StorageType(s *sqlc.StorageTypeT) (*oapi.ImageStorageType, error) {
if s == nil {
return nil, nil
}
var t oapi.ImageStorageType
switch *s {
case sqlc.StorageTypeTLocal:
t = oapi.Local
case sqlc.StorageTypeTS3:
t = oapi.S3
default:
return nil, fmt.Errorf("unexpected storage type: %s", *s)
}
return &t, nil
}
func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.Title, error) {
oapi_title := oapi.Title{
@ -70,7 +86,13 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.
oapi_studio.Poster = &oapi.Image{}
oapi_studio.Poster.Id = title.StudioIllustID
oapi_studio.Poster.ImagePath = title.StudioImagePath
oapi_studio.Poster.StorageType = &title.StudioStorageType
s, err := sql2StorageType(title.StudioStorageType)
if err != nil {
return oapi.Title{}, fmt.Errorf("mapTitle, studio storage type: %v", err)
}
oapi_studio.Poster.StorageType = s
}
}
oapi_title.Studio = &oapi_studio
@ -80,7 +102,11 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.
if title.PosterID != nil {
oapi_image.Id = title.PosterID
oapi_image.ImagePath = title.TitleImagePath
oapi_image.StorageType = &title.TitleStorageType
s, err := sql2StorageType(title.TitleStorageType)
if err != nil {
return oapi.Title{}, fmt.Errorf("mapTitle, title starage type: %v", err)
}
oapi_image.StorageType = s
}
oapi_title.Poster = &oapi_image

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

@ -81,56 +81,56 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro
return oapi_tag_names, nil
}
func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) {
// func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) {
var oapi_image oapi.Image
// var oapi_image oapi.Image
sqlc_image, err := s.db.GetImageByID(ctx, id)
if err != nil {
if err == pgx.ErrNoRows {
return nil, nil //todo: error reference in db
}
return &oapi_image, fmt.Errorf("query GetImageByID: %v", err)
}
// sqlc_image, err := s.db.GetImageByID(ctx, id)
// if err != nil {
// if err == pgx.ErrNoRows {
// return nil, nil //todo: error reference in db
// }
// return &oapi_image, fmt.Errorf("query GetImageByID: %v", err)
// }
//can cast and dont use brain cause all this fields required in image table
oapi_image.Id = &sqlc_image.ID
oapi_image.ImagePath = &sqlc_image.ImagePath
storageTypeStr := string(sqlc_image.StorageType)
oapi_image.StorageType = &storageTypeStr
// //can cast and dont use brain cause all this fields required in image table
// oapi_image.Id = &sqlc_image.ID
// oapi_image.ImagePath = &sqlc_image.ImagePath
// storageTypeStr := string(sqlc_image.StorageType)
// oapi_image.StorageType = string(storageTypeStr)
return &oapi_image, nil
}
// return &oapi_image, nil
// }
func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) {
// func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) {
var oapi_studio oapi.Studio
// var oapi_studio oapi.Studio
sqlc_studio, err := s.db.GetStudioByID(ctx, id)
if err != nil {
if err == pgx.ErrNoRows {
return nil, nil
}
return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err)
}
// sqlc_studio, err := s.db.GetStudioByID(ctx, id)
// if err != nil {
// if err == pgx.ErrNoRows {
// return nil, nil
// }
// return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err)
// }
oapi_studio.Id = sqlc_studio.ID
oapi_studio.Name = sqlc_studio.StudioName
oapi_studio.Description = sqlc_studio.StudioDesc
// oapi_studio.Id = sqlc_studio.ID
// oapi_studio.Name = sqlc_studio.StudioName
// oapi_studio.Description = sqlc_studio.StudioDesc
if sqlc_studio.IllustID == nil {
return &oapi_studio, nil
}
oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID)
if err != nil {
return &oapi_studio, fmt.Errorf("GetImage: %v", err)
}
if oapi_illust != nil {
oapi_studio.Poster = oapi_illust
}
// if sqlc_studio.IllustID == nil {
// return &oapi_studio, nil
// }
// oapi_illust, err := s.GetImage(ctx, *sqlc_studio.IllustID)
// if err != nil {
// return &oapi_studio, fmt.Errorf("GetImage: %v", err)
// }
// if oapi_illust != nil {
// oapi_studio.Poster = oapi_illust
// }
return &oapi_studio, nil
}
// return &oapi_studio, nil
// }
func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitleIdRequestObject) (oapi.GetTitlesTitleIdResponseObject, error) {
var oapi_title oapi.Title
@ -233,6 +233,11 @@ func (s Server) GetTitles(ctx context.Context, request oapi.GetTitlesRequestObje
// StudioImagePath: title.StudioImagePath,
}
// if title.TitleStorageType != nil {
// s := *title.TitleStorageType
// _title.TitleStorageType = string(s)
// }
t, err := s.mapTitle(ctx, _title)
if err != nil {
log.Errorf("%v", err)

8
modules/backend/queries.sql
View file

@ -76,7 +76,7 @@ RETURNING id, avatar_id, nickname, disp_name, user_desc, creation_date, mail;
-- sqlc.struct: TitlesFull
SELECT
t.*,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
@ -85,7 +85,7 @@ SELECT
s.studio_name as studio_name,
s.illust_id as studio_illust_id,
s.studio_desc as studio_desc,
si.storage_type::text as studio_storage_type,
si.storage_type as studio_storage_type,
si.image_path as studio_image_path
FROM titles as t
@ -112,7 +112,7 @@ SELECT
t.season as season,
t.episodes_aired as episodes_aired,
t.episodes_all as episodes_all,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
@ -243,7 +243,7 @@ SELECT
u.rate as user_rate,
u.review_id as review_id,
u.ctime as user_ctime,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),

18
sql/queries.sql.go
View file

@ -114,7 +114,7 @@ const getTitleByID = `-- name: GetTitleByID :one
SELECT
t.id, t.title_names, t.studio_id, t.poster_id, t.title_status, t.rating, t.rating_count, t.release_year, t.release_season, t.season, t.episodes_aired, t.episodes_all, t.episodes_len,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
@ -123,7 +123,7 @@ SELECT
s.studio_name as studio_name,
s.illust_id as studio_illust_id,
s.studio_desc as studio_desc,
si.storage_type::text as studio_storage_type,
si.storage_type as studio_storage_type,
si.image_path as studio_image_path
FROM titles as t
@ -152,13 +152,13 @@ type GetTitleByIDRow struct {
EpisodesAired *int32 `json:"episodes_aired"`
EpisodesAll *int32 `json:"episodes_all"`
EpisodesLen []byte `json:"episodes_len"`
TitleStorageType string `json:"title_storage_type"`
TitleStorageType *StorageTypeT `json:"title_storage_type"`
TitleImagePath *string `json:"title_image_path"`
TagNames json.RawMessage `json:"tag_names"`
StudioName *string `json:"studio_name"`
StudioIllustID *int64 `json:"studio_illust_id"`
StudioDesc *string `json:"studio_desc"`
StudioStorageType string `json:"studio_storage_type"`
StudioStorageType *StorageTypeT `json:"studio_storage_type"`
StudioImagePath *string `json:"studio_image_path"`
}
@ -415,7 +415,7 @@ SELECT
t.season as season,
t.episodes_aired as episodes_aired,
t.episodes_all as episodes_all,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
@ -555,7 +555,7 @@ type SearchTitlesRow struct {
Season *int32 `json:"season"`
EpisodesAired *int32 `json:"episodes_aired"`
EpisodesAll *int32 `json:"episodes_all"`
TitleStorageType string `json:"title_storage_type"`
TitleStorageType *StorageTypeT `json:"title_storage_type"`
TitleImagePath *string `json:"title_image_path"`
TagNames json.RawMessage `json:"tag_names"`
StudioName *string `json:"studio_name"`
@ -628,7 +628,7 @@ SELECT
u.rate as user_rate,
u.review_id as review_id,
u.ctime as user_ctime,
i.storage_type::text as title_storage_type,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
jsonb_agg(g.tag_names) FILTER (WHERE g.tag_names IS NOT NULL),
@ -719,7 +719,7 @@ WHERE
$8::usertitle_status_t[] IS NULL
OR array_length($8::usertitle_status_t[], 1) IS NULL
OR array_length($8::usertitle_status_t[], 1) = 0
OR t.title_status = ANY($8::usertitle_status_t[])
OR u.status = ANY($8::usertitle_status_t[])
)
AND ($9::int IS NULL OR u.rate >= $9::int)
AND ($10::float IS NULL OR t.rating >= $10::float)
@ -785,7 +785,7 @@ type SearchUserTitlesRow struct {
UserRate *int32 `json:"user_rate"`
ReviewID *int64 `json:"review_id"`
UserCtime time.Time `json:"user_ctime"`
TitleStorageType string `json:"title_storage_type"`
TitleStorageType *StorageTypeT `json:"title_storage_type"`
TitleImagePath *string `json:"title_image_path"`
TagNames json.RawMessage `json:"tag_names"`
StudioName *string `json:"studio_name"`

7
sql/sqlc.yaml
View file

@ -14,8 +14,11 @@ sql:
emit_pointers_for_null_types: true
emit_empty_slices: true #slices returned by :many queries will be empty instead of nil
overrides:
- column: "titles.title_storage_type"
go_type: "*string"
- db_type: "storage_type_t"
nullable: true
go_type:
type: "StorageTypeT"
pointer: true
- db_type: "jsonb"
go_type: "encoding/json.RawMessage"
- db_type: "uuid"