Merge pull request #20 from taxjar/line-item-id-type-error

Handle API line item numeric strings in json.Unmarshal
taxjar · Oct 20, 2022 · 73cc5b2 · 73cc5b2
2 parents 7e75fb4 + ee78058
commit 73cc5b2
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 11 deletions.
diff --git a/CreateOrder.go b/CreateOrder.go
@@ -67,7 +67,14 @@ func (client *Config) CreateOrder(params CreateOrderParams) (*CreateOrderRespons
 
 	order := new(CreateOrderResponse)
 	if err := json.Unmarshal(res.([]byte), &order); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "order.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return order, nil

diff --git a/CreateRefund.go b/CreateRefund.go
@@ -44,7 +44,14 @@ func (client *Config) CreateRefund(params CreateRefundParams) (*CreateRefundResp
 
 	refund := new(CreateRefundResponse)
 	if err := json.Unmarshal(res.([]byte), &refund); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "refund.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return refund, nil

diff --git a/DeleteOrder.go b/DeleteOrder.go
@@ -30,7 +30,14 @@ func (client *Config) DeleteOrder(transactionID string, params ...DeleteOrderPar
 
 	order := new(DeleteOrderResponse)
 	if err := json.Unmarshal(res.([]byte), &order); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "order.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return order, nil

diff --git a/DeleteRefund.go b/DeleteRefund.go
@@ -30,7 +30,14 @@ func (client *Config) DeleteRefund(transactionID string, params ...DeleteRefundP
 
 	refund := new(DeleteRefundResponse)
 	if err := json.Unmarshal(res.([]byte), &refund); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "refund.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return refund, nil

diff --git a/ShowOrder.go b/ShowOrder.go
@@ -44,8 +44,14 @@ func (client *Config) ShowOrder(transactionID string, params ...ShowOrderParams)
 
 	order := new(ShowOrderResponse)
 	if err := json.Unmarshal(res.([]byte), &order); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "order.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
-
 	return order, nil
 }
diff --git a/ShowRefund.go b/ShowRefund.go
@@ -49,7 +49,14 @@ func (client *Config) ShowRefund(transactionID string, params ...ShowRefundParam
 
 	refund := new(ShowRefundResponse)
 	if err := json.Unmarshal(res.([]byte), &refund); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "refund.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return refund, nil

diff --git a/UpdateOrder.go b/UpdateOrder.go
@@ -42,7 +42,14 @@ func (client *Config) UpdateOrder(params UpdateOrderParams) (*UpdateOrderRespons
 
 	order := new(UpdateOrderResponse)
 	if err := json.Unmarshal(res.([]byte), &order); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "order.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return order, nil

diff --git a/UpdateRefund.go b/UpdateRefund.go
@@ -43,7 +43,14 @@ func (client *Config) UpdateRefund(params UpdateRefundParams) (*UpdateRefundResp
 
 	refund := new(UpdateRefundResponse)
 	if err := json.Unmarshal(res.([]byte), &refund); err != nil {
-		return nil, err
+		if typeError, ok := err.(*json.UnmarshalTypeError); ok {
+			// Ignores JSON line_item.id type errors due to API's conversion of numeric strings to integers
+			if !(typeError.Field == "refund.line_items.id" && typeError.Value == "number") {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
 
 	return refund, nil

diff --git a/test/LiveToken_test.go b/test/LiveToken_test.go
@@ -198,10 +198,11 @@ var _ = Describe("using a live/sandbox token", func() {
 	})
 
 	Context("UpdateOrder", func() {
-		It("udpates an order", func() {
+		It("updates an order", func() {
 			res, err := client.UpdateOrder(taxjar.UpdateOrderParams{
 				TransactionID: "24",
 				Amount:        161,
+				Shipping:      5,
 				SalesTax:      10.3,
 				LineItems: []taxjar.OrderLineItem{
 					{
@@ -305,6 +306,7 @@ var _ = Describe("using a live/sandbox token", func() {
 			res, err := client.UpdateRefund(taxjar.UpdateRefundParams{
 				TransactionID:          "24-refund",
 				TransactionReferenceID: "24",
+				Amount:                 -116,
 				Shipping:               -5,
 			})
 			Expect(err).NotTo(HaveOccurred())

diff --git a/test/Methods_test.go b/test/Methods_test.go
@@ -254,7 +254,7 @@ var _ = Describe("Method:", func() {
 	})
 
 	Context("UpdateOrder", func() {
-		It("udpates an order", func() {
+		It("updates an order", func() {
 			server.AppendHandlers(ghttp.CombineHandlers(
 				ghttp.VerifyRequest("PUT", "/v2/transactions/orders/24"),
 				ghttp.RespondWith(http.StatusOK, mocks.UpdateOrderJSON),