make values in StatsSummaryData optional (they are for hourly data)

Author: kean

Sources/WordPressKit/Models/Stats/Time Interval/StatsSummaryTimeIntervalData.swift

@@ -35,18 +35,18 @@ public struct StatsSummaryData {
     public let period: StatsPeriodUnit
     public let periodStartDate: Date
 
-    public let viewsCount: Int
-    public let visitorsCount: Int
-    public let likesCount: Int
-    public let commentsCount: Int
+    public let viewsCount: Int?
+    public let visitorsCount: Int?
+    public let likesCount: Int?
+    public let commentsCount: Int?
     public let postsCount: Int?
 
     public init(period: StatsPeriodUnit,
                 periodStartDate: Date,
-                viewsCount: Int,
-                visitorsCount: Int,
-                likesCount: Int,
-                commentsCount: Int,
+                viewsCount: Int?,
+                visitorsCount: Int?,
+                likesCount: Int?,
+                commentsCount: Int?,
                 postsCount: Int?) {
         self.period = period
         self.periodStartDate = periodStartDate
@@ -91,14 +91,8 @@ extension StatsSummaryTimeIntervalData: StatsTimeIntervalData {
         // [["2019-01-01", 9001, 1234], ["2019-02-01", 1234, 1234]], where the first object in the "inner" array
         // is the `period`, second is `views`, etc.
 
-        guard
-            let periodIndex = fieldsArray.firstIndex(of: "period"),
-            let viewsIndex = fieldsArray.firstIndex(of: "views"),
-            let visitorsIndex = fieldsArray.firstIndex(of: "visitors"),
-            let commentsIndex = fieldsArray.firstIndex(of: "comments"),
-            let likesIndex = fieldsArray.firstIndex(of: "likes")
-            else {
-                return nil
+        guard let periodIndex = fieldsArray.firstIndex(of: "period") else {
+            return nil
         }
 
         self.period = period
@@ -109,86 +103,46 @@ extension StatsSummaryTimeIntervalData: StatsTimeIntervalData {
                 dataArray: $0,
                 period: unit ?? period,
                 periodIndex: periodIndex,
-                viewsIndex: viewsIndex,
-                visitorsIndex: visitorsIndex,
-                likesIndex: likesIndex,
-                commentsIndex: commentsIndex,
+                viewsIndex: fieldsArray.firstIndex(of: "views"),
+                visitorsIndex: fieldsArray.firstIndex(of: "visitors"),
+                likesIndex: fieldsArray.firstIndex(of: "likes"),
+                commentsIndex: fieldsArray.firstIndex(of: "comments"),
                 postsIndex: fieldsArray.firstIndex(of: "posts")
             )
         }
     }
 }
 
 private extension StatsSummaryData {
-    init?(dataArray: [Any],
-          period: StatsPeriodUnit,
-          periodIndex: Int,
-          viewsIndex: Int?,
-          visitorsIndex: Int?,
-          likesIndex: Int?,
-          commentsIndex: Int?,
-          postsIndex: Int?) {
-
+    init?(
+        dataArray: [Any],
+        period: StatsPeriodUnit,
+        periodIndex: Int,
+        viewsIndex: Int?,
+        visitorsIndex: Int?,
+        likesIndex: Int?,
+        commentsIndex: Int?,
+        postsIndex: Int?
+    ) {
         guard
             let periodString = dataArray[periodIndex] as? String,
             let periodStart = type(of: self).parsedDate(from: periodString, for: period) else {
                 return nil
         }
 
-        let viewsCount: Int
-        let visitorsCount: Int
-        let likesCount: Int
-        let commentsCount: Int
-        var postsCount: Int?
-
-        if let viewsIndex = viewsIndex {
-            guard let count = dataArray[viewsIndex] as? Int else {
-                return nil
-            }
-            viewsCount = count
-        } else {
-            viewsCount = 0
-        }
-
-        if let visitorsIndex = visitorsIndex {
-            guard let count = dataArray[visitorsIndex] as? Int else {
-                return nil
-            }
-            visitorsCount = count
-        } else {
-            visitorsCount = 0
-        }
-
-        if let likesIndex = likesIndex {
-            guard let count = dataArray[likesIndex] as? Int else {
-                return nil
-            }
-            likesCount = count
-        } else {
-            likesCount = 0
-        }
-
-        if let commentsIndex = commentsIndex {
-            guard let count = dataArray[commentsIndex] as? Int else {
-                return nil
-            }
-            commentsCount = count
-        } else {
-            commentsCount = 0
-        }
-
-        if let postsIndex {
-            postsCount = dataArray[postsIndex] as? Int
+        func getValue(at index: Int?) -> Int? {
+            guard let index else { return nil }
+            return dataArray[index] as? Int
         }
 
         self.period = period
         self.periodStartDate = periodStart
 
-        self.viewsCount = viewsCount
-        self.visitorsCount = visitorsCount
-        self.likesCount = likesCount
-        self.commentsCount = commentsCount
-        self.postsCount = postsCount
+        self.viewsCount = getValue(at: viewsIndex)
+        self.visitorsCount = getValue(at: visitorsIndex)
+        self.likesCount = getValue(at: likesIndex)
+        self.commentsCount = getValue(at: commentsIndex)
+        self.postsCount = getValue(at: postsIndex)
     }
 
     static func parsedDate(from dateString: String, for period: StatsPeriodUnit) -> Date? {

Tests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift

@@ -637,19 +637,19 @@ class StatsRemoteV2Tests: RemoteTestCase, RESTTestable {
 
             XCTAssertEqual(summary?.summaryData.count, 10)
 
-            XCTAssertEqual(summary?.summaryData[0].viewsCount, 0)
-            XCTAssertEqual(summary?.summaryData[0].visitorsCount, 0)
+            XCTAssertNil(summary?.summaryData[0].viewsCount)
+            XCTAssertNil(summary?.summaryData[0].visitorsCount)
             XCTAssertEqual(summary?.summaryData[0].likesCount, 72)
-            XCTAssertEqual(summary?.summaryData[0].commentsCount, 0)
+            XCTAssertNil(summary?.summaryData[0].commentsCount)
 
             let may1 = DateComponents(year: 2018, month: 5, day: 1)
             let may1Date = Calendar.autoupdatingCurrent.date(from: may1)!
             XCTAssertEqual(summary?.summaryData[0].periodStartDate, may1Date)
 
-            XCTAssertEqual(summary?.summaryData[9].viewsCount, 0)
-            XCTAssertEqual(summary?.summaryData[9].visitorsCount, 0)
+            XCTAssertNil(summary?.summaryData[9].viewsCount)
+            XCTAssertNil(summary?.summaryData[9].visitorsCount)
             XCTAssertEqual(summary?.summaryData[9].likesCount, 116)
-            XCTAssertEqual(summary?.summaryData[9].commentsCount, 0)
+            XCTAssertNil(summary?.summaryData[9].commentsCount)
 
             let nineMonthsFromMay1 = Calendar.autoupdatingCurrent.date(byAdding: .month, value: 9, to: may1Date)!