Skip to content

Commit

Permalink
refactor: removing create user interface not needed
Browse files Browse the repository at this point in the history
refactor: removing create user interface not needed
  • Loading branch information
sebajax committed Feb 20, 2024
1 parent 0bdcf21 commit b38129c
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 34 deletions.
26 changes: 11 additions & 15 deletions internal/product/handler/createProduct.go
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
package handler

import (
"time"

"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/log"
"github.com/sebajax/go-vertical-slice-architecture/internal/user"
"github.com/sebajax/go-vertical-slice-architecture/internal/user/service"
"github.com/sebajax/go-vertical-slice-architecture/internal/product/service"
"github.com/sebajax/go-vertical-slice-architecture/pkg/apperror"
"github.com/sebajax/go-vertical-slice-architecture/pkg/message"
"github.com/sebajax/go-vertical-slice-architecture/pkg/validate"
)

// Body request schema for CreateUser
type UserSchema struct {
IdentityNumber string `json:"identity_number" validate:"required,min=6"`
FirstName string `json:"first_name" validate:"required,min=2"`
LastName string `json:"last_name" validate:"required,min=2"`
Email string `json:"email" validate:"required,email"`
DateOfBirth time.Time `json:"date_of_birth" validate:"required"`
// Body request schema for CreateProduct
type ProductSchema struct {
Name string `json:"name" validate:"required,min=5"`
Sku string `json:"sku" validate:"required,min=8"`
Category string `json:"category" validate:"required,min=5"`
Price float64 `json:"price" validate:"required"`
}

// Creates a new user into the database
func CreateUser(s service.CreateUserService) fiber.Handler {
// Creates a new product into the database
func CreateProduct(s service.CreateUserService) fiber.Handler {
return func(c *fiber.Ctx) error {
// Get body request
var body UserSchema
var body ProductSchema
// Validate the body
err := c.BodyParser(&body)
if err != nil {
Expand All @@ -42,7 +38,7 @@ func CreateUser(s service.CreateUserService) fiber.Handler {
}

// No schema errores then map body to domain
user := &user.User{
user := &product{
IdentityNumber: body.IdentityNumber,
FirstName: body.FirstName,
LastName: body.LastName,
Expand Down
2 changes: 1 addition & 1 deletion internal/product/port.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package user
package product

// User port interface definition for depedency injection
type UserRepository interface {
Expand Down
10 changes: 5 additions & 5 deletions internal/product/product.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (p ProductCategory) String() string {
"Camera",
"Television",
"Other",
}
}[p]
}

// Const for error messages
Expand All @@ -38,17 +38,17 @@ const (
)

// Product Domain
type User struct {
Id int
type Product struct {
Id int64
Name string
Sku string
Category ProductCategory
Price string
Price float64
CreatedAt time.Time
}

// Create a new product instance
func New(n string, s string, c string, p string) (*Product, error) {
func New(n string, s string, c ProductCategory, p float64) (*Product, error) {
return &Product{
Name: n,
Sku: s,
Expand Down
2 changes: 1 addition & 1 deletion internal/user/handler/createUser.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type UserSchema struct {
}

// Creates a new user into the database
func CreateUser(s service.CreateUserService) fiber.Handler {
func CreateUser(s *service.CreateUserService) fiber.Handler {
return func(c *fiber.Ctx) error {
// Get body request
var body UserSchema
Expand Down
13 changes: 4 additions & 9 deletions internal/user/service/createUser.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,21 @@ import (
"github.com/sebajax/go-vertical-slice-architecture/pkg/apperror"
)

// CreateUserService interface for DI
type CreateUserService interface {
CreateUser(user *user.User) (int64, error)
}

// User use cases (port injection)
type createUserService struct {
type CreateUserService struct {
userRepository user.UserRepository
}

// Create a new user service use case instance
func NewCreateUserService(repository user.UserRepository) CreateUserService {
func NewCreateUserService(repository user.UserRepository) *CreateUserService {
// return the pointer to user service
return &createUserService{
return &CreateUserService{
userRepository: repository,
}
}

// Create a new user and store the user in the database
func (service *createUserService) CreateUser(u *user.User) (int64, error) {
func (service *CreateUserService) CreateUser(u *user.User) (int64, error) {
_, check, err := service.userRepository.GetByEmail(u.Email)
// check if user does not exist and no database error ocurred
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions internal/user/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

// user service instance
type UserService struct {
CreateUserServiceProvider CreateUserService
CreateUserServiceProvider *CreateUserService
}

func NewUserService() *UserService {
Expand All @@ -33,7 +33,7 @@ func ProvideUserComponents(c *dig.Container) {
func (us *UserService) InitUserComponents(c *dig.Container) error {
// create user service
err := c.Invoke(
func(s CreateUserService) {
func(s *CreateUserService) {
us.CreateUserServiceProvider = s
},
)
Expand Down
2 changes: 1 addition & 1 deletion internal/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const (

// User Domain
type User struct {
Id int
Id int64
IdentityNumber string
FirstName string
LastName string
Expand Down

0 comments on commit b38129c

Please sign in to comment.