Fixing bugs to validate empty response and remove "/" to avoid redirect request

dianibar · dianibar · commit 72fd38bbe9ab · 2024-02-07T11:34:04.000+10:00
diff --git a/internal/provider/attribution.go b/internal/provider/attribution.go
@@ -15,7 +15,7 @@ func (c *ClientTest) CreateAttribution(attribution Attribution) (*Attribution, e
 		return nil, err
 	}
 
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributions/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributions?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	log.Println("URL----------------")
 	log.Println(req.URL)
 	if err != nil {
@@ -47,7 +47,7 @@ func (c *ClientTest) UpdateAttribution(attributionID string, attribution Attribu
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	if err != nil {
 		return nil, err
 	}
@@ -69,7 +69,7 @@ func (c *ClientTest) UpdateAttribution(attributionID string, attribution Attribu
 }
 
 func (c *ClientTest) DeleteAttribution(attributionID string) error {
-	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return err
 	}
@@ -84,7 +84,7 @@ func (c *ClientTest) DeleteAttribution(attributionID string) error {
 
 // GetAttribution - Returns a specifc attribution
 func (c *ClientTest) GetAttribution(orderID string) (*Attribution, error) {
-	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/provider/attribution_group.go b/internal/provider/attribution_group.go
@@ -18,7 +18,7 @@ func (c *ClientTest) CreateAttributionGroup(attributionGroup AttributionGroup) (
 	}
 	log.Println(strings.NewReader(string(rb)))
 
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributiongroups/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributiongroups?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	log.Println("URL:")
 	log.Println(req.URL)
 	if err != nil {
@@ -48,7 +48,7 @@ func (c *ClientTest) UpdateAttributionGroup(attributionGroupID string, attributi
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +65,7 @@ func (c *ClientTest) UpdateAttributionGroup(attributionGroupID string, attributi
 }
 
 func (c *ClientTest) DeleteAttributionGroup(attributionGroupID string) error {
-	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return err
 	}
@@ -80,7 +80,7 @@ func (c *ClientTest) DeleteAttributionGroup(attributionGroupID string) error {
 
 // GetAttributionGroup - Returns a specifc attribution
 func (c *ClientTest) GetAttributionGroup(attributionGroupID string) (*AttributionGroup, error) {
-	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/provider/budget.go b/internal/provider/budget.go
@@ -15,7 +15,7 @@ func (c *ClientTest) CreateBudget(budget Budget) (*Budget, error) {
 		return nil, err
 	}
 
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/budgets/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/budgets?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	log.Println("URL----------------")
 	log.Println(req.URL)
 	if err != nil {
@@ -47,7 +47,7 @@ func (c *ClientTest) UpdateBudget(budgetID string, budget Budget) (*Budget, erro
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/budgets/%s/?customerContext=%s", c.HostURL, budgetID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/budgets/%s?customerContext=%s", c.HostURL, budgetID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,7 @@ func (c *ClientTest) UpdateBudget(budgetID string, budget Budget) (*Budget, erro
 }
 
 func (c *ClientTest) DeleteBudget(budgetID string) error {
-	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/budgets/%s/?customerContext=%s", c.HostURL, budgetID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/budgets/%s?customerContext=%s", c.HostURL, budgetID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func (c *ClientTest) DeleteBudget(budgetID string) error {
 
 // GetBudget - Returns a specifc budget
 func (c *ClientTest) GetBudget(orderID string) (*Budget, error) {
-	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/budgets/%s/?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/budgets/%s?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/provider/client.go b/internal/provider/client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"time"
 
@@ -106,6 +107,11 @@ func (c *ClientTest) doRequest(req *http.Request) ([]byte, error) {
 	retryable := func() error {
 		var errRetry error
 		res, errRetry = operation()
+		if res == nil {
+			log.Println("no response")
+			log.Println(errRetry)
+			return fmt.Errorf("no response")
+		}
 		if res.StatusCode == http.StatusTooManyRequests {
 			return fmt.Errorf("rate limit exceeded")
 		}
diff --git a/internal/provider/report.go b/internal/provider/report.go
@@ -19,7 +19,7 @@ func (c *ClientTest) CreateReport(report Report) (*Report, error) {
 	log.Print("Report body----------------")
 	log.Println(string(rb))
 
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/reports/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/reports?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	log.Println("URL----------------")
 	log.Println(req.URL)
 	if err != nil {
@@ -53,7 +53,7 @@ func (c *ClientTest) UpdateReport(reportID string, report Report) (*Report, erro
 	}
 	log.Print("Report body----------------")
 	log.Println(string(rb))
-	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/reports/%s/?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
+	req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/reports/%s?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), strings.NewReader(string(rb)))
 	if err != nil {
 		return nil, err
 	}
@@ -75,7 +75,7 @@ func (c *ClientTest) UpdateReport(reportID string, report Report) (*Report, erro
 }
 
 func (c *ClientTest) DeleteReport(reportID string) error {
-	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/reports/%s/?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), nil)
+	req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/reports/%s?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), nil)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (c ClientTest) CreateAttribution(attribution Attribution) (Attribution, e`
`15`	`15`	`return nil, err`
`16`	`16`	`}`
`17`	`17`
`18`		`- req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributions/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`18`	`+ req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributions?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`19`	`19`	`log.Println("URL----------------")`
`20`	`20`	`log.Println(req.URL)`
`21`	`21`	`if err != nil {`
`@@ -47,7 +47,7 @@ func (c *ClientTest) UpdateAttribution(attributionID string, attribution Attribu`
`47`	`47`	`if err != nil {`
`48`	`48`	`return nil, err`
`49`	`49`	`}`
`50`		`- req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`50`	`+ req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`51`	`51`	`if err != nil {`
`52`	`52`	`return nil, err`
`53`	`53`	`}`
`@@ -69,7 +69,7 @@ func (c *ClientTest) UpdateAttribution(attributionID string, attribution Attribu`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (c *ClientTest) DeleteAttribution(attributionID string) error {`
`72`		`- req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), nil)`
	`72`	`+ req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, attributionID, c.Auth.CustomerContext), nil)`
`73`	`73`	`if err != nil {`
`74`	`74`	`return err`
`75`	`75`	`}`
`@@ -84,7 +84,7 @@ func (c *ClientTest) DeleteAttribution(attributionID string) error {`
`84`	`84`
`85`	`85`	`// GetAttribution - Returns a specifc attribution`
`86`	`86`	`func (c ClientTest) GetAttribution(orderID string) (Attribution, error) {`
`87`		`- req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributions/%s/?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)`
	`87`	`+ req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributions/%s?customerContext=%s", c.HostURL, orderID, c.Auth.CustomerContext), nil)`
`88`	`88`	`if err != nil {`
`89`	`89`	`return nil, err`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func (c *ClientTest) CreateAttributionGroup(attributionGroup AttributionGroup) (`
`18`	`18`	`}`
`19`	`19`	`log.Println(strings.NewReader(string(rb)))`
`20`	`20`
`21`		`- req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributiongroups/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`21`	`+ req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/attributiongroups?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`22`	`22`	`log.Println("URL:")`
`23`	`23`	`log.Println(req.URL)`
`24`	`24`	`if err != nil {`
`@@ -48,7 +48,7 @@ func (c *ClientTest) UpdateAttributionGroup(attributionGroupID string, attributi`
`48`	`48`	`if err != nil {`
`49`	`49`	`return nil, err`
`50`	`50`	`}`
`51`		`- req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`51`	`+ req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, err`
`54`	`54`	`}`
`@@ -65,7 +65,7 @@ func (c *ClientTest) UpdateAttributionGroup(attributionGroupID string, attributi`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func (c *ClientTest) DeleteAttributionGroup(attributionGroupID string) error {`
`68`		`- req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)`
	`68`	`+ req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)`
`69`	`69`	`if err != nil {`
`70`	`70`	`return err`
`71`	`71`	`}`
`@@ -80,7 +80,7 @@ func (c *ClientTest) DeleteAttributionGroup(attributionGroupID string) error {`
`80`	`80`
`81`	`81`	`// GetAttributionGroup - Returns a specifc attribution`
`82`	`82`	`func (c ClientTest) GetAttributionGroup(attributionGroupID string) (AttributionGroup, error) {`
`83`		`- req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s/?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)`
	`83`	`+ req, err := http.NewRequest("GET", fmt.Sprintf("%s/analytics/v1/attributiongroups/%s?customerContext=%s", c.HostURL, attributionGroupID, c.Auth.CustomerContext), nil)`
`84`	`84`	`if err != nil {`
`85`	`85`	`return nil, err`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func (c ClientTest) CreateReport(report Report) (Report, error) {`
`19`	`19`	`log.Print("Report body----------------")`
`20`	`20`	`log.Println(string(rb))`
`21`	`21`
`22`		`- req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/reports/?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`22`	`+ req, err := http.NewRequest("POST", fmt.Sprintf("%s/analytics/v1/reports?customerContext=%s", c.HostURL, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`23`	`23`	`log.Println("URL----------------")`
`24`	`24`	`log.Println(req.URL)`
`25`	`25`	`if err != nil {`
`@@ -53,7 +53,7 @@ func (c ClientTest) UpdateReport(reportID string, report Report) (Report, erro`
`53`	`53`	`}`
`54`	`54`	`log.Print("Report body----------------")`
`55`	`55`	`log.Println(string(rb))`
`56`		`- req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/reports/%s/?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
	`56`	`+ req, err := http.NewRequest("PATCH", fmt.Sprintf("%s/analytics/v1/reports/%s?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), strings.NewReader(string(rb)))`
`57`	`57`	`if err != nil {`
`58`	`58`	`return nil, err`
`59`	`59`	`}`
`@@ -75,7 +75,7 @@ func (c ClientTest) UpdateReport(reportID string, report Report) (Report, erro`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func (c *ClientTest) DeleteReport(reportID string) error {`
`78`		`- req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/reports/%s/?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), nil)`
	`78`	`+ req, err := http.NewRequest("DELETE", fmt.Sprintf("%s/analytics/v1/reports/%s?customerContext=%s", c.HostURL, reportID, c.Auth.CustomerContext), nil)`
`79`	`79`	`if err != nil {`
`80`	`80`	`return err`
`81`	`81`	`}`