refactor: change how posts are parsed to avoid checking count on the cell

Author: leandroalonso

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Posts/DashboardPostsCardCell.swift

@@ -6,8 +6,8 @@ class DashboardPostsCardCell: UICollectionViewCell, Reusable, BlogDashboardCardC
             return
         }
 
-        let hasDrafts = (dataModel["draft"] as? Array<Any>)?.count ?? 0 > 0
-        let hasScheduled = (dataModel["scheduled"] as? Array<Any>)?.count ?? 0 > 0
+        let hasDrafts = dataModel["show_drafts"] as? Bool ?? false
+        let hasScheduled = dataModel["show_scheduled"] as? Bool ?? false
 
         let postsViewController = PostsCardViewController(blog: blog)
 

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Service/BlogDashboardService.swift

@@ -63,17 +63,22 @@ private extension BlogDashboardService {
         var sections: [DashboardCardSection] = []
         var items: [DashboardCardModel] = []
 
-        let hasDrafts = (posts["draft"] as? Array<Any>)?.count ?? 0 > 0
-        let hasScheduled = (posts["scheduled"] as? Array<Any>)?.count ?? 0 > 0
+        let draftsCount = (posts["draft"] as? Array<Any>)?.count ?? 0
+        let scheduledCount = (posts["scheduled"] as? Array<Any>)?.count ?? 0
+
+        let hasDrafts = draftsCount > 0
+        let hasScheduled = scheduledCount > 0
 
         if hasDrafts && hasScheduled {
-            var drafts = posts.copy() as? [String: Any]
-            drafts?["scheduled"] = []
+            var draft = posts.copy() as? [String: Any]
+            draft?["show_drafts"] = true
+            draft?["show_scheduled"] = false
             sections.append(DashboardCardSection(id: "posts", subtype: "draft"))
-            items.append(DashboardCardModel(id: .posts, cellViewModel: drafts as NSDictionary?))
+            items.append(DashboardCardModel(id: .posts, cellViewModel: draft as NSDictionary?))
 
             var scheduled = posts.copy() as? [String: Any]
-            scheduled?["draft"] = []
+            scheduled?["show_drafts"] = false
+            scheduled?["show_scheduled"] = true
             sections.append(DashboardCardSection(id: "posts", subtype: "scheduled"))
             items.append(DashboardCardModel(id: .posts, cellViewModel: scheduled as NSDictionary?))
         } else {

WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift

@@ -40,11 +40,13 @@ class BlogDashboardServiceTests: XCTestCase {
             // The id is posts
             XCTAssertEqual(snapshot.itemIdentifiers(inSection: draftsSection!).first?.id, .posts)
 
-            // For Drafts section, scheduled has 0 posts
-            XCTAssertEqual((snapshot.itemIdentifiers(inSection: draftsSection!).first?.cellViewModel?["scheduled"] as? [Any])?.count, 0)
+            // For Drafts section
+            XCTAssertFalse(snapshot.itemIdentifiers(inSection: draftsSection!).first?.cellViewModel?["show_scheduled"] as! Bool)
+            XCTAssertTrue(snapshot.itemIdentifiers(inSection: draftsSection!).first?.cellViewModel?["show_drafts"] as! Bool)
 
-            // For Scheduled, draft has 0 posts
-            XCTAssertEqual((snapshot.itemIdentifiers(inSection: scheduledSection!).first?.cellViewModel?["draft"] as? [Any])?.count, 0)
+            // For Scheduled section
+            XCTAssertFalse(snapshot.itemIdentifiers(inSection: scheduledSection!).first?.cellViewModel?["show_drafts"] as! Bool)
+            XCTAssertTrue(snapshot.itemIdentifiers(inSection: scheduledSection!).first?.cellViewModel?["show_scheduled"] as! Bool)
             expect.fulfill()
         }
 
@@ -63,11 +65,11 @@ class BlogDashboardServiceTests: XCTestCase {
             // The item identifier id is posts
             XCTAssertEqual(snapshot.itemIdentifiers(inSection: draftsSection.first!).first?.id, .posts)
 
-            // For Drafts section, scheduled has 0 posts
-            XCTAssertEqual((snapshot.itemIdentifiers(inSection: draftsSection.first!).first?.cellViewModel?["scheduled"] as? [Any])?.count, 0)
+            // For Drafts section, showScheduled is nil
+            XCTAssertFalse(snapshot.itemIdentifiers(inSection: draftsSection.first!).first?.cellViewModel?["show_scheduled"] as! Bool)
 
             // For Drafts section, scheduled has 1 post
-            XCTAssertEqual((snapshot.itemIdentifiers(inSection: draftsSection.first!).first?.cellViewModel?["draft"] as? [Any])?.count, 1)
+            XCTAssertTrue(snapshot.itemIdentifiers(inSection: draftsSection.first!).first?.cellViewModel?["show_drafts"] as! Bool)
 
             expect.fulfill()
         }