feat!: FUCK FTIME
This commit is contained in:
parent
b239a66dbf
commit
e62f0fa96c
10 changed files with 32 additions and 33 deletions
|
|
@ -800,7 +800,7 @@ components:
|
|||
review_id:
|
||||
type: integer
|
||||
format: int64
|
||||
ctime:
|
||||
ftime:
|
||||
type: string
|
||||
format: date-time
|
||||
required:
|
||||
|
|
@ -824,7 +824,7 @@ components:
|
|||
review_id:
|
||||
type: integer
|
||||
format: int64
|
||||
ctime:
|
||||
ftime:
|
||||
type: string
|
||||
format: date-time
|
||||
required:
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ type User struct {
|
|||
|
||||
// UserTitle defines model for UserTitle.
|
||||
type UserTitle struct {
|
||||
Ctime *time.Time `json:"ctime,omitempty"`
|
||||
Ftime *time.Time `json:"ftime,omitempty"`
|
||||
Rate *int32 `json:"rate,omitempty"`
|
||||
ReviewId *int64 `json:"review_id,omitempty"`
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ type UserTitle struct {
|
|||
|
||||
// UserTitleMini defines model for UserTitleMini.
|
||||
type UserTitleMini struct {
|
||||
Ctime *time.Time `json:"ctime,omitempty"`
|
||||
Ftime *time.Time `json:"ftime,omitempty"`
|
||||
Rate *int32 `json:"rate,omitempty"`
|
||||
ReviewId *int64 `json:"review_id,omitempty"`
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ properties:
|
|||
review_id:
|
||||
type: integer
|
||||
format: int64
|
||||
ctime:
|
||||
ftime:
|
||||
type: string
|
||||
format: date-time
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ properties:
|
|||
review_id:
|
||||
type: integer
|
||||
format: int64
|
||||
ctime:
|
||||
ftime:
|
||||
type: string
|
||||
format: date-time
|
||||
|
|
|
|||
|
|
@ -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: ,
|
||||
|
|
@ -398,7 +398,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,
|
||||
|
|
@ -457,7 +457,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,
|
||||
|
|
@ -487,7 +487,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,
|
||||
|
|
|
|||
|
|
@ -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 user_id, title_id, status, rate, review_id, ctime;
|
||||
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')
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ CREATE TABLE usertitles (
|
|||
status usertitle_status_t NOT NULL,
|
||||
rate int CHECK (rate > 0 AND rate <= 10),
|
||||
review_id bigint REFERENCES reviews (id) ON DELETE SET NULL,
|
||||
ctime timestamptz NOT NULL DEFAULT now(),
|
||||
ftime timestamptz NOT NULL DEFAULT now()
|
||||
-- // TODO: series status
|
||||
);
|
||||
|
|
|
|||
|
|
@ -284,5 +284,5 @@ type Usertitle struct {
|
|||
Status UsertitleStatusT `json:"status"`
|
||||
Rate *int32 `json:"rate"`
|
||||
ReviewID *int64 `json:"review_id"`
|
||||
Ctime time.Time `json:"ctime"`
|
||||
Ftime time.Time `json:"ftime"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ const deleteUserTitle = `-- name: DeleteUserTitle :one
|
|||
DELETE FROM usertitles
|
||||
WHERE user_id = $1
|
||||
AND title_id = $2
|
||||
RETURNING user_id, title_id, status, rate, review_id, ctime
|
||||
RETURNING user_id, title_id, status, rate, review_id, ftime
|
||||
`
|
||||
|
||||
type DeleteUserTitleParams struct {
|
||||
|
|
@ -71,7 +71,7 @@ func (q *Queries) DeleteUserTitle(ctx context.Context, arg DeleteUserTitleParams
|
|||
&i.Status,
|
||||
&i.Rate,
|
||||
&i.ReviewID,
|
||||
&i.Ctime,
|
||||
&i.Ftime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ func (q *Queries) GetUserByNickname(ctx context.Context, nickname string) (User,
|
|||
|
||||
const getUserTitleByID = `-- name: GetUserTitleByID :one
|
||||
SELECT
|
||||
ut.user_id, ut.title_id, ut.status, ut.rate, ut.review_id, ut.ctime
|
||||
ut.user_id, ut.title_id, ut.status, ut.rate, ut.review_id, ut.ftime
|
||||
FROM usertitles as ut
|
||||
WHERE ut.title_id = $1::bigint AND ut.user_id = $2::bigint
|
||||
`
|
||||
|
|
@ -371,7 +371,7 @@ func (q *Queries) GetUserTitleByID(ctx context.Context, arg GetUserTitleByIDPara
|
|||
&i.Status,
|
||||
&i.Rate,
|
||||
&i.ReviewID,
|
||||
&i.Ctime,
|
||||
&i.Ftime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
|
@ -438,7 +438,7 @@ func (q *Queries) InsertTitleTags(ctx context.Context, arg InsertTitleTagsParams
|
|||
}
|
||||
|
||||
const insertUserTitle = `-- 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 (
|
||||
$1::bigint,
|
||||
$2::bigint,
|
||||
|
|
@ -447,7 +447,7 @@ VALUES (
|
|||
$5::bigint,
|
||||
$6::timestamptz
|
||||
)
|
||||
RETURNING user_id, title_id, status, rate, review_id, ctime
|
||||
RETURNING user_id, title_id, status, rate, review_id, ftime
|
||||
`
|
||||
|
||||
type InsertUserTitleParams struct {
|
||||
|
|
@ -475,7 +475,7 @@ func (q *Queries) InsertUserTitle(ctx context.Context, arg InsertUserTitleParams
|
|||
&i.Status,
|
||||
&i.Rate,
|
||||
&i.ReviewID,
|
||||
&i.Ctime,
|
||||
&i.Ftime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
|
@ -786,7 +786,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(
|
||||
|
|
@ -888,7 +888,7 @@ WHERE
|
|||
AND ($13::release_season_t IS NULL OR t.release_season = $13::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 $2::boolean THEN
|
||||
|
|
@ -946,7 +946,7 @@ type SearchUserTitlesRow struct {
|
|||
UsertitleStatus UsertitleStatusT `json:"usertitle_status"`
|
||||
UserRate *int32 `json:"user_rate"`
|
||||
ReviewID *int64 `json:"review_id"`
|
||||
UserCtime time.Time `json:"user_ctime"`
|
||||
UserFtime time.Time `json:"user_ftime"`
|
||||
TitleStorageType *StorageTypeT `json:"title_storage_type"`
|
||||
TitleImagePath *string `json:"title_image_path"`
|
||||
TagNames json.RawMessage `json:"tag_names"`
|
||||
|
|
@ -994,7 +994,7 @@ func (q *Queries) SearchUserTitles(ctx context.Context, arg SearchUserTitlesPara
|
|||
&i.UsertitleStatus,
|
||||
&i.UserRate,
|
||||
&i.ReviewID,
|
||||
&i.UserCtime,
|
||||
&i.UserFtime,
|
||||
&i.TitleStorageType,
|
||||
&i.TitleImagePath,
|
||||
&i.TagNames,
|
||||
|
|
@ -1065,11 +1065,11 @@ UPDATE usertitles
|
|||
SET
|
||||
status = COALESCE($1::usertitle_status_t, status),
|
||||
rate = COALESCE($2::int, rate),
|
||||
ctime = COALESCE($3::timestamptz, ctime)
|
||||
ftime = COALESCE($3::timestamptz, ftime)
|
||||
WHERE
|
||||
user_id = $4
|
||||
AND title_id = $5
|
||||
RETURNING user_id, title_id, status, rate, review_id, ctime
|
||||
RETURNING user_id, title_id, status, rate, review_id, ftime
|
||||
`
|
||||
|
||||
type UpdateUserTitleParams struct {
|
||||
|
|
@ -1096,7 +1096,7 @@ func (q *Queries) UpdateUserTitle(ctx context.Context, arg UpdateUserTitleParams
|
|||
&i.Status,
|
||||
&i.Rate,
|
||||
&i.ReviewID,
|
||||
&i.Ctime,
|
||||
&i.Ftime,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue