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

feat: query for usertitles written

Browse source
This commit is contained in:
Iron_Felix 2025-11-22 07:53:50 +03:00
parent ba68b5ee04
commit 32566fe7a2
8 changed files with 497 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/_build/openapi.yaml
View file

@ -158,7 +158,12 @@ paths:
- in: query - in: query
name: status name: status
schema: schema:
$ref: '#/components/schemas/TitleStatus' type: array
items:
$ref: '#/components/schemas/TitleStatus'
description: List of title statuses to filter
style: form
explode: false
- in: query - in: query
name: watch_status name: watch_status
schema: schema:

10
api/api.gen.go
View file

@ -183,9 +183,11 @@ type GetUsersUserIdParams struct {
// GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles. // GetUsersUserIdTitlesParams defines parameters for GetUsersUserIdTitles.
type GetUsersUserIdTitlesParams struct { type GetUsersUserIdTitlesParams struct {
Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"` Cursor *Cursor `form:"cursor,omitempty" json:"cursor,omitempty"`
Word *string `form:"word,omitempty" json:"word,omitempty"` Word *string `form:"word,omitempty" json:"word,omitempty"`
Status *TitleStatus `form:"status,omitempty" json:"status,omitempty"`
// Status List of title statuses to filter
Status *[]TitleStatus `form:"status,omitempty" json:"status,omitempty"`
WatchStatus *UserTitleStatus `form:"watch_status,omitempty" json:"watch_status,omitempty"` WatchStatus *UserTitleStatus `form:"watch_status,omitempty" json:"watch_status,omitempty"`
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"`
@ -811,7 +813,7 @@ func (siw *ServerInterfaceWrapper) GetUsersUserIdTitles(c *gin.Context) {
// ------------- Optional query parameter "status" ------------- // ------------- Optional query parameter "status" -------------
err = runtime.BindQueryParameter("form", true, false, "status", c.Request.URL.Query(), &params.Status) err = runtime.BindQueryParameter("form", false, false, "status", c.Request.URL.Query(), &params.Status)
if err != nil { if err != nil {
siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter status: %w", err), http.StatusBadRequest) siw.ErrorHandler(c, fmt.Errorf("Invalid format for parameter status: %w", err), http.StatusBadRequest)
return return

7
api/paths/users-id-titles.yaml
View file

@ -14,7 +14,12 @@ get:
- in: query - in: query
name: status name: status
schema: schema:
$ref: '../schemas/enums/TitleStatus.yaml' type: array
items:
$ref: '../schemas/enums/TitleStatus.yaml'
description: List of title statuses to filter
style: form
explode: false
- in: query - in: query
name: watch_status name: watch_status
schema: schema:

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

@ -1,6 +1,10 @@
package handlers package handlers
import ( import (
"context"
"encoding/json"
"fmt"
oapi "nyanimedb/api"
sqlc "nyanimedb/sql" sqlc "nyanimedb/sql"
"strconv" "strconv"
) )
@ -13,70 +17,75 @@ func NewServer(db *sqlc.Queries) Server {
return Server{db: db} return Server{db: db}
} }
// type Cursor interface { func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.Title, error) {
// ParseCursor(sortBy oapi.TitleSort, data oapi.Cursor) (Cursor, error)
// Values() map[string]interface{} title_names := make(map[string][]string, 0)
// // for logs only err := json.Unmarshal(title.TitleNames, &title_names)
// Type() string if err != nil {
// } return oapi.Title{}, fmt.Errorf("unmarshal TitleNames: %v", err)
}
// type CursorByID struct { episodes_lens := make(map[string]float64, 0)
// ID int64 err = json.Unmarshal(title.EpisodesLen, &episodes_lens)
// } if err != nil {
return oapi.Title{}, fmt.Errorf("unmarshal EpisodesLen: %v", err)
}
// func (c CursorByID) ParseCursor(sortBy oapi.TitleSort, data oapi.Cursor) (Cursor, error) { oapi_tag_names := make(oapi.Tags, 0)
// var cur CursorByID err = json.Unmarshal(title.TagNames, &oapi_tag_names)
// if err := json.Unmarshal(data, &cur); err != nil { if err != nil {
// return nil, fmt.Errorf("invalid cursor (id): %w", err) return oapi.Title{}, fmt.Errorf("unmarshalling title_tag: %v", err)
// } }
// if cur.ID == 0 {
// return nil, errors.New("cursor id must be non-zero")
// }
// return cur, nil
// }
// func (c CursorByID) Values() map[string]interface{} { var oapi_studio oapi.Studio
// return map[string]interface{}{
// "cursor_id": c.ID,
// "cursor_year": nil,
// "cursor_rating": nil,
// }
// }
// func (c CursorByID) Type() string { return "id" } oapi_studio.Id = title.StudioID
if title.StudioName != nil {
oapi_studio.Name = *title.StudioName
}
oapi_studio.Description = title.StudioDesc
if title.StudioIllustID != nil {
oapi_studio.Poster.Id = title.StudioIllustID
oapi_studio.Poster.ImagePath = title.StudioImagePath
oapi_studio.Poster.StorageType = &title.StudioStorageType
}
// func NewCursor(sortBy string) (Cursor, error) { var oapi_image oapi.Image
// switch Type(sortBy) {
// case TypeID:
// return CursorByID{}, nil
// case TypeYear:
// return CursorByYear{}, nil
// case TypeRating:
// return CursorByRating{}, nil
// default:
// return nil, fmt.Errorf("unsupported sort_by: %q", sortBy)
// }
// }
// decodes a base64-encoded JSON string into a CursorObj if title.PosterID != nil {
// Returns the parsed CursorObj and an error oapi_image.Id = title.PosterID
// func parseCursor(encoded oapi.Cursor) (*oapi.CursorObj, error) { oapi_image.ImagePath = title.TitleImagePath
oapi_image.StorageType = &title.TitleStorageType
}
// // Decode base64 var release_season oapi.ReleaseSeason
// decoded, err := base64.StdEncoding.DecodeString(encoded) if title.ReleaseSeason != nil {
// if err != nil { release_season = oapi.ReleaseSeason(*title.ReleaseSeason)
// return nil, fmt.Errorf("parseCursor: %v", err) }
// }
// // Parse JSON oapi_status, err := TitleStatus2oapi(&title.TitleStatus)
// var cursor oapi.CursorObj if err != nil {
// if err := json.Unmarshal(decoded, &cursor); err != nil { return oapi.Title{}, fmt.Errorf("TitleStatus2oapi: %v", err)
// return nil, fmt.Errorf("parseCursor: %v", err) }
// } oapi_title := oapi.Title{
EpisodesAired: title.EpisodesAired,
EpisodesAll: title.EpisodesAired,
EpisodesLen: &episodes_lens,
Id: title.ID,
Poster: &oapi_image,
Rating: title.Rating,
RatingCount: title.RatingCount,
ReleaseSeason: &release_season,
ReleaseYear: title.ReleaseYear,
Studio: &oapi_studio,
Tags: oapi_tag_names,
TitleNames: title_names,
TitleStatus: oapi_status,
// AdditionalProperties:
}
// return &cursor, nil return oapi_title, nil
// } }
func parseInt64(s string) (int32, error) { func parseInt64(s string) (int32, error) {
i, err := strconv.ParseInt(s, 10, 64) i, err := strconv.ParseInt(s, 10, 64)

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

@ -158,78 +158,6 @@ func (s Server) GetStudio(ctx context.Context, id int64) (*oapi.Studio, error) {
return &oapi_studio, nil return &oapi_studio, nil
} }
func (s Server) mapTitle(ctx context.Context, title sqlc.SearchTitlesRow) (oapi.Title, error) {
// var oapi_title oapi.Title
title_names := make(map[string][]string, 0)
err := json.Unmarshal(title.TitleNames, &title_names)
if err != nil {
return oapi.Title{}, fmt.Errorf("unmarshal TitleNames: %v", err)
}
episodes_lens := make(map[string]float64, 0)
err = json.Unmarshal(title.EpisodesLen, &episodes_lens)
if err != nil {
return oapi.Title{}, fmt.Errorf("unmarshal EpisodesLen: %v", err)
}
oapi_tag_names := make(oapi.Tags, 0)
err = json.Unmarshal(title.TagNames, &oapi_tag_names)
if err != nil {
return oapi.Title{}, fmt.Errorf("unmarshalling title_tag: %v", err)
}
var oapi_studio oapi.Studio
oapi_studio.Id = title.StudioID
if title.StudioName != nil {
oapi_studio.Name = *title.StudioName
}
oapi_studio.Description = title.StudioDesc
if title.StudioIllustID != nil {
oapi_studio.Poster.Id = title.StudioIllustID
oapi_studio.Poster.ImagePath = title.StudioImagePath
oapi_studio.Poster.StorageType = &title.StudioStorageType
}
var oapi_image oapi.Image
if title.PosterID != nil {
oapi_image.Id = title.PosterID
oapi_image.ImagePath = title.TitleImagePath
oapi_image.StorageType = &title.TitleStorageType
}
var release_season oapi.ReleaseSeason
if title.ReleaseSeason != nil {
release_season = oapi.ReleaseSeason(*title.ReleaseSeason)
}
oapi_status, err := TitleStatus2oapi(&title.TitleStatus)
if err != nil {
return oapi.Title{}, fmt.Errorf("TitleStatus2oapi: %v", err)
}
oapi_title := oapi.Title{
EpisodesAired: title.EpisodesAired,
EpisodesAll: title.EpisodesAired,
EpisodesLen: &episodes_lens,
Id: title.ID,
Poster: &oapi_image,
Rating: title.Rating,
RatingCount: title.RatingCount,
ReleaseSeason: &release_season,
ReleaseYear: title.ReleaseYear,
Studio: &oapi_studio,
Tags: oapi_tag_names,
TitleNames: title_names,
TitleStatus: oapi_status,
// AdditionalProperties:
}
return oapi_title, nil
}
func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitleIdRequestObject) (oapi.GetTitlesTitleIdResponseObject, error) { func (s Server) GetTitlesTitleId(ctx context.Context, request oapi.GetTitlesTitleIdRequestObject) (oapi.GetTitlesTitleIdResponseObject, error) {
var oapi_title oapi.Title var oapi_title oapi.Title

138
modules/backend/handlers/users.go
View file

@ -2,12 +2,15 @@ package handlers
import ( import (
"context" "context"
"fmt"
oapi "nyanimedb/api" oapi "nyanimedb/api"
sqlc "nyanimedb/sql" sqlc "nyanimedb/sql"
"time" "time"
"github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
"github.com/oapi-codegen/runtime/types" "github.com/oapi-codegen/runtime/types"
log "github.com/sirupsen/logrus"
) )
// type Server struct { // type Server struct {
@ -50,33 +53,120 @@ func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdReque
return oapi.GetUsersUserId200JSONResponse(mapUser(user)), nil return oapi.GetUsersUserId200JSONResponse(mapUser(user)), nil
} }
func sqlDate2oapi(p_date pgtype.Timestamptz) (time.Time, error) {
return time.Time{}, nil
}
type SqlcUserStatus struct {
dropped string
finished string
planned string
in_progress string
}
func UserTitleStatus2Sqlc(s *[]oapi.UserTitleStatus) (*SqlcUserStatus, error) {
var sqlc_status SqlcUserStatus
if s == nil {
return &sqlc_status, nil
}
for _, t := range *s {
switch t {
case oapi.UserTitleStatusFinished:
sqlc_status.finished = "finished"
case oapi.UserTitleStatusDropped:
sqlc_status.dropped = "dropped"
case oapi.UserTitleStatusPlanned:
sqlc_status.planned = "planned"
case oapi.UserTitleStatusInProgress:
sqlc_status.in_progress = "in-progress"
default:
return nil, fmt.Errorf("unexpected tittle status: %s", t)
}
}
return &sqlc_status, nil
}
func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) { func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersUserIdTitlesRequestObject) (oapi.GetUsersUserIdTitlesResponseObject, error) {
var rate int32 = 9 oapi_usertitles := make([]oapi.UserTitle, 0)
var review_id int64 = 3
time := time.Date(2025, 1, 15, 10, 30, 0, 0, time.UTC)
var userTitles = []oapi.UserTitle{ word := Word2Sqlc(request.Params.Word)
{ status, err := TitleStatus2Sqlc(request.Params.Status)
UserId: 101, if err != nil {
TitleId: 2001, log.Errorf("%v", err)
Status: oapi.UserTitleStatusFinished, return oapi.GetUsersUserIdTitles400Response{}, err
Rate: &rate, }
Ctime: &time,
}, season, err := ReleaseSeason2sqlc(request.Params.ReleaseSeason)
{ if err != nil {
UserId: 102, log.Errorf("%v", err)
TitleId: 2002, return oapi.GetUsersUserIdTitles400Response{}, err
Status: oapi.UserTitleStatusInProgress, }
ReviewId: &review_id,
Ctime: &time, // Forward bool `json:"forward"`
}, // SortBy string `json:"sort_by"`
{ // CursorYear *int32 `json:"cursor_year"`
UserId: 103, // CursorID *int64 `json:"cursor_id"`
TitleId: 2003, // CursorRating *float64 `json:"cursor_rating"`
Status: oapi.UserTitleStatusDropped, // Word *string `json:"word"`
Ctime: &time, // Ongoing string `json:"ongoing"`
}, // Planned string `json:"planned"`
// Dropped string `json:"dropped"`
// InProgress string `json:"in-progress"`
// Finished string `json:"finished"`
// Rate *int32 `json:"rate"`
// Rating *float64 `json:"rating"`
// ReleaseYear *int32 `json:"release_year"`
// ReleaseSeason *ReleaseSeasonT `json:"release_season"`
// Limit *int32 `json:"limit"`
params := sqlc.SearchTitlesParams{
Word: word,
Ongoing: status.ongoing,
Finished: status.finished,
Planned: status.planned,
Rating: request.Params.Rating,
ReleaseYear: request.Params.ReleaseYear,
ReleaseSeason: season,
Forward: true,
SortBy: "id",
Limit: request.Params.Limit,
}
if request.Params.SortForward != nil {
params.Forward = *request.Params.SortForward
}
if request.Params.Sort != nil {
params.SortBy = string(*request.Params.Sort)
if request.Params.Cursor != nil {
err := ParseCursorInto(string(*request.Params.Sort), string(*request.Params.Cursor), &params)
if err != nil {
log.Errorf("%v", err)
return oapi.GetTitles400Response{}, nil
}
}
}
_sqlc_title := sqlc.SearchTitlesRow{
ID: sqlc_title.ID,
StudioID: sqlc_title.StudioID,
PosterID: sqlc_title.PosterID,
TitleStatus: sqlc_title.TitleStatus,
Rating: sqlc_title.Rating,
RatingCount: sqlc_title.RatingCount,
ReleaseYear: sqlc_title.ReleaseYear,
ReleaseSeason: sqlc_title.ReleaseSeason,
Season: sqlc_title.Season,
EpisodesAired: sqlc_title.EpisodesAired,
EpisodesAll: sqlc_title.EpisodesAll,
EpisodesLen: sqlc_title.EpisodesLen,
TitleStorageType: sqlc_title.TitleStorageType,
TitleImagePath: sqlc_title.TitleImagePath,
TagNames: sqlc_title.TitleNames,
StudioName: sqlc_title.StudioName,
StudioIllustID: sqlc_title.StudioIllustID,
StudioDesc: sqlc_title.StudioDesc,
StudioStorageType: sqlc_title.StudioStorageType,
StudioImagePath: sqlc_title.StudioImagePath,
} }
return oapi.GetUsersUserIdTitles200JSONResponse(userTitles), nil return oapi.GetUsersUserIdTitles200JSONResponse(userTitles), nil

138
modules/backend/queries.sql
View file

@ -86,7 +86,7 @@ SELECT
si.image_path as studio_image_path si.image_path as studio_image_path
FROM titles as t FROM titles as t
LEFT JOIN images as i ON (t.image_id = i.id) LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id) LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id) LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id) LEFT JOIN studios as s ON (t.studio_id = s.id)
@ -109,7 +109,7 @@ SELECT
si.image_path as studio_image_path si.image_path as studio_image_path
FROM titles as t FROM titles as t
LEFT JOIN images as i ON (t.image_id = i.id) LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id) LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id) LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id) LEFT JOIN studios as s ON (t.studio_id = s.id)
@ -211,36 +211,124 @@ LIMIT COALESCE(sqlc.narg('limit')::int, 100); -- 100 is default limit
-- name: SearchUserTitles :many -- name: SearchUserTitles :many
SELECT SELECT
* t.*,
FROM usertitles as u u.user_id as user_id,
JOIN titles as t ON (u.title_id = t.id) u.status as usertitle_status,
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.image_path as title_image_path,
jsonb_agg_strict(g.tag_name)'[]'::jsonb as tag_names,
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.image_path as studio_image_path
FROM usertitles as u
LEFT JOIN titles as t ON (u.title_id = t.id)
LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id)
LEFT JOIN images as si ON (s.illust_id = si.id)
WHERE WHERE
CASE CASE
WHEN sqlc.narg('word')::text IS NOT NULL THEN WHEN sqlc.arg('forward')::boolean THEN
( -- forward: greater than cursor (next page)
SELECT bool_and( CASE sqlc.arg('sort_by')::text
EXISTS ( WHEN 'year' THEN
SELECT 1 (sqlc.narg('cursor_year')::int IS NULL) OR
FROM jsonb_each_text(t.title_names) AS t(key, val) (t.release_year > sqlc.narg('cursor_year')::int) OR
WHERE val ILIKE pattern (t.release_year = sqlc.narg('cursor_year')::int AND t.id > sqlc.narg('cursor_id')::bigint)
)
) WHEN 'rating' THEN
FROM unnest( (sqlc.narg('cursor_rating')::float IS NULL) OR
ARRAY( (t.rating > sqlc.narg('cursor_rating')::float) OR
SELECT '%' || trim(w) || '%' (t.rating = sqlc.narg('cursor_rating')::float AND t.id > sqlc.narg('cursor_id')::bigint)
FROM unnest(string_to_array(sqlc.narg('word')::text, ' ')) AS w
WHERE trim(w) <> '' WHEN 'id' THEN
) (sqlc.narg('cursor_id')::bigint IS NULL) OR
) AS pattern (t.id > sqlc.narg('cursor_id')::bigint)
)
ELSE true ELSE true -- fallback
END
ELSE
-- backward: less than cursor (prev page)
CASE sqlc.arg('sort_by')::text
WHEN 'year' THEN
(sqlc.narg('cursor_year')::int IS NULL) OR
(t.release_year < sqlc.narg('cursor_year')::int) OR
(t.release_year = sqlc.narg('cursor_year')::int AND t.id < sqlc.narg('cursor_id')::bigint)
WHEN 'rating' THEN
(sqlc.narg('cursor_rating')::float IS NULL) OR
(t.rating < sqlc.narg('cursor_rating')::float) OR
(t.rating = sqlc.narg('cursor_rating')::float AND t.id < sqlc.narg('cursor_id')::bigint)
WHEN 'id' THEN
(sqlc.narg('cursor_id')::bigint IS NULL) OR
(t.id < sqlc.narg('cursor_id')::bigint)
ELSE true
END
END END
AND (sqlc.narg('status')::title_status_t IS NULL OR t.title_status = sqlc.narg('status')::title_status_t) AND (
CASE
WHEN sqlc.narg('word')::text IS NOT NULL THEN
(
SELECT bool_and(
EXISTS (
SELECT 1
FROM jsonb_each_text(t.title_names) AS t(key, val)
WHERE val ILIKE pattern
)
)
FROM unnest(
ARRAY(
SELECT '%' || trim(w) || '%'
FROM unnest(string_to_array(sqlc.narg('word')::text, ' ')) AS w
WHERE trim(w) <> ''
)
) AS pattern
)
ELSE true
END
)
AND (u.status::text IN (sqlc.arg('ongoing')::text, sqlc.arg('planned')::text, sqlc.arg('dropped')::text, sqlc.arg('in-progress')::text))
AND (t.title_status::text IN (sqlc.arg('ongoing')::text, sqlc.arg('finished')::text, sqlc.arg('planned')::text))
AND (sqlc.narg('rate')::int IS NULL OR u.rate >= sqlc.narg('rate')::int)
AND (sqlc.narg('rating')::float IS NULL OR t.rating >= sqlc.narg('rating')::float) AND (sqlc.narg('rating')::float IS NULL OR t.rating >= sqlc.narg('rating')::float)
AND (sqlc.narg('release_year')::int IS NULL OR t.release_year = sqlc.narg('release_year')::int) AND (sqlc.narg('release_year')::int IS NULL OR t.release_year = sqlc.narg('release_year')::int)
AND (sqlc.narg('release_season')::release_season_t IS NULL OR t.release_season = sqlc.narg('release_season')::release_season_t) AND (sqlc.narg('release_season')::release_season_t IS NULL OR t.release_season = sqlc.narg('release_season')::release_season_t)
AND (sqlc.narg('usertitle_status')::usertitle_status_t IS NULL OR u.usertitle_status = sqlc.narg('usertitle_status')::usertitle_status_t)
GROUP BY
t.id, i.id, s.id, si.id
ORDER BY
CASE WHEN sqlc.arg('forward')::boolean THEN
CASE
WHEN sqlc.arg('sort_by')::text = 'id' THEN t.id
WHEN sqlc.arg('sort_by')::text = 'year' THEN t.release_year
WHEN sqlc.arg('sort_by')::text = 'rating' THEN t.rating
WHEN sqlc.arg('sort_by')::text = 'rate' THEN u.rate
END
END ASC,
CASE WHEN NOT sqlc.arg('forward')::boolean THEN
CASE
WHEN sqlc.arg('sort_by')::text = 'id' THEN t.id
WHEN sqlc.arg('sort_by')::text = 'year' THEN t.release_year
WHEN sqlc.arg('sort_by')::text = 'rating' THEN t.rating
WHEN sqlc.arg('sort_by')::text = 'rate' THEN u.rate
END
END DESC,
CASE WHEN sqlc.arg('sort_by')::text <> 'id' THEN t.id END ASC
LIMIT COALESCE(sqlc.narg('limit')::int, 100); -- 100 is default limit LIMIT COALESCE(sqlc.narg('limit')::int, 100); -- 100 is default limit

246
sql/queries.sql.go
View file

@ -128,7 +128,7 @@ SELECT
si.image_path as studio_image_path si.image_path as studio_image_path
FROM titles as t FROM titles as t
LEFT JOIN images as i ON (t.image_id = i.id) LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id) LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id) LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id) LEFT JOIN studios as s ON (t.studio_id = s.id)
@ -349,7 +349,7 @@ SELECT
si.image_path as studio_image_path si.image_path as studio_image_path
FROM titles as t FROM titles as t
LEFT JOIN images as i ON (t.image_id = i.id) LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id) LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id) LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id) LEFT JOIN studios as s ON (t.studio_id = s.id)
@ -549,81 +549,194 @@ func (q *Queries) SearchTitles(ctx context.Context, arg SearchTitlesParams) ([]S
const searchUserTitles = `-- name: SearchUserTitles :many const searchUserTitles = `-- name: SearchUserTitles :many
SELECT SELECT
user_id, title_id, status, rate, review_id, ctime, id, title_names, studio_id, poster_id, title_status, rating, rating_count, release_year, release_season, season, episodes_aired, episodes_all, episodes_len 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,
FROM usertitles as u u.user_id as user_id,
JOIN titles as t ON (u.title_id = t.id) u.status as usertitle_status,
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.image_path as title_image_path,
jsonb_agg_strict(g.tag_name)'[]'::jsonb as tag_names,
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.image_path as studio_image_path
FROM usertitles as u
LEFT JOIN titles as t ON (u.title_id = t.id)
LEFT JOIN images as i ON (t.poster_id = i.id)
LEFT JOIN title_tags as tt ON (t.id = tt.title_id)
LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id)
LEFT JOIN images as si ON (s.illust_id = si.id)
WHERE WHERE
CASE CASE
WHEN $1::text IS NOT NULL THEN WHEN $1::boolean THEN
( -- forward: greater than cursor (next page)
SELECT bool_and( CASE $2::text
EXISTS ( WHEN 'year' THEN
SELECT 1 ($3::int IS NULL) OR
FROM jsonb_each_text(t.title_names) AS t(key, val) (t.release_year > $3::int) OR
WHERE val ILIKE pattern (t.release_year = $3::int AND t.id > $4::bigint)
)
) WHEN 'rating' THEN
FROM unnest( ($5::float IS NULL) OR
ARRAY( (t.rating > $5::float) OR
SELECT '%' || trim(w) || '%' (t.rating = $5::float AND t.id > $4::bigint)
FROM unnest(string_to_array($1::text, ' ')) AS w
WHERE trim(w) <> '' WHEN 'id' THEN
) ($4::bigint IS NULL) OR
) AS pattern (t.id > $4::bigint)
)
ELSE true ELSE true -- fallback
END
ELSE
-- backward: less than cursor (prev page)
CASE $2::text
WHEN 'year' THEN
($3::int IS NULL) OR
(t.release_year < $3::int) OR
(t.release_year = $3::int AND t.id < $4::bigint)
WHEN 'rating' THEN
($5::float IS NULL) OR
(t.rating < $5::float) OR
(t.rating = $5::float AND t.id < $4::bigint)
WHEN 'id' THEN
($4::bigint IS NULL) OR
(t.id < $4::bigint)
ELSE true
END
END END
AND ($2::title_status_t IS NULL OR t.title_status = $2::title_status_t) AND (
AND ($3::float IS NULL OR t.rating >= $3::float) CASE
AND ($4::int IS NULL OR t.release_year = $4::int) WHEN $6::text IS NOT NULL THEN
AND ($5::release_season_t IS NULL OR t.release_season = $5::release_season_t) (
AND ($6::usertitle_status_t IS NULL OR u.usertitle_status = $6::usertitle_status_t) SELECT bool_and(
EXISTS (
SELECT 1
FROM jsonb_each_text(t.title_names) AS t(key, val)
WHERE val ILIKE pattern
)
)
FROM unnest(
ARRAY(
SELECT '%' || trim(w) || '%'
FROM unnest(string_to_array($6::text, ' ')) AS w
WHERE trim(w) <> ''
)
) AS pattern
)
ELSE true
END
)
LIMIT COALESCE($7::int, 100) AND (u.status::text IN ($7::text, $8::text, $9::text, $10::text))
AND (t.title_status::text IN ($7::text, $11::text, $8::text))
AND ($12::int IS NULL OR u.rate >= $12::int)
AND ($13::float IS NULL OR t.rating >= $13::float)
AND ($14::int IS NULL OR t.release_year = $14::int)
AND ($15::release_season_t IS NULL OR t.release_season = $15::release_season_t)
GROUP BY
t.id, i.id, s.id, si.id
ORDER BY
CASE WHEN $1::boolean THEN
CASE
WHEN $2::text = 'id' THEN t.id
WHEN $2::text = 'year' THEN t.release_year
WHEN $2::text = 'rating' THEN t.rating
WHEN $2::text = 'rate' THEN u.rate
END
END ASC,
CASE WHEN NOT $1::boolean THEN
CASE
WHEN $2::text = 'id' THEN t.id
WHEN $2::text = 'year' THEN t.release_year
WHEN $2::text = 'rating' THEN t.rating
WHEN $2::text = 'rate' THEN u.rate
END
END DESC,
CASE WHEN $2::text <> 'id' THEN t.id END ASC
LIMIT COALESCE($16::int, 100)
` `
type SearchUserTitlesParams struct { type SearchUserTitlesParams struct {
Word *string `json:"word"` Forward bool `json:"forward"`
Status *TitleStatusT `json:"status"` SortBy string `json:"sort_by"`
Rating *float64 `json:"rating"` CursorYear *int32 `json:"cursor_year"`
ReleaseYear *int32 `json:"release_year"` CursorID *int64 `json:"cursor_id"`
ReleaseSeason *ReleaseSeasonT `json:"release_season"` CursorRating *float64 `json:"cursor_rating"`
UsertitleStatus NullUsertitleStatusT `json:"usertitle_status"` Word *string `json:"word"`
Limit *int32 `json:"limit"` Ongoing string `json:"ongoing"`
Planned string `json:"planned"`
Dropped string `json:"dropped"`
InProgress string `json:"in-progress"`
Finished string `json:"finished"`
Rate *int32 `json:"rate"`
Rating *float64 `json:"rating"`
ReleaseYear *int32 `json:"release_year"`
ReleaseSeason *ReleaseSeasonT `json:"release_season"`
Limit *int32 `json:"limit"`
} }
type SearchUserTitlesRow struct { type SearchUserTitlesRow struct {
UserID int64 `json:"user_id"` ID *int64 `json:"id"`
TitleID int64 `json:"title_id"` TitleNames []byte `json:"title_names"`
Status UsertitleStatusT `json:"status"` StudioID *int64 `json:"studio_id"`
Rate *int32 `json:"rate"` PosterID *int64 `json:"poster_id"`
ReviewID *int64 `json:"review_id"` TitleStatus *TitleStatusT `json:"title_status"`
Ctime pgtype.Timestamptz `json:"ctime"` Rating *float64 `json:"rating"`
ID int64 `json:"id"` RatingCount *int32 `json:"rating_count"`
TitleNames []byte `json:"title_names"` ReleaseYear *int32 `json:"release_year"`
StudioID int64 `json:"studio_id"` ReleaseSeason *ReleaseSeasonT `json:"release_season"`
PosterID *int64 `json:"poster_id"` Season *int32 `json:"season"`
TitleStatus TitleStatusT `json:"title_status"` EpisodesAired *int32 `json:"episodes_aired"`
Rating *float64 `json:"rating"` EpisodesAll *int32 `json:"episodes_all"`
RatingCount *int32 `json:"rating_count"` EpisodesLen []byte `json:"episodes_len"`
ReleaseYear *int32 `json:"release_year"` UserID int64 `json:"user_id"`
ReleaseSeason *ReleaseSeasonT `json:"release_season"` UsertitleStatus UsertitleStatusT `json:"usertitle_status"`
Season *int32 `json:"season"` UserRate *int32 `json:"user_rate"`
EpisodesAired *int32 `json:"episodes_aired"` ReviewID *int64 `json:"review_id"`
EpisodesAll *int32 `json:"episodes_all"` UserCtime pgtype.Timestamptz `json:"user_ctime"`
EpisodesLen []byte `json:"episodes_len"` TitleStorageType string `json:"title_storage_type"`
TitleImagePath *string `json:"title_image_path"`
TagNames []byte `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"`
StudioImagePath *string `json:"studio_image_path"`
} }
// 100 is default limit // 100 is default limit
func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesParams) ([]SearchUserTitlesRow, error) { func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesParams) ([]SearchUserTitlesRow, error) {
rows, err := q.db.Query(ctx, searchUserTitles, rows, err := q.db.Query(ctx, searchUserTitles,
arg.Forward,
arg.SortBy,
arg.CursorYear,
arg.CursorID,
arg.CursorRating,
arg.Word, arg.Word,
arg.Status, arg.Ongoing,
arg.Planned,
arg.Dropped,
arg.InProgress,
arg.Finished,
arg.Rate,
arg.Rating, arg.Rating,
arg.ReleaseYear, arg.ReleaseYear,
arg.ReleaseSeason, arg.ReleaseSeason,
arg.UsertitleStatus,
arg.Limit, arg.Limit,
) )
if err != nil { if err != nil {
@ -634,12 +747,6 @@ func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesPara
for rows.Next() { for rows.Next() {
var i SearchUserTitlesRow var i SearchUserTitlesRow
if err := rows.Scan( if err := rows.Scan(
&i.UserID,
&i.TitleID,
&i.Status,
&i.Rate,
&i.ReviewID,
&i.Ctime,
&i.ID, &i.ID,
&i.TitleNames, &i.TitleNames,
&i.StudioID, &i.StudioID,
@ -653,6 +760,19 @@ func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesPara
&i.EpisodesAired, &i.EpisodesAired,
&i.EpisodesAll, &i.EpisodesAll,
&i.EpisodesLen, &i.EpisodesLen,
&i.UserID,
&i.UsertitleStatus,
&i.UserRate,
&i.ReviewID,
&i.UserCtime,
&i.TitleStorageType,
&i.TitleImagePath,
&i.TagNames,
&i.StudioName,
&i.StudioIllustID,
&i.StudioDesc,
&i.StudioStorageType,
&i.StudioImagePath,
); err != nil { ); err != nil {
return nil, err return nil, err
} }