From 4732a0ce84056b67ea695ed2d68e94f57550f131 Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Sun, 25 Sep 2022 22:20:42 +0500
Subject: [PATCH] cat bug fix

---
 controllers/ImportController.go | 44 +++++++++------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/controllers/ImportController.go b/controllers/ImportController.go
index 8cf3f08..cb62bda 100644
--- a/controllers/ImportController.go
+++ b/controllers/ImportController.go
@@ -106,15 +106,15 @@ func StartImport(w http.ResponseWriter, route *http.Request) {
 	mainImportWG.Add(len(mainCategories))
 
 	log.Println("Start Product delete")
-	//delete := time.Now()
-	//errDel := gm.DeleteProducts(baza)
-	//deleteElapsed := time.Since(delete)
-	//log.Printf("Delete products took %s", deleteElapsed)
-	//
-	//if errDel != nil {
-	//	http.Error(w, errDel.Error(), http.StatusInternalServerError)
-	//	return
-	//}
+	delete := time.Now()
+	errDel := gm.DeleteProducts(baza)
+	deleteElapsed := time.Since(delete)
+	log.Printf("Delete products took %s", deleteElapsed)
+
+	if errDel != nil {
+		http.Error(w, errDel.Error(), http.StatusInternalServerError)
+		return
+	}
 
 	for _, element := range mainCategories {
 		slug := element.Translations[0].Slug
@@ -215,29 +215,11 @@ func getCats(db *gorm.DB, catIDs []int) ([3]gm.Category, string, error) {
 	var categories [3]gm.Category
 	var keywords string
 
-	if len(mainCategories) > 0 {
-		for index, id := range catIDs {
-			for _, item := range mainCategories {
-				if item.ID == uint(id) {
-					categories[index] = item
-					break
-				}
-			}
-
-		}
-
-	} else {
-		errCat := db.Preload("Translations").Find(&categories, catIDs).Error
-
-		if errCat != nil {
-			log.Println(errCat)
-			return categories, keywords, errCat
-		}
-
+	if errCat := db.Preload("Translations").Find(&categories, catIDs).Error; errCat != nil {
+		log.Println(errCat)
+		return categories, keywords, errCat
 	}
 
-	log.Println(categories)
-
 	for _, cat := range categories {
 		if len(cat.Translations) > 0 && cat.Translations[0].MetaKeywords != "" {
 			translation := cat.Translations[0]
@@ -258,8 +240,6 @@ func ImportProduct(product models.Product, db *gorm.DB) error {
 
 	categories, keywords, errCat := getCats(&tx, product.Categories)
 
-	return tx.Rollback().Error
-
 	if errCat != nil {
 		log.Println("ERR0 Categories" + errCat.Error())
 		tx.Rollback()