[v7] Update BTPostalAddress Parameters
#1680
+194
−130
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,30 +3,46 @@ import Foundation | |
| /// Generic postal address | ||
| @objcMembers public class BTPostalAddress: NSObject, Encodable { | ||
|
|
||
| // MARK: - Internal Properties | ||
|
|
||
| // Property names follow the `Braintree_Address` convention as documented at: | ||
| // https://developer.paypal.com/braintree/docs/reference/request/address/create | ||
| let recipientName: String? | ||
| let streetAddress: String? | ||
| let extendedAddress: String? | ||
| let locality: String? | ||
| let countryCodeAlpha2: String? | ||
| let postalCode: String? | ||
| let region: String? | ||
|
|
||
| // MARK: - Initializer | ||
|
|
||
| /// Creats a postal address with all components | ||
| /// - Parameters: | ||
| /// - recipientName: Optional. Recipient name for shipping address. | ||
| /// - streetAddress: Optional. Line 1 of the Address (eg. number, street, etc). | ||
| /// - extendedAddress: Optional. Line 2 of the Address (eg. suite, apt #, etc.). | ||
| /// - locality: Optional. City name | ||
| /// - countryCodeAlpha2: Optional. 2 letter country code. | ||
| /// - postalCode: Optional. Zip code or equivalent is usually required for countries that have them. For a list of countries that do not have postal codes please refer to http://en.wikipedia.org/wiki/Postal_code. | ||
| /// - region: Optional. Either a two-letter state code (for the US), or an ISO-3166-2 country subdivision code of up to three letters. | ||
| public init( | ||
| recipientName: String? = nil, | ||
| streetAddress: String? = nil, | ||
| extendedAddress: String? = nil, | ||
| locality: String? = nil, | ||
| countryCodeAlpha2: String? = nil, | ||
| postalCode: String? = nil, | ||
| region: String? = nil | ||
| ) { | ||
| self.recipientName = recipientName | ||
| self.streetAddress = streetAddress | ||
| self.extendedAddress = extendedAddress | ||
| self.locality = locality | ||
| self.countryCodeAlpha2 = countryCodeAlpha2 | ||
| self.postalCode = postalCode | ||
| self.region = region | ||
| } | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case countryCodeAlpha2 = "country_code" | ||
|
|
@@ -37,4 +53,33 @@ import Foundation | |
| case recipientName = "recipient_name" | ||
| case streetAddress = "line1" | ||
| } | ||
|
|
||
| // MARK: - Helper Method | ||
|
|
||
| /// Returns address components as a dictionary for accessing internal properties across modules | ||
| public func addressComponents() -> [String: String] { | ||
agedd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var components: [String: String] = [:] | ||
| if let recipientName = recipientName { | ||
| components["recipientName"] = recipientName | ||
| } | ||
| if let streetAddress = streetAddress { | ||
| components["streetAddress"] = streetAddress | ||
| } | ||
| if let extendedAddress = extendedAddress { | ||
| components["extendedAddress"] = extendedAddress | ||
| } | ||
| if let locality = locality { | ||
| components["locality"] = locality | ||
| } | ||
| if let countryCodeAlpha2 = countryCodeAlpha2 { | ||
| components["countryCodeAlpha2"] = countryCodeAlpha2 | ||
| } | ||
| if let postalCode = postalCode { | ||
| components["postalCode"] = postalCode | ||
| } | ||
| if let region = region { | ||
| components["region"] = region | ||
| } | ||
| return components | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,12 +57,13 @@ struct LocalPaymentPOSTBody: Encodable { | |
| self.cancelURL = BTCoreConstants.callbackURLScheme + "://x-callback-url/braintree/local-payment/cancel" | ||
|
|
||
| if let address = localPaymentRequest.address { | ||
| let addressComponents = address.addressComponents() | ||
| self.streetAddress = addressComponents["streetAddress"] | ||
| self.extendedAddress = addressComponents["extendedAddress"] | ||
| self.locality = addressComponents["locality"] | ||
| self.countryCodeAlpha2 = addressComponents["countryCodeAlpha2"] | ||
| self.postalCode = addressComponents["postalCode"] | ||
| self.region = addressComponents["region"] | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,13 +79,14 @@ struct PayPalCheckoutPOSTBody: Encodable { | |
| } | ||
|
|
||
| if let shippingAddressOverride = payPalRequest.shippingAddressOverride { | ||
| let addressComponents = shippingAddressOverride.addressComponents() | ||
| self.recipientName = addressComponents["recipientName"] | ||
| self.streetAddress = addressComponents["streetAddress"] | ||
| self.extendedAddress = addressComponents["extendedAddress"] | ||
| self.locality = addressComponents["locality"] | ||
| self.countryCodeAlpha2 = addressComponents["countryCodeAlpha2"] | ||
| self.postalCode = addressComponents["postalCode"] | ||
| self.region = addressComponents["region"] | ||
| } | ||
|
|
||
| if let merchantAccountID = payPalRequest.merchantAccountID { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,14 +64,18 @@ struct SEPADebitRequest: Encodable { | |
| self.mandateType = sepaDirectDebitRequest.mandateType?.description | ||
| self.accountHolderName = sepaDirectDebitRequest.accountHolderName | ||
| self.iban = sepaDirectDebitRequest.iban | ||
|
|
||
| self.billingAddress = sepaDirectDebitRequest.billingAddress.map { postalAddress in | ||
| let components = postalAddress.addressComponents() | ||
| return BillingAddress( | ||
| streetAddress: components["streetAddress"], | ||
| extendedAddress: components["extendedAddress"], | ||
| locality: components["locality"], | ||
| region: components["region"], | ||
| postalCode: components["postalCode"], | ||
| countryCodeAlpha2: components["countryCodeAlpha2"] | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,22 +3,25 @@ import BraintreeCore | |
|
|
||
| class BTPostalAddress_Tests: XCTestCase { | ||
|
|
||
| func testInitializer_setsAllProperties() { | ||
| let postalAddress = BTPostalAddress( | ||
| recipientName: "Jane Smith", | ||
| streetAddress: "555 Smith St.", | ||
| extendedAddress: "#5", | ||
| locality: "Oakland", | ||
| countryCodeAlpha2: "US", | ||
| postalCode: "54321", | ||
| region: "CA" | ||
| ) | ||
|
|
||
| let addressComponents = postalAddress.addressComponents() | ||
|
|
||
| XCTAssertEqual(addressComponents["recipientName"], "Jane Smith") | ||
| XCTAssertEqual(addressComponents["streetAddress"], "555 Smith St.") | ||
| XCTAssertEqual(addressComponents["extendedAddress"], "#5") | ||
| XCTAssertEqual(addressComponents["locality"], "Oakland") | ||
| XCTAssertEqual(addressComponents["region"], "CA") | ||
| XCTAssertEqual(addressComponents["countryCodeAlpha2"], "US") | ||
| XCTAssertEqual(addressComponents["postalCode"], "54321") | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,13 +88,14 @@ class BTLocalPaymentClient_UnitTests: XCTestCase { | |
| ] | ||
| ) | ||
|
|
||
| let postalAddress = BTPostalAddress( | ||
| streetAddress: "836486 of 22321 Park Lake", | ||
| extendedAddress: "#102", | ||
| locality: "Den Haag", | ||
| countryCodeAlpha2: "NL", | ||
| postalCode: "2585 GJ", | ||
| region: "CA" | ||
| ) | ||
|
|
||
| let paymentRequest = BTLocalPaymentRequest( | ||
| paymentType: "ideal", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,14 +89,15 @@ class BTPayPalCheckoutRequest_Tests: XCTestCase { | |
| request.userAuthenticationEmail = "[email protected]" | ||
| request.userPhoneNumber = BTPayPalPhoneNumber(countryCode: "1", nationalNumber: "4087463271") | ||
|
|
||
| let shippingAddress = BTPostalAddress( | ||
| recipientName: "Recipient", | ||
| streetAddress: "123 Main", | ||
| extendedAddress: "Unit 1", | ||
| locality: "Chicago", | ||
| countryCodeAlpha2: "US", | ||
| postalCode: "11111", | ||
| region: "IL" | ||
| ) | ||
| request.shippingAddressOverride = shippingAddress | ||
| request.isShippingAddressEditable = true | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,14 +56,15 @@ class BTPayPalVaultRequest_Tests: XCTestCase { | |
| let request = BTPayPalVaultRequest() | ||
| request.billingAgreementDescription = "desc" | ||
|
|
||
| let shippingAddress = BTPostalAddress( | ||
| recipientName: "Recipient", | ||
| streetAddress: "123 Main", | ||
| extendedAddress: "Unit 1", | ||
| locality: "Chicago", | ||
| countryCodeAlpha2: "US", | ||
| postalCode: "11111", | ||
| region: "IL" | ||
| ) | ||
| request.shippingAddressOverride = shippingAddress | ||
| request.isShippingAddressEditable = true | ||
| request.offerCredit = true | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,20 +6,23 @@ import AuthenticationServices | |
|
|
||
| class BTSEPADirectDebitClient_Tests: XCTestCase { | ||
|
|
||
| var billingAddress: BTPostalAddress! | ||
| var sepaDirectDebitRequest: BTSEPADirectDebitRequest! | ||
|
|
||
| var mockAPIClient : MockAPIClient = MockAPIClient(authorization: "development_client_key") | ||
| let authorization: String = "sandbox_9dbg82cq_dcpspy2brwdjr3qn" | ||
|
|
||
| override func setUp() { | ||
| mockAPIClient = MockAPIClient(authorization: authorization) | ||
|
|
||
| billingAddress = BTPostalAddress( | ||
| streetAddress: "Kantstraße 70", | ||
| extendedAddress: "#170", | ||
| locality: "Freistaat Sachsen", | ||
| countryCodeAlpha2: "FR", | ||
| postalCode: "09456", | ||
| region: "Annaberg-buchholz" | ||
| ) | ||
|
|
||
| sepaDirectDebitRequest = BTSEPADirectDebitRequest( | ||
| accountHolderName: "John Doe", | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: do we care about alphabetical order here?
BraintreeCorebeforeBraintreePayPal?