diff --git a/gorm_models/product.go b/gorm_models/product.go index 0d69293..79161bb 100644 --- a/gorm_models/product.go +++ b/gorm_models/product.go @@ -112,11 +112,12 @@ func DeleteProducts(db *gorm.DB) error { "LEFT JOIN order_items oi ON p.id = oi.product_id " + "LEFT JOIN order_items op ON p.id = op.parent_id " + "LEFT JOIN wishlist wp ON p.id = wp.product_id " + + "LEFT JOIN wishlist wl ON wl.product_id = p.parent_id " + "JOIN marketplace_products mp ON p.id = mp.product_id "+ - "WHERE oi.id IS NULL AND op.id IS NULL AND wp.id IS NULL AND mp.marketplace_seller_id=1;" + "WHERE oi.id IS NULL AND op.id IS NULL AND wp.id IS NULL AND wl.id IS NULL AND mp.marketplace_seller_id=1;" db.WithContext(ctx).Exec(qb) - db.WithContext(ctx).Exec("UPDATE product_flat set sku=concat(id,\"-ordered\"), status=0 where status=1 AND product_id IN (SELECT product_id from marketplace_products where marketplace_seller_id=1)" ) - db.WithContext(ctx).Exec("UPDATE products set sku=concat(id,\"-ordered\") WHERE id IN (SELECT product_id from marketplace_products where marketplace_seller_id=1)") + //db.WithContext(ctx).Exec("UPDATE product_flat set sku=concat(id,\"-ordered\"), status=0 where status=1 AND product_id IN (SELECT product_id from marketplace_products where marketplace_seller_id=1)" ) + //db.WithContext(ctx).Exec("UPDATE products set sku=concat(id,\"-ordered\") WHERE id IN (SELECT product_id from marketplace_products where marketplace_seller_id=1)") return db.Error } diff --git a/repositories/ImportRepository.go b/repositories/ImportRepository.go index c210eae..7555fe2 100644 --- a/repositories/ImportRepository.go +++ b/repositories/ImportRepository.go @@ -22,7 +22,7 @@ type Importer struct { baza *gorm.DB families []gm.AttributeFamily sellers map[string]gm.MarketplaceSeller - wishlist map[string]gm.Product + //wishlist map[string]gm.Product AttributesMap map[string]gm.Attribute Error error ImportWGroup sync.WaitGroup @@ -46,7 +46,7 @@ func ImporterInstance() (instance *Importer, err error) { instance = &Importer{baza: db} - instance.ImportWGroup.Add(5) + instance.ImportWGroup.Add(4) //load main categories to memory go func(db *gorm.DB) { @@ -119,22 +119,22 @@ func ImporterInstance() (instance *Importer, err error) { }() //load wishlist to memory - go func(){ - defer instance.ImportWGroup.Done() - - var wishlist, err = gm.GetWishlistProducts(db) - - if err != nil { - instance.Error = err - return - } - - instance.wishlist = make(map[string]gm.Product, len(wishlist)) - - for _, product := range wishlist { - instance.wishlist[product.Sku] = product - } - }() + //go func(){ + // defer instance.ImportWGroup.Done() + // + // var wishlist, err = gm.GetWishlistProducts(db) + // + // if err != nil { + // instance.Error = err + // return + // } + // + // instance.wishlist = make(map[string]gm.Product, len(wishlist)) + // + // for _, product := range wishlist { + // instance.wishlist[product.Sku] = product + // } + //}() if instance.Error != nil { log.Println(instance.Error) @@ -371,10 +371,10 @@ func (importer *Importer) ImportProduct(product models.Product) (instance *Impor func (importer *Importer) importVariant(product models.Product) (*gm.Product, error) { // check if wishlisted then update if. - if _, ok := importer.wishlist[product.ProductNumber]; ok { - delete(importer.wishlist,product.ProductNumber) - return importer.updateVariant(product) - } + //if _, ok := importer.wishlist[product.ProductNumber]; ok { + // delete(importer.wishlist,product.ProductNumber) + // return importer.updateVariant(product) + //} productRepo := InitProductRepo(&product, importer.GetColorOption(product.Color), importer.GetSexOption(product.Cinsiyet))