diff --git a/api/_build/openapi.yaml b/api/_build/openapi.yaml index d816a3a..6b39558 100644 --- a/api/_build/openapi.yaml +++ b/api/_build/openapi.yaml @@ -326,29 +326,7 @@ paths: content: application/json: schema: - 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 + $ref: '#/components/schemas/UserTitle' responses: '200': description: Title successfully added to user diff --git a/api/api.gen.go b/api/api.gen.go index 5c49f12..f3e935c 100644 --- a/api/api.gen.go +++ b/api/api.gen.go @@ -226,23 +226,11 @@ type GetUsersUserIdTitlesParams struct { Fields *string `form:"fields,omitempty" json:"fields,omitempty"` } -// AddUserTitleJSONBody defines parameters for AddUserTitle. -type AddUserTitleJSONBody struct { - Ctime *time.Time `json:"ctime,omitempty"` - Rate *int32 `json:"rate,omitempty"` - ReviewId *int64 `json:"review_id,omitempty"` - - // Status User's title status - Status UserTitleStatus `json:"status"` - TitleId int64 `json:"title_id"` - UserId int64 `json:"user_id"` -} - // UpdateUserJSONRequestBody defines body for UpdateUser for application/json ContentType. type UpdateUserJSONRequestBody UpdateUserJSONBody // AddUserTitleJSONRequestBody defines body for AddUserTitle for application/json ContentType. -type AddUserTitleJSONRequestBody AddUserTitleJSONBody +type AddUserTitleJSONRequestBody = UserTitle // Getter for additional properties for Title. Returns the specified // element and whether it was found diff --git a/api/paths/users-id-titles.yaml b/api/paths/users-id-titles.yaml index 80b9916..23ea761 100644 --- a/api/paths/users-id-titles.yaml +++ b/api/paths/users-id-titles.yaml @@ -108,30 +108,7 @@ post: content: application/json: schema: - type: object - required: - - user_id - - title_id - - status - properties: - user_id: - type: integer - format: int64 - title_id: - type: integer - format: int64 - status: - $ref: ../schemas/enums/UserTitleStatus.yaml - rate: - type: integer - format: int32 - review_id: - type: integer - format: int64 - ctime: - type: string - format: date-time - + $ref: '../schemas/UserTitle.yaml' responses: '200': description: Title successfully added to user diff --git a/modules/backend/handlers/users.go b/modules/backend/handlers/users.go index 89b77e0..d800e7a 100644 --- a/modules/backend/handlers/users.go +++ b/modules/backend/handlers/users.go @@ -140,9 +140,9 @@ func UserTitleStatus2Sqlc(s *[]oapi.UserTitleStatus) ([]sqlc.UsertitleStatusT, e } func UserTitleStatus2Sqlc1(s *oapi.UserTitleStatus) (*sqlc.UsertitleStatusT, error) { - var sqlc_status sqlc.UsertitleStatusT = sqlc.UsertitleStatusTFinished + var sqlc_status sqlc.UsertitleStatusT if s == nil { - return &sqlc_status, nil + return nil, nil } switch *s { @@ -304,7 +304,7 @@ func (s Server) GetUsersUserIdTitles(ctx context.Context, request oapi.GetUsersU tmp := fmt.Sprint(*t.Title.ReleaseYear) new_cursor.Param = &tmp case "rating": - tmp := strconv.FormatFloat(*t.Title.Rating, 'f', -1, 64) // падает + tmp := strconv.FormatFloat(*t.Title.Rating, 'f', -1, 64) new_cursor.Param = &tmp } } @@ -369,7 +369,7 @@ func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleReque params := sqlc.InsertUserTitleParams{ UserID: request.UserId, - TitleID: request.Body.TitleId, + TitleID: request.Body.Title.Id, Status: *status, Rate: request.Body.Rate, ReviewID: request.Body.ReviewId,