Merge branch 'dev' of ssh://meowgit.nekoea.red:22222/nihonium/nyanimedb into dev

This commit is contained in:
Iron_Felix 2025-12-06 09:53:06 +03:00
commit 4102aa20d2
9 changed files with 32 additions and 32 deletions

View file

@ -167,7 +167,7 @@ func UserTitleStatus2Sqlc1(s *oapi.UserTitleStatus) (*sqlc.UsertitleStatusT, err
func (s Server) mapUsertitle(ctx context.Context, t sqlc.SearchUserTitlesRow) (oapi.UserTitle, error) {
oapi_usertitle := oapi.UserTitle{
Ctime: &t.UserCtime,
Ftime: &t.UserFtime,
Rate: t.UserRate,
ReviewId: t.ReviewID,
// Status: ,
@ -401,7 +401,7 @@ func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleReque
return oapi.AddUserTitle500Response{}, nil
}
oapi_usertitle := oapi.UserTitleMini{
Ctime: &user_title.Ctime,
Ftime: &user_title.Ftime,
Rate: user_title.Rate,
ReviewId: user_title.ReviewID,
Status: oapi_status,
@ -460,7 +460,7 @@ func (s Server) UpdateUserTitle(ctx context.Context, request oapi.UpdateUserTitl
}
oapi_usertitle := oapi.UserTitleMini{
Ctime: &user_title.Ctime,
Ftime: &user_title.Ftime,
Rate: user_title.Rate,
ReviewId: user_title.ReviewID,
Status: oapi_status,
@ -490,7 +490,7 @@ func (s Server) GetUserTitle(ctx context.Context, request oapi.GetUserTitleReque
return oapi.GetUserTitle500Response{}, nil
}
oapi_usertitle := oapi.UserTitleMini{
Ctime: &user_title.Ctime,
Ftime: &user_title.Ftime,
Rate: user_title.Rate,
ReviewId: user_title.ReviewID,
Status: oapi_status,

View file

@ -268,7 +268,7 @@ SELECT
u.status as usertitle_status,
u.rate as user_rate,
u.review_id as review_id,
u.ctime as user_ctime,
u.ftime as user_ftime,
i.storage_type as title_storage_type,
i.image_path as title_image_path,
COALESCE(
@ -370,7 +370,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, u.user_id, u.status, u.rate, u.review_id, u.ctime, i.id, s.id
t.id, u.user_id, u.status, u.rate, u.review_id, u.ftime, i.id, s.id
ORDER BY
CASE WHEN sqlc.arg('forward')::boolean THEN
@ -400,7 +400,7 @@ FROM reviews
WHERE review_id = sqlc.arg('review_id')::bigint;
-- name: InsertUserTitle :one
INSERT INTO usertitles (user_id, title_id, status, rate, review_id, ctime)
INSERT INTO usertitles (user_id, title_id, status, rate, review_id, ftime)
VALUES (
sqlc.arg('user_id')::bigint,
sqlc.arg('title_id')::bigint,
@ -409,7 +409,7 @@ VALUES (
sqlc.narg('review_id')::bigint,
sqlc.narg('ftime')::timestamptz
)
RETURNING *;
RETURNING user_id, title_id, status, rate, review_id, ftime;
-- name: UpdateUserTitle :one
-- Fails with sql.ErrNoRows if (user_id, title_id) not found
@ -417,7 +417,7 @@ UPDATE usertitles
SET
status = COALESCE(sqlc.narg('status')::usertitle_status_t, status),
rate = COALESCE(sqlc.narg('rate')::int, rate),
ctime = COALESCE(sqlc.narg('ftime')::timestamptz, ctime)
ftime = COALESCE(sqlc.narg('ftime')::timestamptz, ftime)
WHERE
user_id = sqlc.arg('user_id')
AND title_id = sqlc.arg('title_id')

View file

@ -125,7 +125,7 @@ export type UserTitle = {
status: UserTitleStatus;
rate?: number;
review_id?: number;
ctime?: string;
ftime?: string;
};
export type UserTitleMini = {
@ -134,7 +134,7 @@ export type UserTitleMini = {
status: UserTitleStatus;
rate?: number;
review_id?: number;
ctime?: string;
ftime?: string;
};
export type Review = {