add user management functionality with OTP verification and consent handling, DI introduced

This commit is contained in:
2025-08-10 10:38:49 +03:00
parent 6a9061a3de
commit 5d80a68b44
30 changed files with 828 additions and 528 deletions

View File

@ -9,52 +9,30 @@ import (
"github.com/gofiber/fiber/v2"
"github.com/oapi-codegen/runtime"
openapi_types "github.com/oapi-codegen/runtime/types"
)
// User defines model for User.
type User struct {
Email openapi_types.Email `json:"email"`
Id string `json:"id"`
Username string `json:"username"`
PhoneNumber string `json:"phone_number"`
Uuid string `json:"uuid"`
}
// UserCreate defines model for UserCreate.
type UserCreate struct {
Email openapi_types.Email `json:"email"`
Password string `json:"password"`
Username string `json:"username"`
PhoneNumber string `json:"phone_number"`
}
// UserUpdate defines model for UserUpdate.
type UserUpdate struct {
Email openapi_types.Email `json:"email"`
Username string `json:"username"`
}
// PostUsersJSONRequestBody defines body for PostUsers for application/json ContentType.
type PostUsersJSONRequestBody = UserCreate
// PutUsersUserIdJSONRequestBody defines body for PutUsersUserId for application/json ContentType.
type PutUsersUserIdJSONRequestBody = UserUpdate
// CreateUserJSONRequestBody defines body for CreateUser for application/json ContentType.
type CreateUserJSONRequestBody = UserCreate
// ServerInterface represents all server handlers.
type ServerInterface interface {
// Get all users
// (GET /users)
GetUsers(c *fiber.Ctx) error
// Create a new user
// Create a new user with phone number
// (POST /users)
PostUsers(c *fiber.Ctx) error
// Delete a user by ID
// (DELETE /users/{userId})
DeleteUsersUserId(c *fiber.Ctx, userId string) error
CreateUser(c *fiber.Ctx) error
// Get a user by ID
// (GET /users/{userId})
GetUsersUserId(c *fiber.Ctx, userId string) error
// Update a user by ID
// (PUT /users/{userId})
PutUsersUserId(c *fiber.Ctx, userId string) error
GetUserById(c *fiber.Ctx, userId string) error
}
// ServerInterfaceWrapper converts contexts to parameters.
@ -64,20 +42,14 @@ type ServerInterfaceWrapper struct {
type MiddlewareFunc fiber.Handler
// GetUsers operation middleware
func (siw *ServerInterfaceWrapper) GetUsers(c *fiber.Ctx) error {
// CreateUser operation middleware
func (siw *ServerInterfaceWrapper) CreateUser(c *fiber.Ctx) error {
return siw.Handler.GetUsers(c)
return siw.Handler.CreateUser(c)
}
// PostUsers operation middleware
func (siw *ServerInterfaceWrapper) PostUsers(c *fiber.Ctx) error {
return siw.Handler.PostUsers(c)
}
// DeleteUsersUserId operation middleware
func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *fiber.Ctx) error {
// GetUserById operation middleware
func (siw *ServerInterfaceWrapper) GetUserById(c *fiber.Ctx) error {
var err error
@ -89,39 +61,7 @@ func (siw *ServerInterfaceWrapper) DeleteUsersUserId(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, fmt.Errorf("Invalid format for parameter userId: %w", err).Error())
}
return siw.Handler.DeleteUsersUserId(c, userId)
}
// GetUsersUserId operation middleware
func (siw *ServerInterfaceWrapper) GetUsersUserId(c *fiber.Ctx) error {
var err error
// ------------- Path parameter "userId" -------------
var userId string
err = runtime.BindStyledParameterWithOptions("simple", "userId", c.Params("userId"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true})
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Errorf("Invalid format for parameter userId: %w", err).Error())
}
return siw.Handler.GetUsersUserId(c, userId)
}
// PutUsersUserId operation middleware
func (siw *ServerInterfaceWrapper) PutUsersUserId(c *fiber.Ctx) error {
var err error
// ------------- Path parameter "userId" -------------
var userId string
err = runtime.BindStyledParameterWithOptions("simple", "userId", c.Params("userId"), &userId, runtime.BindStyledParameterOptions{Explode: false, Required: true})
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Errorf("Invalid format for parameter userId: %w", err).Error())
}
return siw.Handler.PutUsersUserId(c, userId)
return siw.Handler.GetUserById(c, userId)
}
// FiberServerOptions provides options for the Fiber server.
@ -145,143 +85,67 @@ func RegisterHandlersWithOptions(router fiber.Router, si ServerInterface, option
router.Use(fiber.Handler(m))
}
router.Get(options.BaseURL+"/users", wrapper.GetUsers)
router.Post(options.BaseURL+"/users", wrapper.CreateUser)
router.Post(options.BaseURL+"/users", wrapper.PostUsers)
router.Delete(options.BaseURL+"/users/:userId", wrapper.DeleteUsersUserId)
router.Get(options.BaseURL+"/users/:userId", wrapper.GetUsersUserId)
router.Put(options.BaseURL+"/users/:userId", wrapper.PutUsersUserId)
router.Get(options.BaseURL+"/users/:userId", wrapper.GetUserById)
}
type GetUsersRequestObject struct {
type CreateUserRequestObject struct {
Body *CreateUserJSONRequestBody
}
type GetUsersResponseObject interface {
VisitGetUsersResponse(ctx *fiber.Ctx) error
type CreateUserResponseObject interface {
VisitCreateUserResponse(ctx *fiber.Ctx) error
}
type GetUsers200JSONResponse []User
type CreateUser200JSONResponse User
func (response GetUsers200JSONResponse) VisitGetUsersResponse(ctx *fiber.Ctx) error {
func (response CreateUser200JSONResponse) VisitCreateUserResponse(ctx *fiber.Ctx) error {
ctx.Response().Header.Set("Content-Type", "application/json")
ctx.Status(200)
return ctx.JSON(&response)
}
type PostUsersRequestObject struct {
Body *PostUsersJSONRequestBody
}
type PostUsersResponseObject interface {
VisitPostUsersResponse(ctx *fiber.Ctx) error
}
type PostUsers201JSONResponse User
func (response PostUsers201JSONResponse) VisitPostUsersResponse(ctx *fiber.Ctx) error {
ctx.Response().Header.Set("Content-Type", "application/json")
ctx.Status(201)
return ctx.JSON(&response)
}
type DeleteUsersUserIdRequestObject struct {
type GetUserByIdRequestObject struct {
UserId string `json:"userId"`
}
type DeleteUsersUserIdResponseObject interface {
VisitDeleteUsersUserIdResponse(ctx *fiber.Ctx) error
type GetUserByIdResponseObject interface {
VisitGetUserByIdResponse(ctx *fiber.Ctx) error
}
type DeleteUsersUserId204Response struct {
type GetUserById200JSONResponse struct {
User User `json:"user"`
}
func (response DeleteUsersUserId204Response) VisitDeleteUsersUserIdResponse(ctx *fiber.Ctx) error {
ctx.Status(204)
return nil
}
type DeleteUsersUserId404Response struct {
}
func (response DeleteUsersUserId404Response) VisitDeleteUsersUserIdResponse(ctx *fiber.Ctx) error {
ctx.Status(404)
return nil
}
type GetUsersUserIdRequestObject struct {
UserId string `json:"userId"`
}
type GetUsersUserIdResponseObject interface {
VisitGetUsersUserIdResponse(ctx *fiber.Ctx) error
}
type GetUsersUserId200JSONResponse User
func (response GetUsersUserId200JSONResponse) VisitGetUsersUserIdResponse(ctx *fiber.Ctx) error {
func (response GetUserById200JSONResponse) VisitGetUserByIdResponse(ctx *fiber.Ctx) error {
ctx.Response().Header.Set("Content-Type", "application/json")
ctx.Status(200)
return ctx.JSON(&response)
}
type GetUsersUserId404Response struct {
type GetUserById404JSONResponse struct {
Message string `json:"message"`
}
func (response GetUsersUserId404Response) VisitGetUsersUserIdResponse(ctx *fiber.Ctx) error {
ctx.Status(404)
return nil
}
type PutUsersUserIdRequestObject struct {
UserId string `json:"userId"`
Body *PutUsersUserIdJSONRequestBody
}
type PutUsersUserIdResponseObject interface {
VisitPutUsersUserIdResponse(ctx *fiber.Ctx) error
}
type PutUsersUserId200JSONResponse User
func (response PutUsersUserId200JSONResponse) VisitPutUsersUserIdResponse(ctx *fiber.Ctx) error {
func (response GetUserById404JSONResponse) VisitGetUserByIdResponse(ctx *fiber.Ctx) error {
ctx.Response().Header.Set("Content-Type", "application/json")
ctx.Status(200)
ctx.Status(404)
return ctx.JSON(&response)
}
type PutUsersUserId404Response struct {
}
func (response PutUsersUserId404Response) VisitPutUsersUserIdResponse(ctx *fiber.Ctx) error {
ctx.Status(404)
return nil
}
// StrictServerInterface represents all server handlers.
type StrictServerInterface interface {
// Get all users
// (GET /users)
GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error)
// Create a new user
// Create a new user with phone number
// (POST /users)
PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error)
// Delete a user by ID
// (DELETE /users/{userId})
DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error)
CreateUser(ctx context.Context, request CreateUserRequestObject) (CreateUserResponseObject, error)
// Get a user by ID
// (GET /users/{userId})
GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error)
// Update a user by ID
// (PUT /users/{userId})
PutUsersUserId(ctx context.Context, request PutUsersUserIdRequestObject) (PutUsersUserIdResponseObject, error)
GetUserById(ctx context.Context, request GetUserByIdRequestObject) (GetUserByIdResponseObject, error)
}
type StrictHandlerFunc func(ctx *fiber.Ctx, args interface{}) (interface{}, error)
@ -297,54 +161,29 @@ type strictHandler struct {
middlewares []StrictMiddlewareFunc
}
// GetUsers operation middleware
func (sh *strictHandler) GetUsers(ctx *fiber.Ctx) error {
var request GetUsersRequestObject
// CreateUser operation middleware
func (sh *strictHandler) CreateUser(ctx *fiber.Ctx) error {
var request CreateUserRequestObject
handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) {
return sh.ssi.GetUsers(ctx.UserContext(), request.(GetUsersRequestObject))
}
for _, middleware := range sh.middlewares {
handler = middleware(handler, "GetUsers")
}
response, err := handler(ctx, request)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else if validResponse, ok := response.(GetUsersResponseObject); ok {
if err := validResponse.VisitGetUsersResponse(ctx); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
} else if response != nil {
return fmt.Errorf("unexpected response type: %T", response)
}
return nil
}
// PostUsers operation middleware
func (sh *strictHandler) PostUsers(ctx *fiber.Ctx) error {
var request PostUsersRequestObject
var body PostUsersJSONRequestBody
var body CreateUserJSONRequestBody
if err := ctx.BodyParser(&body); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
request.Body = &body
handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) {
return sh.ssi.PostUsers(ctx.UserContext(), request.(PostUsersRequestObject))
return sh.ssi.CreateUser(ctx.UserContext(), request.(CreateUserRequestObject))
}
for _, middleware := range sh.middlewares {
handler = middleware(handler, "PostUsers")
handler = middleware(handler, "CreateUser")
}
response, err := handler(ctx, request)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else if validResponse, ok := response.(PostUsersResponseObject); ok {
if err := validResponse.VisitPostUsersResponse(ctx); err != nil {
} else if validResponse, ok := response.(CreateUserResponseObject); ok {
if err := validResponse.VisitCreateUserResponse(ctx); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
} else if response != nil {
@ -353,85 +192,25 @@ func (sh *strictHandler) PostUsers(ctx *fiber.Ctx) error {
return nil
}
// DeleteUsersUserId operation middleware
func (sh *strictHandler) DeleteUsersUserId(ctx *fiber.Ctx, userId string) error {
var request DeleteUsersUserIdRequestObject
// GetUserById operation middleware
func (sh *strictHandler) GetUserById(ctx *fiber.Ctx, userId string) error {
var request GetUserByIdRequestObject
request.UserId = userId
handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) {
return sh.ssi.DeleteUsersUserId(ctx.UserContext(), request.(DeleteUsersUserIdRequestObject))
return sh.ssi.GetUserById(ctx.UserContext(), request.(GetUserByIdRequestObject))
}
for _, middleware := range sh.middlewares {
handler = middleware(handler, "DeleteUsersUserId")
handler = middleware(handler, "GetUserById")
}
response, err := handler(ctx, request)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else if validResponse, ok := response.(DeleteUsersUserIdResponseObject); ok {
if err := validResponse.VisitDeleteUsersUserIdResponse(ctx); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
} else if response != nil {
return fmt.Errorf("unexpected response type: %T", response)
}
return nil
}
// GetUsersUserId operation middleware
func (sh *strictHandler) GetUsersUserId(ctx *fiber.Ctx, userId string) error {
var request GetUsersUserIdRequestObject
request.UserId = userId
handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) {
return sh.ssi.GetUsersUserId(ctx.UserContext(), request.(GetUsersUserIdRequestObject))
}
for _, middleware := range sh.middlewares {
handler = middleware(handler, "GetUsersUserId")
}
response, err := handler(ctx, request)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else if validResponse, ok := response.(GetUsersUserIdResponseObject); ok {
if err := validResponse.VisitGetUsersUserIdResponse(ctx); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
} else if response != nil {
return fmt.Errorf("unexpected response type: %T", response)
}
return nil
}
// PutUsersUserId operation middleware
func (sh *strictHandler) PutUsersUserId(ctx *fiber.Ctx, userId string) error {
var request PutUsersUserIdRequestObject
request.UserId = userId
var body PutUsersUserIdJSONRequestBody
if err := ctx.BodyParser(&body); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
request.Body = &body
handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) {
return sh.ssi.PutUsersUserId(ctx.UserContext(), request.(PutUsersUserIdRequestObject))
}
for _, middleware := range sh.middlewares {
handler = middleware(handler, "PutUsersUserId")
}
response, err := handler(ctx, request)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else if validResponse, ok := response.(PutUsersUserIdResponseObject); ok {
if err := validResponse.VisitPutUsersUserIdResponse(ctx); err != nil {
} else if validResponse, ok := response.(GetUserByIdResponseObject); ok {
if err := validResponse.VisitGetUserByIdResponse(ctx); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
} else if response != nil {

View File

@ -1,3 +1,3 @@
package handler
//go:generate go tool oapi-codegen -config ../../../../api/user/cfg.yaml ../../../../api/user/user.yaml
//go:generate go tool oapi-codegen -config ../../../../api/user/cfg.yaml ../../../../api/user/api.yaml

View File

@ -2,46 +2,52 @@ package handler
import (
"context"
"git.logidex.ru/fakz9/logidex-id/internal/api/user/service"
"github.com/gofiber/fiber/v2"
"github.com/jinzhu/copier"
)
type UserHandler struct {
service service.UserService
}
func (h UserHandler) CreateUser(ctx context.Context, request CreateUserRequestObject) (CreateUserResponseObject, error) {
//TODO implement me
panic("implement me")
}
func (h UserHandler) GetUserById(ctx context.Context, request GetUserByIdRequestObject) (GetUserByIdResponseObject, error) {
user, err := h.service.GetUserByUuid(ctx, request.UserId)
if err != nil {
return GetUserById404JSONResponse{
Message: err.Error(),
}, nil
}
var responseUser User
err = copier.Copy(responseUser, user)
if err != nil {
return GetUserById404JSONResponse{Message: err.Error()}, nil
}
return GetUserById200JSONResponse{User: responseUser}, nil
}
var _ StrictServerInterface = (*UserHandler)(nil)
func (u UserHandler) GetUsers(ctx context.Context, request GetUsersRequestObject) (GetUsersResponseObject, error) {
var response = make([]User, 0)
return GetUsers200JSONResponse(response), nil
func NewUserHandler(
service service.UserService,
) *UserHandler {
return &UserHandler{service: service}
}
func (u UserHandler) PostUsers(ctx context.Context, request PostUsersRequestObject) (PostUsersResponseObject, error) {
//TODO implement me
panic("implement me")
}
func (u UserHandler) DeleteUsersUserId(ctx context.Context, request DeleteUsersUserIdRequestObject) (DeleteUsersUserIdResponseObject, error) {
//TODO implement me
panic("implement me")
}
func (u UserHandler) GetUsersUserId(ctx context.Context, request GetUsersUserIdRequestObject) (GetUsersUserIdResponseObject, error) {
//TODO implement me
panic("implement me")
}
func (u UserHandler) PutUsersUserId(ctx context.Context, request PutUsersUserIdRequestObject) (PutUsersUserIdResponseObject, error) {
//TODO implement me
panic("implement me")
}
func NewUserHandler() *UserHandler {
return &UserHandler{}
}
func RegisterApp(router fiber.Router) {
server := NewStrictHandler(NewUserHandler(), nil)
func (h UserHandler) RegisterRoutes(router fiber.Router) {
server := NewStrictHandler(h, nil)
RegisterHandlers(router, server)
}
//func RegisterUserHandler(router fiber.Router) {
// server := NewStrictHandler(NewUserHandler(), nil)
// RegisterHandlers(router, server)
//
//}