This commit is contained in:
Iron_Felix 2025-11-25 04:42:56 +03:00
parent 3aafab36c2
commit dbdb52269a
7 changed files with 76 additions and 52 deletions

View file

@ -125,9 +125,9 @@ func (s Server) mapTitle(ctx context.Context, title sqlc.GetTitleByIDRow) (oapi.
return oapi_title, nil
}
func parseInt64(s string) (int32, error) {
func parseInt64(s string) (int64, error) {
i, err := strconv.ParseInt(s, 10, 64)
return int32(i), err
return i, err
}
func TitleStatus2Sqlc(s *[]oapi.TitleStatus) ([]sqlc.TitleStatusT, error) {

View file

@ -53,7 +53,7 @@ func (s Server) GetUsersUserId(ctx context.Context, req oapi.GetUsersUserIdReque
if err != nil {
return oapi.GetUsersUserId404Response{}, nil
}
_user, err := s.db.GetUserByID(context.TODO(), int64(userID))
_user, err := s.db.GetUserByID(context.TODO(), userID)
if err != nil {
if err == pgx.ErrNoRows {
return oapi.GetUsersUserId404Response{}, nil
@ -243,7 +243,13 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU
return oapi.GetUsersUserIdTitles400Response{}, err
}
userID, err := parseInt64(request.UserId)
if err != nil {
log.Errorf("get user titles: %v", err)
return oapi.GetUsersUserIdTitles404Response{}, err
}
params := sqlc.SearchUserTitlesParams{
UserID: userID,
Word: word,
TitleStatuses: title_statuses,
UsertitleStatuses: watch_status,

View file

@ -21,7 +21,7 @@ SELECT
i.image_path as image_path
FROM users as t
LEFT JOIN images as i ON (t.avatar_id = i.id)
WHERE id = sqlc.arg('id')::bigint;
WHERE t.id = sqlc.arg('id')::bigint;
-- name: GetStudioByID :one
@ -269,6 +269,8 @@ LEFT JOIN tags as g ON (tt.tag_id = g.id)
LEFT JOIN studios as s ON (t.studio_id = s.id)
WHERE
u.user_id = sqlc.arg('user_id')::bigint
AND
CASE
WHEN sqlc.arg('forward')::boolean THEN
-- forward: greater than cursor (next page)
@ -352,7 +354,7 @@ WHERE
AND (sqlc.narg('release_season')::release_season_t IS NULL OR t.release_season = sqlc.narg('release_season')::release_season_t)
GROUP BY
t.id, i.id, s.id
t.id, u.user_id, u.status, u.rate, u.review_id, u.ctime, i.id, s.id
ORDER BY
CASE WHEN sqlc.arg('forward')::boolean THEN