Merge pull request #912 from factly/fix/minor-issues

Fix/minor issues
factly · Jul 20, 2023 · a9a1085 · a9a1085
2 parents f5fa2b9 + 710a7ac
commit a9a1085
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/server/service/core/action/category/create.go b/server/service/core/action/category/create.go
@@ -54,13 +54,17 @@ func create(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DecodeError()))
 		return
 	}
-	// Check if parent category exist or not
+
 	categoryService := service.GetCategoryService()
-	_, err = categoryService.GetById(sID, int(category.ParentID))
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage("Parent category does not exist", http.StatusUnprocessableEntity)))
-		return
+
+	if category.ParentID != 0 {
+		// Check if parent category exist or not
+		_, err = categoryService.GetById(sID, int(category.ParentID))
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.GetMessage("Parent category does not exist", http.StatusUnprocessableEntity)))
+			return
+		}
 	}
 
 	result, serviceErr := categoryService.Create(r.Context(), sID, uID, category)

diff --git a/server/service/core/action/category/update.go b/server/service/core/action/category/update.go
@@ -81,12 +81,14 @@ func update(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.RecordNotFound()))
 		return
 	}
-	// Check if parent category exist or not
-	_, err = categoryService.GetById(sID, int(category.ParentID))
-	if err != nil {
-		loggerx.Error(err)
-		errorx.Render(w, errorx.Parser(errorx.GetMessage("Parent category does not exist", http.StatusUnprocessableEntity)))
-		return
+	if category.ParentID != 0 {
+		// Check if parent category exist or not
+		_, err = categoryService.GetById(sID, int(category.ParentID))
+		if err != nil {
+			loggerx.Error(err)
+			errorx.Render(w, errorx.Parser(errorx.GetMessage("Parent category does not exist", http.StatusUnprocessableEntity)))
+			return
+		}
 	}
 	result, serviceErr := categoryService.Update(sID, uID, id, category)
 	if serviceErr != nil {

diff --git a/server/service/fact-check/service/claimant.go b/server/service/fact-check/service/claimant.go
@@ -21,8 +21,8 @@ import (
 )
 
 type claimantPaging struct {
-	Total int64      `json:"total"`
-	Nodes []Claimant `json:"nodes"`
+	Total int64            `json:"total"`
+	Nodes []model.Claimant `json:"nodes"`
 }
 
 // claimant model

diff --git a/server/service/fact-check/service/rating.go b/server/service/fact-check/service/rating.go
@@ -335,7 +335,7 @@ func (rs RatingService) Default(ctx context.Context, sID, uID int, ratings []mod
 			return ratingPaging{}, errorx.Parser(errorx.DecodeError())
 		}
 
-		ratings[i].BackgroundColour, err = util.GetJSONDescription(ratings[i].Description)
+		ratings[i].BackgroundColour, err = util.GetJSONDescription(ratings[i].BackgroundColour)
 		if err != nil {
 			tx.Rollback()
 			loggerx.Error(err)