Merge pull request #17830 from wargcm/issue/6969-email-followers-filter

Add email followers filter to people page

Author: leandroalonso

WordPress/Classes/Models/ManagedPerson.swift

@@ -30,6 +30,8 @@ class ManagedPerson: NSManagedObject {
             return User(managedPerson: self)
         case PersonKind.viewer.rawValue:
             return Viewer(managedPerson: self)
+        case PersonKind.emailFollower.rawValue:
+            return EmailFollower(managedPerson: self)
         default:
             return Follower(managedPerson: self)
         }
@@ -97,3 +99,18 @@ extension Viewer {
                   isSuperAdmin: managedPerson.isSuperAdmin)
     }
 }
+
+extension EmailFollower {
+    init(managedPerson: ManagedPerson) {
+        self.init(ID: Int(managedPerson.userID),
+                  username: managedPerson.username,
+                  firstName: managedPerson.firstName,
+                  lastName: managedPerson.lastName,
+                  displayName: managedPerson.displayName,
+                  role: RemoteRole.follower.slug,
+                  siteID: Int(managedPerson.siteID),
+                  linkedUserID: Int(managedPerson.linkedUserID),
+                  avatarURL: managedPerson.avatarURL.flatMap { URL(string: $0) },
+                  isSuperAdmin: managedPerson.isSuperAdmin)
+    }
+}

WordPress/Classes/Services/PeopleService.swift

@@ -68,6 +68,28 @@ struct PeopleService {
         })
     }
 
+    /// Loads a page of Email Followers associated to the current blog, starting at the specified offset.
+    ///
+    /// - Parameters:
+    ///     - offset: Number of records to skip.
+    ///     - count: Number of records to retrieve. By default set to 20.
+    ///     - success: Closure to be executed on success with the number of followers retrieved and a bool indicating if more are available.
+    ///     - failure: Closure to be executed on failure.
+    ///
+    func loadEmailFollowersPage(_ offset: Int = 0,
+                                count: Int = 20,
+                                success: @escaping ((_ retrieved: Int, _ shouldLoadMore: Bool) -> Void),
+                                failure: ((Error) -> Void)? = nil) {
+        let page = (offset / count) + 1
+        remote.getEmailFollowers(siteID, page: page, max: count, success: { followers, hasMore in
+            self.mergePeople(followers)
+            success(followers.count, hasMore)
+        }, failure: { error in
+            DDLogError(String(describing: error))
+            failure?(error)
+        })
+    }
+
     /// Loads a page of Viewers associated to the current blog, starting at the specified offset.
     ///
     /// - Parameters:
@@ -182,6 +204,30 @@ struct PeopleService {
         context.delete(managedPerson)
     }
 
+    /// Deletes a given EmailFollower.
+    ///
+    /// - Parameters:
+    ///     - person: The email follower that should be deleted
+    ///     - success: Closure to be executed in case of success.
+    ///     - failure: Closure to be executed on error
+    ///
+    func deleteEmailFollower(_ person: EmailFollower, success: (() -> Void)? = nil, failure: ((Error) -> Void)? = nil) {
+        guard let managedPerson = managedPersonFromPerson(person) else {
+            return
+        }
+
+        remote.deleteEmailFollower(siteID, userID: person.ID, success: {
+            success?()
+        }, failure: { error in
+            DDLogError("### Error while deleting follower \(person.ID) from blog \(self.siteID): \(error)")
+
+            self.createManagedPerson(person)
+            failure?(error)
+        })
+
+        context.delete(managedPerson)
+    }
+
     /// Deletes a given Viewer.
     ///
     /// - Parameters: