Undo refactoring for Meta search

weni-ai · Nov 14, 2024 · 406807a · 406807a
1 parent 5d01e61
commit 406807a
Showing 1 changed file with 42 additions and 60 deletions.
diff --git a/services/external/weni/service.go b/services/external/weni/service.go
@@ -193,29 +193,14 @@ func (s *service) Call(session flows.Session, params assets.MsgCatalogParam, log
 		}
 	}
 
-	retries := 2
-	var productSections []flows.ProductEntry
-	var tracesMeta []*httpx.Trace
-	for i := 0; i < retries; i++ {
-		productSections, tracesMeta, err = ProductsSearchMeta(callResult.ProductRetailerIDS, fmt.Sprint(catalog.FacebookCatalogID()), s.rtConfig.WhatsappSystemUserToken)
-		callResult.Traces = append(callResult.Traces, tracesMeta...)
-		if err != nil {
-			continue
-		}
-		break
-	}
-	if err != nil {
-		return callResult, err
-	}
-
 	finalResult := &flows.MsgCatalogCall{}
 	finalResult.Traces = callResult.Traces
 	finalResult.ResponseJSON = callResult.ResponseJSON
 	if hasSponsored {
 		finalResult.ProductRetailerIDS = allProductsSponsored
 	}
 
-	for _, productEntry := range productSections {
+	for _, productEntry := range callResult.ProductRetailerIDS {
 		newEntry := productEntry
 		newEntry.ProductRetailerIDs = []string{}
 		for _, productRetailerID := range productEntry.ProductRetailerIDs {
@@ -239,6 +224,22 @@ func (s *service) Call(session flows.Session, params assets.MsgCatalogParam, log
 		}
 	}
 
+	retries := 2
+	var newProductRetailerIDS []flows.ProductEntry
+	var tracesMeta []*httpx.Trace
+	for i := 0; i < retries; i++ {
+		newProductRetailerIDS, tracesMeta, err = ProductsSearchMeta(finalResult.ProductRetailerIDS, fmt.Sprint(catalog.FacebookCatalogID()), s.rtConfig.WhatsappSystemUserToken)
+		finalResult.Traces = append(finalResult.Traces, tracesMeta...)
+		if err != nil {
+			continue
+		}
+		break
+	}
+	if err != nil {
+		return finalResult, err
+	}
+	finalResult.ProductRetailerIDS = newProductRetailerIDS
+
 	return finalResult, nil
 }
 
@@ -732,7 +733,6 @@ func fetchProducts(url string) (*Response, *httpx.Trace, error) {
 	}
 
 	t, err := httpx.DoTrace(client, req, nil, nil, -1)
-	t.Request.URL = truncateURL(t.Request.URL)
 	if err != nil {
 		return nil, t, err
 	}
@@ -753,44 +753,39 @@ func fetchProducts(url string) (*Response, *httpx.Trace, error) {
 
 func ProductsSearchMeta(productEntryList []flows.ProductEntry, catalog string, whatsappSystemUserToken string) ([]flows.ProductEntry, []*httpx.Trace, error) {
 	traces := []*httpx.Trace{}
-	allIds := []string{}
-	for _, productEntry := range productEntryList {
-		allIds = append(allIds, productEntry.ProductRetailerIDs...)
-	}
+	for i, productEntry := range productEntryList {
+		filter, err := createFilter(productEntry.ProductRetailerIDs)
+		if err != nil {
+			return nil, nil, err
+		}
 
-	filter, err := createFilter(allIds)
-	if err != nil {
-		return nil, nil, err
-	}
+		params := url.Values{}
+		params.Add("fields", "[\"category\",\"name\",\"retailer_id\",\"availability\"]")
+		params.Add("summary", "true")
+		params.Add("access_token", whatsappSystemUserToken)
+		params.Add("filter", filter)
+		url_ := fmt.Sprintf("https://graph.facebook.com/v14.0/%s/products?%s", catalog, params.Encode())
 
-	params := url.Values{}
-	params.Add("fields", "[\"category\",\"name\",\"retailer_id\",\"availability\"]")
-	params.Add("summary", "true")
-	params.Add("access_token", whatsappSystemUserToken)
-	params.Add("filter", filter)
-	url_ := fmt.Sprintf("https://graph.facebook.com/v14.0/%s/products?%s", catalog, params.Encode())
+		response, trace, err := fetchProducts(url_)
+		traces = append(traces, trace)
+		if err != nil {
+			return nil, traces, err
+		}
 
-	response, trace, err := fetchProducts(url_)
-	traces = append(traces, trace)
-	if err != nil {
-		return nil, traces, err
-	}
+		var productRetailerIDs []string
 
+		// Process the data
+		for _, product := range response.Data {
+			productRetailerIDs = append(productRetailerIDs, product.RetailerID)
+		}
+		productEntryList[i].ProductRetailerIDs = productRetailerIDs
+	}
 	newProductEntryList := []flows.ProductEntry{}
 	for _, productEntry := range productEntryList {
-		validProductIds := []string{}
-		for _, retailerId := range productEntry.ProductRetailerIDs {
-			for _, id := range response.Data {
-				if retailerId == id.RetailerID {
-					validProductIds = append(validProductIds, id.RetailerID)
-				}
-			}
-		}
-		if len(validProductIds) > 0 {
-			newProductEntryList = append(newProductEntryList, flows.ProductEntry{Product: productEntry.Product, ProductRetailerIDs: validProductIds})
+		if len(productEntry.ProductRetailerIDs) > 0 {
+			newProductEntryList = append(newProductEntryList, productEntry)
 		}
 	}
-
 	return newProductEntryList, traces, nil
 
 }
@@ -800,16 +795,3 @@ var languages = map[string]string{
 	"por": "Você também pode gostar:",
 	"spa": "También te puede interesar:",
 }
-
-func truncateURL(u *url.URL) *url.URL {
-	const maxLength = 2048
-	if len(u.String()) > maxLength {
-		excessLength := len(u.String()) - maxLength
-		if excessLength < len(u.RawQuery) {
-			u.RawQuery = u.RawQuery[:len(u.RawQuery)-excessLength]
-		} else {
-			u.RawQuery = ""
-		}
-	}
-	return u
-}