fix: Update services to use passed in validator over utilities.Valida…

…teData
GenerateNU · Jan 22, 2024 · 5631e1a · 5631e1a
1 parent faac444
commit 5631e1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/backend/src/services/category.go b/backend/src/services/category.go
@@ -3,7 +3,6 @@ package services
 import (
 	"github.com/GenerateNU/sac/backend/src/models"
 	"github.com/GenerateNU/sac/backend/src/transactions"
-	"github.com/GenerateNU/sac/backend/src/utilities"
 	"github.com/go-playground/validator/v10"
 
 	"github.com/gofiber/fiber/v2"
@@ -22,7 +21,7 @@ type CategoryService struct {
 }
 
 func (c *CategoryService) CreateCategory(category models.Category) (*models.Category, error) {
-	if err := utilities.ValidateData(category); err != nil {
+	if err := c.Validate.Struct(category); err != nil {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "failed to validate the data")
 	}
 

diff --git a/backend/src/services/tag.go b/backend/src/services/tag.go
@@ -27,7 +27,7 @@ func (t *TagService) CreateTag(tagBody models.CreateTagRequestBody) (*models.Tag
 		CategoryID: tagBody.CategoryID,
 	}
 
-	if err := utilities.ValidateData(tag); err != nil {
+	if err := t.Validate.Struct(tag); err != nil {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "failed to validate the data")
 	}
 
@@ -56,7 +56,7 @@ func (t *TagService) UpdateTag(id string, tagBody models.UpdateTagRequestBody) (
 		CategoryID: tagBody.CategoryID,
 	}
 
-	if err := utilities.ValidateData(tag); err != nil {
+	if err := t.Validate.Struct(tag); err != nil {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "failed to validate the data")
 	}