From 8deba7afd9e320d2b182e9888baf1afe9c415c51 Mon Sep 17 00:00:00 2001 From: Iron_Felix Date: Tue, 18 Nov 2025 04:19:34 +0300 Subject: [PATCH] fix --- api/openapi.yaml | 22 ++++++++++++++++++++++ modules/backend/handlers/titles.go | 4 ++-- modules/backend/queries.sql | 2 +- sql/migrations/000001_init.up.sql | 7 +++---- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/api/openapi.yaml b/api/openapi.yaml index 7c83426..0bbedca 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -757,4 +757,26 @@ components: UserTitle: type: object + required: + - user_id + - title_id + - status + properties: + user_id: + type: integer + format: int64 + title_id: + type: integer + format: int64 + status: + $ref: '#components/schemas/UserTitleStatus' + rate: + type: integer + format: int32 + review_id: + type: integer + format: int64 + ctime: + type: string + format: date-time additionalProperties: true diff --git a/modules/backend/handlers/titles.go b/modules/backend/handlers/titles.go index 9f076d5..45f0ef0 100644 --- a/modules/backend/handlers/titles.go +++ b/modules/backend/handlers/titles.go @@ -87,7 +87,7 @@ func (s Server) GetImage(ctx context.Context, id int64) (*oapi.Image, error) { sqlc_image, err := s.db.GetImageByID(ctx, id) if err != nil { if err == pgx.ErrNoRows { - return nil, nil + return nil, nil //todo: error reference in db } return &oapi_image, fmt.Errorf("query GetImageByID: %v", err) } @@ -217,7 +217,7 @@ func (s Server) GetTitleTitleId(ctx context.Context, request oapi.GetTitleTitleI } func (s Server) GetTitle(ctx context.Context, request oapi.GetTitleRequestObject) (oapi.GetTitleResponseObject, error) { - opai_titles := make([]oapi.Title, 1) + opai_titles := make([]oapi.Title, 0) word := Word2Sqlc(request.Params.Word) status, err := TitleStatus2Sqlc(request.Params.Status) diff --git a/modules/backend/queries.sql b/modules/backend/queries.sql index a4ed1fe..423be37 100644 --- a/modules/backend/queries.sql +++ b/modules/backend/queries.sql @@ -1,7 +1,7 @@ -- name: GetImageByID :one SELECT id, storage_type, image_path FROM images -WHERE id = sqlc.arg('illust_id'); +WHERE id = sqlc.arg('illust_id')::bigint; -- name: CreateImage :one INSERT INTO images (storage_type, image_path) diff --git a/sql/migrations/000001_init.up.sql b/sql/migrations/000001_init.up.sql index 8bd40d1..7b79300 100644 --- a/sql/migrations/000001_init.up.sql +++ b/sql/migrations/000001_init.up.sql @@ -28,7 +28,6 @@ CREATE TABLE reviews ( id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, data text NOT NULL, rating int CHECK (rating >= 0 AND rating <= 10), - illust_id bigint REFERENCES images (id), user_id bigint REFERENCES users (id), title_id bigint REFERENCES titles (id), created_at timestamptz DEFAULT NOW() @@ -87,9 +86,9 @@ CREATE TABLE usertitles ( title_id bigint NOT NULL REFERENCES titles (id), status usertitle_status_t NOT NULL, rate int CHECK (rate > 0 AND rate <= 10), - review_text text, - review_date timestamptz - // TODO: series status + review_id bigint NOT NULL REFERENCES reviews (id), + ctime timestamptz + -- // TODO: series status ); CREATE TABLE title_tags (