diff --git a/internal/controller/privilege_internal/controller.go b/internal/controller/privilege_internal/controller.go index 0eb6bda..16df969 100644 --- a/internal/controller/privilege_internal/controller.go +++ b/internal/controller/privilege_internal/controller.go @@ -3,13 +3,11 @@ package privilege_internal import ( "errors" "github.com/gofiber/fiber/v2" - "go.mongodb.org/mongo-driver/bson/primitive" "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" "hub_admin_backend_service/internal/tools" - "net/http" ) type Deps struct { @@ -232,11 +230,6 @@ func (p *PrivilegeInternal) Restore(c *fiber.Ctx) error { return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "PrivilegeID is required"}) } - _, err := primitive.ObjectIDFromHex(req.ID) - if err != nil { - return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid id"}) - } - result, err := p.repo.RestorePrivilege(c.Context(), req.ID) if err != nil { switch { @@ -248,6 +241,4 @@ func (p *PrivilegeInternal) Restore(c *fiber.Ctx) error { } return c.Status(fiber.StatusOK).JSON(result) - - return c.SendStatus(http.StatusOK) } diff --git a/internal/repository/privilege/privilege.go b/internal/repository/privilege/privilege.go index 6947977..e3302cf 100644 --- a/internal/repository/privilege/privilege.go +++ b/internal/repository/privilege/privilege.go @@ -54,7 +54,7 @@ func (p *Privilege) GetAllPrivileges(ctx context.Context) ([]models.Privilege, e 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) + err := p.mdb.FindOne(ctx, bson.M{"privilegeId": req.PrivilegeId}).Decode(&exist) if err == nil { return models.Privilege{}, errors.ErrAlreadyExist } else if err != mongo.ErrNoDocuments { @@ -86,7 +86,7 @@ func (p *Privilege) Create(ctx context.Context, req models.CreateUpdateReq) (mod func (p *Privilege) Update(ctx context.Context, req models.CreateUpdateReq) (models.Privilege, error) { exist := models.Privilege{} - err := p.mdb.FindOne(ctx, bson.M{"privilegeId": req.PrivilegeId}).Decode(exist) + err := p.mdb.FindOne(ctx, bson.M{"privilegeId": req.PrivilegeId}).Decode(&exist) if err == mongo.ErrNoDocuments { return models.Privilege{}, errors.ErrNotFound } else if err != nil { @@ -196,7 +196,7 @@ func (p *Privilege) PostMany(ctx context.Context, req models.ManyCreateUpdate) ( var privileges []models.Privilege for _, r := range req.Privileges { exist := models.Privilege{} - err := p.mdb.FindOne(ctx, bson.M{"privilegeId": r.PrivilegeId}).Decode(exist) + err := p.mdb.FindOne(ctx, bson.M{"privilegeId": r.PrivilegeId}).Decode(&exist) if err == nil { p.logger.Error("privilege already exists", zap.String("privilegeId", r.PrivilegeId)) return nil, errors.ErrAlreadyExist @@ -267,7 +267,7 @@ func (p *Privilege) UpdateMany(ctx context.Context, req models.ManyCreateUpdate) func (p *Privilege) RestorePrivilege(ctx context.Context, id string) (models.Privilege, error) { exist := models.Privilege{} - err := p.mdb.FindOne(ctx, bson.M{"privilegeId": id}).Decode(exist) + err := p.mdb.FindOne(ctx, bson.M{"privilegeId": id}).Decode(&exist) if err == mongo.ErrNoDocuments { return models.Privilege{}, errors.ErrNotFound } else if err != nil {