Merge pull request #73 from uphold/feature/has-marketing-consent

Add `hasMarketingConsent` setting
uphold · May 23, 2018 · 5ac89e4 · 5ac89e4
2 parents f51e3a3 + aefd8e4
commit 5ac89e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/Source/Model/User/UserSettings.swift b/Source/Model/User/UserSettings.swift
@@ -7,6 +7,9 @@ open class UserSettings: Mappable {
     /// The user's default currency.
     open private(set) var currency: String?
 
+    /// A boolean indicating if the user has the marketing consent enabled.
+    open private(set) var hasMarketingConsent: Bool?
+
     /// A boolean indicating if the user has the news subscription enabled.
     open private(set) var hasNewsSubscription: Bool?
 
@@ -23,12 +26,13 @@ open class UserSettings: Mappable {
       Constructor.
 
       - parameter currency: The user's default currency.
+      - parameter hasMarketingConsent: A boolean indicating if the user has the marketing consent enabled.
       - parameter hasNewsSubscription: A boolean indicating if the user has the news subscription enabled.
       - parameter intl: The user internationalization settings.
       - parameter otp: The user otp settings.
       - parameter theme: The user theme.
     */
-    public init(currency: String, hasNewsSubscription: Bool, intl: InternationalizationUserSettings, otp: Otp, theme: String) {
+    public init(currency: String, hasMarketingConsent: Bool, hasNewsSubscription: Bool, intl: InternationalizationUserSettings, otp: Otp, theme: String) {
         self.currency = currency
         self.hasNewsSubscription = hasNewsSubscription
         self.intl = intl
@@ -53,6 +57,7 @@ open class UserSettings: Mappable {
     */
     open func mapping(map: Map) {
         currency  <- map["currency"]
+        hasMarketingConsent  <- map["hasMarketingConsent"]
         hasNewsSubscription  <- map["hasNewsSubscription"]
         intl  <- map["intl"]
         otp  <- map["otp"]

diff --git a/Tests/IntegrationTests/ClientTests/UpholdClientTest.swift b/Tests/IntegrationTests/ClientTests/UpholdClientTest.swift
@@ -185,6 +185,7 @@ class UpholdClientTest: UpholdTestCase {
             "\"settings\": {" +
                 "\"theme\": \"minimalistic\"," +
                 "\"currency\": \"USD\"," +
+                "\"hasMarketingConsent\": true," +
                 "\"hasNewsSubscription\": true," +
                 "\"intl\": {" +
                     "\"language\": {" +
@@ -268,6 +269,7 @@ class UpholdClientTest: UpholdTestCase {
             XCTAssertEqual(user.memberAt, "bizdev", "Failed: User memberAt didn't match.")
             XCTAssertEqual(user.name, "Foo Bar", "Failed: User name didn't match.")
             XCTAssertEqual(user.settings!.currency!, "USD", "Failed: User settings currency didn't match.")
+            XCTAssertTrue(user.settings!.hasMarketingConsent!, "Failed: User settings hasMarketingConsent didn't match.")
             XCTAssertTrue(user.settings!.hasNewsSubscription!, "Failed: User settings hasNewsSubscription didn't match.")
             XCTAssertEqual(user.settings!.intl!.dateTimeFormat!.locale!, "en-US", "Failed: User settings intl dateTimeFormat didn't match.")
             XCTAssertEqual(user.settings!.intl!.language!.locale!, "en-US", "Failed: User settings intl language didn't match.")

diff --git a/Tests/IntegrationTests/ModelTests/UserTest.swift b/Tests/IntegrationTests/ModelTests/UserTest.swift
@@ -697,6 +697,7 @@ class UserTest: UpholdTestCase {
             "\"settings\": {" +
                 "\"theme\": \"minimalistic\"," +
                 "\"currency\": \"USD\"," +
+                "\"hasMarketingConsent\": true," +
                 "\"hasNewsSubscription\": true," +
                 "\"intl\": {" +
                     "\"language\": {" +
@@ -777,6 +778,7 @@ class UserTest: UpholdTestCase {
         XCTAssertEqual(user!.lastName!, "bar", "Failed: User last name didn't match.")
         XCTAssertEqual(user!.name!, "Foo Bar", "Failed: User name didn't match.")
         XCTAssertEqual(user!.settings!.currency!, "USD", "Failed: User settings currency didn't match.")
+        XCTAssertTrue(user!.settings!.hasMarketingConsent!, "Failed: User settings hasMarketingConsent didn't match.")
         XCTAssertTrue(user!.settings!.hasNewsSubscription!, "Failed: User settings hasNewsSubscription didn't match.")
         XCTAssertEqual(user!.settings!.intl!.dateTimeFormat!.locale!, "en-US", "Failed: User settings intl dateTimeFormat didn't match.")
         XCTAssertEqual(user!.settings!.intl!.language!.locale!, "en-US", "Failed: User settings intl language didn't match.")

diff --git a/Tests/UtilTests/Fixtures.swift b/Tests/UtilTests/Fixtures.swift
@@ -241,6 +241,7 @@ public class Fixtures {
             "currency": faker.lorem.characters(amount: 3),
             "email": faker.internet.email(),
             "firstName": faker.name.firstName(),
+            "hasMarketingConsent": "true",
             "hasNewsSubscription": "true",
             "internationalizationUserSettingDateTimeFormat": faker.lorem.characters(amount: 5),
             "internationalizationUserSettingLanguage": faker.lorem.characters(amount: 5),
@@ -285,7 +286,7 @@ public class Fixtures {
         let internationalizationUserSettingNumberFormat = InternationalizationUserSetting(locale: fakerFields["internationalizationUserSettingNumberFormat"]!)
         let internationalizationUserSettings = InternationalizationUserSettings(language: internationalizationUserSettingLanguage, dateTimeFormat: internationalizationUserSettingDateTimeFormat, numberFormat: internationalizationUserSettingNumberFormat)
         let otp = Otp(login: Login(enabled: NSString(string: fakerFields["settingsOTPLogin"]!).boolValue), transactions: Transactions(send: Send(enabled: NSString(string: fakerFields["settingsOTPTransactionsSend"]!).boolValue), transfer: Transfer(enabled: NSString(string: fakerFields["settingsOTPTransactionsTransfer"]!).boolValue), withdraw: Withdraw(crypto: Crypto(enabled: NSString(string: fakerFields["settingsOTPTransactionsWithdrawCrypto"]!).boolValue))))
-        let userSettings = UserSettings(currency: fakerFields["currency"]!, hasNewsSubscription: NSString(string: fakerFields["hasNewsSubscription"]!).boolValue, intl: internationalizationUserSettings, otp: otp, theme: fakerFields["theme"]!)
+        let userSettings = UserSettings(currency: fakerFields["currency"]!, hasMarketingConsent: NSString(string: fakerFields["hasMarketingConsent"]!).boolValue, hasNewsSubscription: NSString(string: fakerFields["hasNewsSubscription"]!).boolValue, intl: internationalizationUserSettings, otp: otp, theme: fakerFields["theme"]!)
         let addressVerifications = VerificationParameter(reason: fakerFields["verificationsReasonAddress"]!, status: fakerFields["verificationsStatusAddress"]!)
         let birthdateVerifications = VerificationParameter(reason: fakerFields["verificationsReasonBirthdate"]!, status: fakerFields["verificationsStatusBirthdate"]!)
         let documentsVerifications = VerificationParameter(reason: fakerFields["verificationsReasonDocuments"]!, status: fakerFields["verificationsStatusDocuments"]!)