Update StatsCommentsInsight to use Codable

Author: staskus

WordPressKit/Insights/StatsCommentsInsight.swift

@@ -1,4 +1,4 @@
-public struct StatsCommentsInsight {
+public struct StatsCommentsInsight: Codable {
     public let topPosts: [StatsTopCommentsPost]
     public let topAuthors: [StatsTopCommentsAuthor]
 
@@ -7,6 +7,11 @@ public struct StatsCommentsInsight {
         self.topPosts = topPosts
         self.topAuthors = topAuthors
     }
+
+    private enum CodingKeys: String, CodingKey {
+        case topPosts = "posts"
+        case topAuthors = "authors"
+    }
 }
 
 extension StatsCommentsInsight: StatsInsightData {
@@ -17,23 +22,17 @@ extension StatsCommentsInsight: StatsInsightData {
     }
 
     public init?(jsonDictionary: [String: AnyObject]) {
-        guard
-            let posts = jsonDictionary["posts"] as? [[String: AnyObject]],
-            let authors = jsonDictionary["authors"] as? [[String: AnyObject]]
-            else {
-                return nil
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: jsonDictionary, options: [])
+            let decoder = JSONDecoder()
+            self = try decoder.decode(StatsCommentsInsight.self, from: jsonData)
+        } catch {
+            return nil
         }
-
-        let topPosts = posts.compactMap { StatsTopCommentsPost(jsonDictionary: $0) }
-        let topAuthors = authors.compactMap { StatsTopCommentsAuthor(jsonDictionary: $0) }
-
-        self.topPosts = topPosts
-        self.topAuthors = topAuthors
     }
-
 }
 
-public struct StatsTopCommentsAuthor {
+public struct StatsTopCommentsAuthor: Codable {
     public let name: String
     public let commentCount: Int
     public let iconURL: URL?
@@ -45,9 +44,15 @@ public struct StatsTopCommentsAuthor {
         self.commentCount = commentCount
         self.iconURL = iconURL
     }
+
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case commentCount = "comments"
+        case iconURL = "gravatar"
+    }
 }
 
-public struct StatsTopCommentsPost {
+public struct StatsTopCommentsPost: Codable {
     public let name: String
     public let postID: String
     public let commentCount: Int
@@ -62,26 +67,34 @@ public struct StatsTopCommentsPost {
         self.commentCount = commentCount
         self.postURL = postURL
     }
+
+    private enum CodingKeys: String, CodingKey {
+        case name
+        case postID = "id"
+        case commentCount = "comments"
+        case postURL = "link"
+    }
 }
 
 private extension StatsTopCommentsAuthor {
-    init?(jsonDictionary: [String: AnyObject]) {
-        guard
-            let name = jsonDictionary["name"] as? String,
-            let avatar = jsonDictionary["gravatar"] as? String,
-            let comments = jsonDictionary["comments"] as? String,
-            let commentCount = Int(comments)
-            else {
-                return nil
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(String.self, forKey: .name)
+        let commentCount: Int
+        if let comments = try? container.decodeIfPresent(String.self, forKey: .commentCount) {
+            commentCount = Int(comments) ?? 0
+        } else {
+            commentCount = 0
         }
+        let iconURL = try container.decodeIfPresent(String.self, forKey: .iconURL)
 
-        self.init(name: name, avatar: avatar, commentCount: commentCount)
+        self.init(name: name, avatar: iconURL, commentCount: commentCount)
     }
 
-    init?(name: String, avatar: String, commentCount: Int) {
+    init(name: String, avatar: String?, commentCount: Int) {
         let url: URL?
 
-        if var components = URLComponents(string: avatar) {
+        if let avatar, var components = URLComponents(string: avatar) {
             components.query = "d=mm&s=60" // to get a properly-sized avatar.
             url = components.url
         } else {
@@ -95,20 +108,18 @@ private extension StatsTopCommentsAuthor {
 }
 
 private extension StatsTopCommentsPost {
-    init?(jsonDictionary: [String: AnyObject]) {
-        guard
-            let name = jsonDictionary["name"] as? String,
-            let postID = jsonDictionary["id"] as? String,
-            let commentString = jsonDictionary["comments"] as? String,
-            let commentCount = Int(commentString),
-            let postURL = jsonDictionary["link"] as? String
-            else {
-                return nil
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(String.self, forKey: .name)
+        let postID = try container.decode(String.self, forKey: .postID)
+        let commentCount: Int
+        if let comments = try? container.decodeIfPresent(String.self, forKey: .commentCount) {
+            commentCount = Int(comments) ?? 0
+        } else {
+            commentCount = 0
         }
+        let postURL = try container.decodeIfPresent(URL.self, forKey: .postURL)
 
-        self.init(name: name,
-                  postID: postID,
-                  commentCount: commentCount,
-                  postURL: URL(string: postURL))
+        self.init(name: name, postID: postID, commentCount: commentCount, postURL: postURL)
     }
 }