Compare commits

..

No commits in common. "148ae646b1d301d8f71b1bf0a2fe4671a84e14b9" and "df45a327e6902348a5d80674757e53e1e1eef6bd" have entirely different histories.

View file

@ -2,12 +2,12 @@ package handlers
import ( import (
"context" "context"
"database/sql"
"encoding/json" "encoding/json"
"fmt" "fmt"
oapi "nyanimedb/api" oapi "nyanimedb/api"
sqlc "nyanimedb/sql" sqlc "nyanimedb/sql"
"github.com/jackc/pgx/v5"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -61,7 +61,7 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro
sqlc_title_tags, err := s.db.GetTitleTags(ctx, id) sqlc_title_tags, err := s.db.GetTitleTags(ctx, id)
if err != nil { if err != nil {
if err == pgx.ErrNoRows { if err == sql.ErrNoRows {
return nil, nil return nil, nil
} }
return nil, fmt.Errorf("query GetTitleTags: %v", err) return nil, fmt.Errorf("query GetTitleTags: %v", err)
@ -82,14 +82,14 @@ func (s Server) GetTagsByTitleId(ctx context.Context, id int64) (oapi.Tags, erro
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) sqlc_image, err := s.db.GetImageByID(ctx, id)
if err != nil { if err != nil {
if err == pgx.ErrNoRows { if err == sql.ErrNoRows {
return nil, nil return nil, nil
} }
return &oapi_image, fmt.Errorf("query GetImageByID: %v", err) return oapi_image, fmt.Errorf("query GetImageByID: %v", err)
} }
//can cast and dont use brain cause all this fields required in image table //can cast and dont use brain cause all this fields required in image table
@ -98,7 +98,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) {
storageTypeStr := string(sqlc_image.StorageType) storageTypeStr := string(sqlc_image.StorageType)
oapi_image.StorageType = &storageTypeStr oapi_image.StorageType = &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) {
@ -107,7 +107,7 @@ func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) {
sqlc_studio, err := s.db.GetStudioByID(ctx, id) sqlc_studio, err := s.db.GetStudioByID(ctx, id)
if err != nil { if err != nil {
if err == pgx.ErrNoRows { if err == sql.ErrNoRows {
return nil, nil return nil, nil
} }
return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err) return &oapi_studio, fmt.Errorf("query GetStudioByID: %v", err)
@ -195,7 +195,7 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI
sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId) sqlc_title, err := s.db.GetTitleByID(ctx, request.TitleId)
if err != nil { if err != nil {
if err == pgx.ErrNoRows { if err == sql.ErrNoRows {
return oapi.GetTitleTitleId204Response{}, nil return oapi.GetTitleTitleId204Response{}, nil
} }
log.Errorf("%v", err) log.Errorf("%v", err)