From 297b4fa2c607c277c8f275f40a8c930468bd8a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20Nevisti=C4=87?= <dario.nevistic8@gmail.com>
Date: Tue, 27 Jul 2021 16:37:20 +0200
Subject: [PATCH] Updating Order with missing fields (#215)

* Update Order struct with API /v2 response fields according to the documentation https://developer.paypal.com/docs/api/orders/v2/\#orders_get

* Add order completed unmarshal response  unit test
---
 types.go     | 19 ++++++++---
 unit_test.go | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/types.go b/types.go
index abfec07..8f9f31a 100644
--- a/types.go
+++ b/types.go
@@ -582,8 +582,15 @@ type (
 	PurchaseUnit struct {
 		ReferenceID        string              `json:"reference_id"`
 		Amount             *PurchaseUnitAmount `json:"amount,omitempty"`
+		Payee              *PayeeForOrders     `json:"payee,omitempty"`
 		Payments           *CapturedPayments   `json:"payments,omitempty"`
 		PaymentInstruction *PaymentInstruction `json:"payment_instruction,omitempty"`
+		Description        string              `json:"description,omitempty"`
+		CustomID           string              `json:"custom_id,omitempty"`
+		InvoiceID          string              `json:"invoice_id,omitempty"`
+		ID                 string              `json:"id,omitempty"`
+		SoftDescriptor     string              `json:"soft_descriptor,omitempty"`
+		Shipping           *ShippingDetail     `json:"shipping,omitempty"`
 	}
 
 	// TaxInfo used for orders.
@@ -712,11 +719,13 @@ type (
 
 	// PayerWithNameAndPhone struct
 	PayerWithNameAndPhone struct {
-		Name         *CreateOrderPayerName `json:"name,omitempty"`
-		EmailAddress string                `json:"email_address,omitempty"`
-		Phone        *PhoneWithType        `json:"phone,omitempty"`
-		PayerID      string                `json:"payer_id,omitempty"`
-		Address      Address               `json:"address,omitempty"`
+		Name         *CreateOrderPayerName          `json:"name,omitempty"`
+		EmailAddress string                         `json:"email_address,omitempty"`
+		Phone        *PhoneWithType                 `json:"phone,omitempty"`
+		PayerID      string                         `json:"payer_id,omitempty"`
+		BirthDate    string                         `json:"birth_date,omitempty"`
+		TaxInfo      *TaxInfo                       `json:"tax_info,omitempty"`
+		Address      *ShippingDetailAddressPortable `json:"address,omitempty"`
 	}
 
 	// CaptureOrderResponse is the response for capture order
diff --git a/unit_test.go b/unit_test.go
index 500c030..deaa067 100644
--- a/unit_test.go
+++ b/unit_test.go
@@ -261,6 +261,98 @@ func TestOrderUnmarshal(t *testing.T) {
 	}
 }
 
+func TestOrderCompletedUnmarshal(t *testing.T) {
+	response := `{
+		"id": "1K412082HD5737736",
+		"status": "COMPLETED",
+		"purchase_units": [
+			{
+				"reference_id": "default",
+				"amount": {
+					"currency_code": "EUR",
+					"value": "99.99"
+				},
+				"payee": {
+					"email_address": "payee@business.example.com",
+					"merchant_id": "7DVPP5Q2RZJQY"
+				},
+				"custom_id": "123456",
+				"soft_descriptor": "PAYPAL *TEST STORE",
+				"shipping": {
+					"name": {
+						"full_name": "John Doe"
+					},
+					"address": {
+						"address_line_1": "Address, Country",
+						"admin_area_2": "Area2",
+						"admin_area_1": "Area1",
+						"postal_code": "123456",
+						"country_code": "US"
+					}
+				},
+				"payments": {
+					"captures": [
+						{
+							"id": "6V864560EH247264J",
+							"status": "COMPLETED",
+							"amount": {
+								"currency_code": "EUR",
+								"value": "99.99"
+							},
+							"final_capture": true,
+							"custom_id": "123456",
+							"create_time": "2021-07-27T09:39:17Z",
+							"update_time": "2021-07-27T09:39:17Z"
+						}
+					]
+				}
+			}
+		],
+		"payer": {
+			"name": {
+				"given_name": "John",
+				"surname": "Doe"
+			},
+			"email_address": "payer@personal.example.com",
+			"payer_id": "7D36CJQ2TUEUU",
+			"address": {
+				"address_line_1": "City, Country",
+				"admin_area_2": "Area2",
+				"admin_area_1": "Area1",
+				"postal_code": "123456",
+				"country_code": "US"
+			}
+		},
+		"create_time": "2021-07-27T09:38:37Z",
+		"update_time": "2021-07-27T09:39:17Z",
+		"links": [
+			{
+				"href": "https://api.sandbox.paypal.com/v2/checkout/orders/1K412082HD5737736",
+				"rel": "self",
+				"method": "GET"
+			}
+		]
+	}`
+
+	order := &Order{}
+	err := json.Unmarshal([]byte(response), order)
+	if err != nil {
+		t.Errorf("Order Unmarshal failed")
+	}
+
+	if order.ID != "1K412082HD5737736" ||
+		order.Status != "COMPLETED" ||
+		order.PurchaseUnits[0].Payee.EmailAddress != "payee@business.example.com" ||
+		order.PurchaseUnits[0].CustomID != "123456" ||
+		order.PurchaseUnits[0].Shipping.Name.FullName != "John Doe" ||
+		order.PurchaseUnits[0].Shipping.Address.AdminArea1 != "Area1" ||
+		order.Payer.Name.GivenName != "John" ||
+		order.Payer.Address.AddressLine1 != "City, Country" ||
+		order.Links[0].Href != "https://api.sandbox.paypal.com/v2/checkout/orders/1K412082HD5737736" {
+		t.Errorf("Order decoded result is incorrect, Given: %+v", order)
+	}
+}
+
 func TestTypePayoutItemResponse(t *testing.T) {
 	response := `{
 		"payout_item_id":"9T35G83YA546X",