Merge branch 'dev-ars' into dev
Some checks failed
Build and Deploy Go App / build (push) Failing after 2m30s
Build and Deploy Go App / deploy (push) Has been skipped

This commit is contained in:
Iron_Felix 2025-11-24 06:27:23 +03:00
commit ea43e13df4
3 changed files with 47 additions and 52 deletions

View file

@ -65,6 +65,7 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.
oapi_studio.Id = title.StudioID
oapi_studio.Description = title.StudioDesc
if title.StudioIllustID != nil {
oapi_studio.Poster = &oapi.Image{}
oapi_studio.Poster.Id = title.StudioIllustID
oapi_studio.Poster.ImagePath = title.StudioImagePath
oapi_studio.Poster.StorageType = &title.StudioStorageType

View file

@ -193,12 +193,11 @@ WHERE
)
AND (
-- Если массив пуст (NULL или []) — не фильтруем
cardinality(sqlc.arg('title_statuses')::title_status_t[]) = 0
OR
-- Иначе: статус есть в списке
t.title_status = ANY(sqlc.arg('title_statuses')::title_status_t[])
)
'title_statuses'::title_status_t[] IS NULL
OR array_length('title_statuses'::title_status_t[], 1) IS NULL
OR array_length('title_statuses'::title_status_t[], 1) = 0
OR t.title_status = ANY('title_statuses'::title_status_t[])
)
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_season')::release_season_t IS NULL OR t.release_season = sqlc.narg('release_season')::release_season_t)
@ -326,15 +325,16 @@ WHERE
)
AND (
-- Если массив пуст (NULL или []) — не фильтруем
cardinality(sqlc.arg('title_statuses')::title_status_t[]) = 0
OR
t.title_status = ANY(sqlc.arg('title_statuses')::title_status_t[])
'title_statuses'::title_status_t[] IS NULL
OR array_length('title_statuses'::title_status_t[], 1) IS NULL
OR array_length('title_statuses'::title_status_t[], 1) = 0
OR t.title_status = ANY('title_statuses'::title_status_t[])
)
AND (
cardinality(sqlc.arg('usertitle_statuses')::usertitle_status_t[]) = 0
OR
u.status = ANY(sqlc.arg('usertitle_statuses')::usertitle_status_t[])
'usertitle_statuses'::title_status_t[] IS NULL
OR array_length('usertitle_statuses'::title_status_t[], 1) IS NULL
OR array_length('usertitle_statuses'::title_status_t[], 1) = 0
OR t.title_status = ANY('usertitle_statuses'::title_status_t[])
)
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)