From dc25cc41df23b1e1a1a48b407586ebf24cf0442f Mon Sep 17 00:00:00 2001 From: Pavel Date: Wed, 29 May 2024 20:06:28 +0300 Subject: [PATCH] add repo method for create privilege --- .../privilege_internal/controller.go | 41 ++++++++++++++++++- .../controller/privilege_internal/validate.go | 13 ++++++ internal/errors/repository.go | 8 ++++ internal/models/reqBodies.go | 16 ++++---- internal/repository/privilege/privilege.go | 37 +++++++++++++++++ 5 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 internal/controller/privilege_internal/validate.go create mode 100644 internal/errors/repository.go diff --git a/internal/controller/privilege_internal/controller.go b/internal/controller/privilege_internal/controller.go index 8788794..223e4b3 100644 --- a/internal/controller/privilege_internal/controller.go +++ b/internal/controller/privilege_internal/controller.go @@ -1,8 +1,11 @@ package privilege_internal import ( + "errors" "github.com/gofiber/fiber/v2" "go.uber.org/zap" + our_errors "hub_admin_backend_service/internal/errors" + "hub_admin_backend_service/internal/models" "hub_admin_backend_service/internal/repository/privilege" "net/http" ) @@ -35,11 +38,39 @@ func (p *PrivilegeInternal) Get(c *fiber.Ctx) error { // хаб нода registerPrivilege func (p *PrivilegeInternal) Create(c *fiber.Ctx) error { - return c.SendStatus(http.StatusCreated) + var req models.CreateUpdateReq + if err := c.BodyParser(&req); err != nil { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"}) + } + + if !Validate(req) { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Missing required fields"}) + } + + result, err := p.repo.Create(c.Context(), &req) + if err != nil { + switch { + case errors.Is(err, our_errors.ErrAlreadyExist): + return c.Status(fiber.StatusConflict).JSON(fiber.Map{"error": "Privilege already exist"}) + default: + return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()}) + } + } + + return c.Status(fiber.StatusOK).JSON(result) } // хаб нода replacePrivilege func (p *PrivilegeInternal) Update(c *fiber.Ctx) error { + var req models.CreateUpdateReq + if err := c.BodyParser(&req); err != nil { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"}) + } + + if !Validate(req) { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Missing required fields"}) + } + return c.SendStatus(http.StatusOK) } @@ -60,11 +91,19 @@ func (p *PrivilegeInternal) GetByService(c *fiber.Ctx) error { // хаб нода registerPrivileges func (p *PrivilegeInternal) PostMany(c *fiber.Ctx) error { + var req models.ManyCreateUpdate + if err := c.BodyParser(&req); err != nil { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"}) + } return c.SendStatus(http.StatusCreated) } // хаб нода replacePrivileges func (p *PrivilegeInternal) UpdateMany(c *fiber.Ctx) error { + var req models.ManyCreateUpdate + if err := c.BodyParser(&req); err != nil { + return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"}) + } return c.SendStatus(http.StatusOK) } diff --git a/internal/controller/privilege_internal/validate.go b/internal/controller/privilege_internal/validate.go new file mode 100644 index 0000000..764d508 --- /dev/null +++ b/internal/controller/privilege_internal/validate.go @@ -0,0 +1,13 @@ +package privilege_internal + +import ( + "hub_admin_backend_service/internal/models" +) + +func Validate(req models.CreateUpdateReq) bool { + if req.Name == "" || req.PrivilegeId == "" || req.ServiceKey == "" || req.Type == "" || req.Value == "" || req.Description == "" { + return false + } + + return true +} diff --git a/internal/errors/repository.go b/internal/errors/repository.go new file mode 100644 index 0000000..7f60eb5 --- /dev/null +++ b/internal/errors/repository.go @@ -0,0 +1,8 @@ +package errors + +import "errors" + +var ( + ErrAlreadyExist = errors.New("already exist") + ErrNotFound = errors.New("not found") +) diff --git a/internal/models/reqBodies.go b/internal/models/reqBodies.go index 53e5722..ec096e3 100644 --- a/internal/models/reqBodies.go +++ b/internal/models/reqBodies.go @@ -1,14 +1,14 @@ package models type CreateUpdateReq struct { - Name string `json:"name"` - PrivilegeId string `json:"privilegeId"` - ServiceKey string `json:"serviceKey"` - Description string `json:"description"` - Type string `json:"type"` - Value string `json:"value"` - Price int `json:"price"` - Amount int `json:"amount"` + Name string `json:"name"` + PrivilegeId string `json:"privilegeId"` + ServiceKey string `json:"serviceKey"` + Description string `json:"description"` + Type string `json:"type"` + Value string `json:"value"` + Price float64 `json:"price"` + Amount int `json:"amount"` } type ManyCreateUpdate struct { diff --git a/internal/repository/privilege/privilege.go b/internal/repository/privilege/privilege.go index 4fab428..442f34e 100644 --- a/internal/repository/privilege/privilege.go +++ b/internal/repository/privilege/privilege.go @@ -3,10 +3,13 @@ package privilege import ( "context" "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.uber.org/zap" + "hub_admin_backend_service/internal/errors" "hub_admin_backend_service/internal/models" + "time" ) type Deps struct { @@ -45,3 +48,37 @@ func (p *Privilege) GetAllPrivileges(ctx context.Context) ([]models.Privilege, e return privileges, nil } + +func (p *Privilege) Create(ctx context.Context, req *models.CreateUpdateReq) (*models.Privilege, error) { + exist := &models.Privilege{} + err := p.mdb.FindOne(ctx, bson.M{"privilegeId": req.PrivilegeId}).Decode(exist) + if err == nil { + return nil, errors.ErrAlreadyExist + } else if err != mongo.ErrNoDocuments { + p.logger.Error("Failed to check existing privilege", zap.Error(err)) + return nil, err + } + + privilege := &models.Privilege{ + ID: primitive.NewObjectID(), + Name: req.Name, + PrivilegeID: req.PrivilegeId, + ServiceKey: req.ServiceKey, + Description: req.Description, + Type: req.Type, + Value: req.Value, + Price: req.Price, + // amount в хабе не вставляется + Amount: req.Amount, + CreatedAt: time.Now(), + IsDeleted: false, + } + + _, err = p.mdb.InsertOne(ctx, privilege) + if err != nil { + p.logger.Error("Failed to create privilege", zap.Error(err)) + return nil, err + } + + return privilege, nil +}