My Profile

WordPress/Classes/Models/AccountSettings.swift

@@ -15,90 +15,6 @@ struct AccountSettings {
     let language: String    // language
 }
 
-class ManagedAccountSettings: NSManagedObject {
-    static let entityName = "AccountSettings"
-
-    @NSManaged var firstName: String
-    @NSManaged var lastName: String
-    @NSManaged var displayName: String
-    @NSManaged var aboutMe: String
-
-    @NSManaged var username: String
-    @NSManaged var email: String
-    @NSManaged var primarySiteID: Int
-    @NSManaged var webAddress: String
-    @NSManaged var language: String
-
-    @NSManaged var account: WPAccount
-
-    func updateWith(accountSettings: AccountSettings) {
-        firstName = accountSettings.firstName
-        lastName = accountSettings.lastName
-        displayName = accountSettings.displayName
-        aboutMe = accountSettings.aboutMe
-
-        username = accountSettings.username
-        email = accountSettings.email
-        primarySiteID = accountSettings.primarySiteID
-        webAddress = accountSettings.webAddress
-        language = accountSettings.language
-    }
-
-    /**
-    Applies a change to the account settings
-
-    To change a setting, you create a change and apply it to the AccountSettings object.
-    This method will return a new change object to apply if you want to revert the changes (for instance, if they failed to save)
-
-    - returns: the change object needed to revert this change
-    */
-    func applyChange(change: AccountSettingsChange) -> AccountSettingsChange {
-        let reverse = reverseChange(change)
-
-        switch change {
-        case .FirstName(let value):
-            self.firstName = value
-        case .LastName(let value):
-            self.lastName = value
-        case .DisplayName(let value):
-            self.displayName = value
-        case .AboutMe(let value):
-            self.aboutMe = value
-        case .Email(let value):
-            self.email = value
-        case .PrimarySite(let value):
-            self.primarySiteID = value
-        case .WebAddress(let value):
-            self.webAddress = value
-        case .Language(let value):
-            self.language = value
-        }
-
-        return reverse
-    }
-
-    private func reverseChange(change: AccountSettingsChange) -> AccountSettingsChange {
-        switch change {
-        case .FirstName(_):
-            return .FirstName(self.firstName)
-        case .LastName(_):
-            return .LastName(self.lastName)
-        case .DisplayName(_):
-            return .DisplayName(self.displayName)
-        case .AboutMe(_):
-            return .AboutMe(self.aboutMe)
-        case .Email(_):
-            return .Email(self.email)
-        case .PrimarySite(_):
-            return .PrimarySite(self.primarySiteID)
-        case .WebAddress(_):
-            return .WebAddress(self.webAddress)
-        case .Language(_):
-            return .Language(self.language)
-        }
-    }
-}
-
 extension AccountSettings {
     init(managed: ManagedAccountSettings) {
         firstName = managed.firstName
@@ -113,35 +29,3 @@ extension AccountSettings {
         language = managed.language
     }
 }
-
-enum AccountSettingsChange {
-    case FirstName(String)
-    case LastName(String)
-    case DisplayName(String)
-    case AboutMe(String)
-    case Email(String)
-    case PrimarySite(Int)
-    case WebAddress(String)
-    case Language(String)
-
-    var stringValue: String {
-        switch self {
-        case .FirstName(let value):
-            return value
-        case .LastName(let value):
-            return value
-        case .DisplayName(let value):
-            return value
-        case .AboutMe(let value):
-            return value
-        case .Email(let value):
-            return value
-        case .PrimarySite(let value):
-            return String(value)
-        case .WebAddress(let value):
-            return value
-        case .Language(let value):
-            return value
-        }
-    }
-}

WordPress/Classes/Models/ManagedAccountSettings+CoreDataProperties.swift

@@ -0,0 +1,17 @@
+import Foundation
+import CoreData
+
+extension ManagedAccountSettings {
+    @NSManaged var firstName: String
+    @NSManaged var lastName: String
+    @NSManaged var displayName: String
+    @NSManaged var aboutMe: String
+
+    @NSManaged var username: String
+    @NSManaged var email: String
+    @NSManaged var primarySiteID: Int
+    @NSManaged var webAddress: String
+    @NSManaged var language: String
+
+    @NSManaged var account: WPAccount
+}

WordPress/Classes/Models/ManagedAccountSettings.swift

@@ -0,0 +1,105 @@
+import Foundation
+import CoreData
+
+class ManagedAccountSettings: NSManagedObject {
+    static let entityName = "AccountSettings"
+
+    func updateWith(accountSettings: AccountSettings) {
+        firstName = accountSettings.firstName
+        lastName = accountSettings.lastName
+        displayName = accountSettings.displayName
+        aboutMe = accountSettings.aboutMe
+
+        username = accountSettings.username
+        email = accountSettings.email
+        primarySiteID = accountSettings.primarySiteID
+        webAddress = accountSettings.webAddress
+        language = accountSettings.language
+    }
+
+    /**
+     Applies a change to the account settings
+
+     To change a setting, you create a change and apply it to the AccountSettings object.
+     This method will return a new change object to apply if you want to revert the changes (for instance, if they failed to save)
+
+     - returns: the change object needed to revert this change
+     */
+    func applyChange(change: AccountSettingsChange) -> AccountSettingsChange {
+        let reverse = reverseChange(change)
+
+        switch change {
+        case .FirstName(let value):
+            self.firstName = value
+        case .LastName(let value):
+            self.lastName = value
+        case .DisplayName(let value):
+            self.displayName = value
+        case .AboutMe(let value):
+            self.aboutMe = value
+        case .Email(let value):
+            self.email = value
+        case .PrimarySite(let value):
+            self.primarySiteID = value
+        case .WebAddress(let value):
+            self.webAddress = value
+        case .Language(let value):
+            self.language = value
+        }
+
+        return reverse
+    }
+
+    private func reverseChange(change: AccountSettingsChange) -> AccountSettingsChange {
+        switch change {
+        case .FirstName(_):
+            return .FirstName(self.firstName)
+        case .LastName(_):
+            return .LastName(self.lastName)
+        case .DisplayName(_):
+            return .DisplayName(self.displayName)
+        case .AboutMe(_):
+            return .AboutMe(self.aboutMe)
+        case .Email(_):
+            return .Email(self.email)
+        case .PrimarySite(_):
+            return .PrimarySite(self.primarySiteID)
+        case .WebAddress(_):
+            return .WebAddress(self.webAddress)
+        case .Language(_):
+            return .Language(self.language)
+        }
+    }
+}
+
+enum AccountSettingsChange {
+    case FirstName(String)
+    case LastName(String)
+    case DisplayName(String)
+    case AboutMe(String)
+    case Email(String)
+    case PrimarySite(Int)
+    case WebAddress(String)
+    case Language(String)
+
+    var stringValue: String {
+        switch self {
+        case .FirstName(let value):
+            return value
+        case .LastName(let value):
+            return value
+        case .DisplayName(let value):
+            return value
+        case .AboutMe(let value):
+            return value
+        case .Email(let value):
+            return value
+        case .PrimarySite(let value):
+            return String(value)
+        case .WebAddress(let value):
+            return value
+        case .Language(let value):
+            return value
+        }
+    }
+}

WordPress/Classes/Models/WPAccount.h

@@ -4,6 +4,7 @@
 #import "WordPressComApi.h"
 
 @class Blog;
+@class ManagedAccountSettings;
 
 @interface WPAccount : NSManagedObject
 
@@ -21,6 +22,7 @@
 @property (nonatomic, strong)   NSSet       *jetpackBlogs;
 @property (nonatomic, readonly) NSArray     *visibleBlogs;
 @property (nonatomic, strong)   Blog        *defaultBlog;
+@property (nonatomic, strong)   ManagedAccountSettings *managedSettings;
 
 /**
  The OAuth2 auth token for WordPress.com accounts

WordPress/Classes/Models/WPAccount.m

@@ -17,6 +17,7 @@ @implementation WPAccount
 @dynamic displayName;
 @dynamic userID;
 @dynamic avatarURL;
+@dynamic managedSettings;
 @synthesize restApi = _restApi;
 
 #pragma mark - NSManagedObject subclass methods

WordPress/Classes/Networking/AccountSettingsRemote.swift

@@ -0,0 +1,85 @@
+import Foundation
+
+class AccountSettingsRemote: ServiceRemoteREST {
+    func getSettings(success success: AccountSettings -> Void, failure: ErrorType -> Void) {
+        let endpoint = "me/settings"
+        let path = pathForEndpoint(endpoint, withVersion: ServiceRemoteRESTApiVersion_1_1)
+
+        api.GET(path,
+            parameters: nil,
+            success: {
+                operation, responseObject in
+
+                do {
+                    let settings = try self.settingsFromResponse(responseObject)
+                    success(settings)
+                } catch {
+                    failure(error)
+                }
+            },
+            failure: { operation, error in
+                failure(error)
+        })
+    }
+
+    func updateSetting(change: AccountSettingsChange, success: () -> Void, failure: ErrorType -> Void) {
+        let endpoint = "me/settings"
+        let path = pathForEndpoint(endpoint, withVersion: ServiceRemoteRESTApiVersion_1_1)
+        let parameters = [fieldNameForChange(change): change.stringValue]
+
+        api.POST(path,
+            parameters: parameters,
+            success: {
+                operation, responseObject in
+
+                success()
+            },
+            failure: { operation, error in
+                failure(error)
+        })
+    }
+
+    private func settingsFromResponse(responseObject: AnyObject) throws -> AccountSettings {
+        guard let
+            response = responseObject as? [String: AnyObject],
+            firstName = response["first_name"] as? String,
+            lastName = response["last_name"] as? String,
+            displayName = response["display_name"] as? String,
+            aboutMe = response["description"] as? String,
+            username = response["user_login"] as? String,
+            email = response["user_email"] as? String,
+            primarySiteID = response["primary_site_ID"] as? Int,
+            webAddress = response["user_URL"] as? String,
+            language = response["language"] as? String else {
+                DDLogSwift.logError("Error decoding me/settings response: \(responseObject)")
+                throw Error.DecodeError
+        }
+
+        return AccountSettings(firstName: firstName, lastName: lastName, displayName: displayName, aboutMe: aboutMe, username: username, email: email, primarySiteID: primarySiteID, webAddress: webAddress, language: language)
+    }
+
+    private func fieldNameForChange(change: AccountSettingsChange) -> String {
+        switch change {
+        case .FirstName(_):
+            return "first_name"
+        case .LastName(_):
+            return "last_name"
+        case .DisplayName(_):
+            return "display_name"
+        case .AboutMe(_):
+            return "description"
+        case .Email(_):
+            return "email"
+        case .PrimarySite(_):
+            return "primary_site_ID"
+        case .WebAddress(_):
+            return "user_URL"
+        case .Language(_):
+            return "language"
+        }
+    }
+
+    enum Error: ErrorType {
+        case DecodeError
+    }
+}

WordPress/Classes/Services/AccountService.h

@@ -68,7 +68,15 @@ extern NSString *const WPAccountEmailAndDefaultBlogUpdatedNotification;
  @param username the account's username
  @return a `WPAccount` object if there's one for the specified username. Otherwise it returns nil
  */
-- (WPAccount *)findAccountWithUsername:(NSString *)username;
+- (nullable WPAccount *)findAccountWithUsername:(NSString *)username;
+
+/**
+ Returns a WordPress.com account with the specified user ID, if it exists
+
+ @param userID the account's user ID
+ @return a `WPAccount` object if there's one for the specified username. Otherwise it returns nil
+ */
+- (nullable WPAccount *)findAccountWithUserID:(NSNumber *)userID;
 
 /**
  Updates user details including username, email, userID, avatarURL, and default blog.

WordPress/Classes/Services/AccountService.m

@@ -179,6 +179,16 @@ - (WPAccount *)findAccountWithUsername:(NSString *)username
     return [results firstObject];
 }
 
+- (WPAccount *)findAccountWithUserID:(NSNumber *)userID
+{
+    NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:@"Account"];
+    [request setPredicate:[NSPredicate predicateWithFormat:@"userID = %@", userID]];
+    [request setIncludesPendingChanges:YES];
+
+    NSArray *results = [self.managedObjectContext executeFetchRequest:request error:nil];
+    return [results firstObject];
+}
+
 - (void)updateUserDetailsForAccount:(WPAccount *)account success:(void (^)())success failure:(void (^)(NSError *error))failure
 {
     NSAssert(account, @"Account can not be nil");