Rename StatsSiteMetricsResponse and make Metric public

Author: kean

Package.swift

@@ -11,8 +11,8 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "WordPressKit",
-            url: "https://github.com/user-attachments/files/21328988/WordPressKit.zip",
-            checksum: "963e7189b0b2e207267c94138f2b08dd2d26d3fc5cbedae8b38d49a2c1e7d72b"
+            url: "https://github.com/user-attachments/files/21335415/WordPressKit.zip",
+            checksum: "bed68c5416321ef59721805f4bb31ec5fc198b57f73f35250e9b35a5cb5fbd5e"
         ),
     ]
 )

Sources/WordPressKit/Models/Stats/Time Interval/StatsSiteStats.swift renamed to Sources/WordPressKit/Models/Stats/Time Interval/StatsSiteMetricsResponse.swift

@@ -1,11 +1,11 @@
 import Foundation
 
-public struct StatsSiteStats {
+public struct StatsSiteMetricsResponse {
     public var period: StatsPeriodUnit
     public var periodEndDate: Date
     public let data: [PeriodData]
 
-    enum Metric: String, CaseIterable {
+    public enum Metric: String, CaseIterable {
         case views
         case visitors
         case likes
@@ -15,14 +15,14 @@ public struct StatsSiteStats {
 
     public struct PeriodData {
         /// Periods date in the site timezone.
-        var date: Date
-        var views: Int?
-        var visitors: Int?
-        var likes: Int?
-        var comments: Int?
-        var posts: Int?
+        public var date: Date
+        public var views: Int?
+        public var visitors: Int?
+        public var likes: Int?
+        public var comments: Int?
+        public var posts: Int?
 
-        subscript(metric: Metric) -> Int? {
+        public subscript(metric: Metric) -> Int? {
             switch metric {
             case .views: views
             case .visitors: visitors
@@ -34,7 +34,7 @@ public struct StatsSiteStats {
     }
 }
 
-extension StatsSiteStats: StatsTimeIntervalData {
+extension StatsSiteMetricsResponse: StatsTimeIntervalData {
     public static var pathComponent: String {
         "stats/visits"
     }

Sources/WordPressKit/Services/StatsServiceRemoteV2.swift

@@ -115,13 +115,15 @@ open class StatsServiceRemoteV2: ServiceRemoteWordPressComREST {
         let pathComponent = TimeStatsType.pathComponent
         let path = self.path(forEndpoint: "sites/\(siteID)/\(pathComponent)/", withVersion: ._1_1)
 
+        let dateFormatter = period == .hour ? hourlyDateFormatter : periodDataQueryDateFormatter
+
         var staticProperties = ["period": period.stringValue,
                                 "unit": unit?.stringValue ?? period.stringValue,
-                                "date": periodDataQueryDateFormatter.string(from: endingOn)] as [String: AnyObject]
+                                "date": dateFormatter.string(from: endingOn)] as [String: AnyObject]
 
         if let startDate {
             staticProperties["period"] = nil
-            staticProperties["start_date"] = periodDataQueryDateFormatter.string(from: startDate) as AnyObject
+            staticProperties["start_date"] = dateFormatter.string(from: startDate) as AnyObject
         }
 
         let classProperties = TimeStatsType.queryProperties(with: endingOn, period: unit ?? period, maxCount: limit) as [String: AnyObject]
@@ -130,7 +132,6 @@ open class StatsServiceRemoteV2: ServiceRemoteWordPressComREST {
             return val1
         }
 
-        let dateFormatter = period == .hour ? hourlyDateFormatter : periodDataQueryDateFormatter
         wordPressComRESTAPI.get(path, parameters: properties, success: { (response, _) in
             guard
                 let jsonResponse = response as? [String: AnyObject],

Tests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift

@@ -665,7 +665,7 @@ class StatsRemoteV2Tests: RemoteTestCase, RESTTestable {
 
         let date = Calendar.current.date(from: DateComponents(year: 2025, month: 7, day: 18))!
 
-        remote.getData(for: .hour, unit: .hour, startDate: date, endingOn: date) { (stats: StatsSiteStats?, error: Error?) in
+        remote.getData(for: .hour, unit: .hour, startDate: date, endingOn: date) { (stats: StatsSiteMetricsResponse?, error: Error?) in
             XCTAssertNil(error)
             XCTAssertNotNil(stats)
 

WordPressKit.xcodeproj/project.pbxproj

@@ -45,7 +45,7 @@
 		0C938A2B2C416DE0009BA7B2 /* DisplayableImageHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C938A292C416DE0009BA7B2 /* DisplayableImageHelper.m */; };
 		0C938A2C2C416DE0009BA7B2 /* DisplayableImageHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C938A2A2C416DE0009BA7B2 /* DisplayableImageHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0C9CD7992B9A107E0045BE03 /* RemotePostParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C9CD7982B9A107E0045BE03 /* RemotePostParameters.swift */; };
-		0CAD70302E2C017500EFD4BC /* StatsSiteStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CAD702F2E2C017500EFD4BC /* StatsSiteStats.swift */; };
+		0CAD70302E2C017500EFD4BC /* StatsSiteMetricsResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CAD702F2E2C017500EFD4BC /* StatsSiteMetricsResponse.swift */; };
 		0CAD70322E2C0AAF00EFD4BC /* stats-visits-hourly.json in Resources */ = {isa = PBXBuildFile; fileRef = 0CAD70312E2C0AAF00EFD4BC /* stats-visits-hourly.json */; };
 		0CB1905E2A2A5E83004D3E80 /* BlazeCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB1905D2A2A5E83004D3E80 /* BlazeCampaign.swift */; };
 		0CB190612A2A6A13004D3E80 /* blaze-campaigns-search.json in Resources */ = {isa = PBXBuildFile; fileRef = 0CB1905F2A2A6943004D3E80 /* blaze-campaigns-search.json */; };
@@ -831,7 +831,7 @@
 		0C938A292C416DE0009BA7B2 /* DisplayableImageHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DisplayableImageHelper.m; sourceTree = "<group>"; };
 		0C938A2A2C416DE0009BA7B2 /* DisplayableImageHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayableImageHelper.h; sourceTree = "<group>"; };
 		0C9CD7982B9A107E0045BE03 /* RemotePostParameters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemotePostParameters.swift; sourceTree = "<group>"; };
-		0CAD702F2E2C017500EFD4BC /* StatsSiteStats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsSiteStats.swift; sourceTree = "<group>"; };
+		0CAD702F2E2C017500EFD4BC /* StatsSiteMetricsResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsSiteMetricsResponse.swift; sourceTree = "<group>"; };
 		0CAD70312E2C0AAF00EFD4BC /* stats-visits-hourly.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "stats-visits-hourly.json"; sourceTree = "<group>"; };
 		0CB1905D2A2A5E83004D3E80 /* BlazeCampaign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlazeCampaign.swift; sourceTree = "<group>"; };
 		0CB1905F2A2A6943004D3E80 /* blaze-campaigns-search.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "blaze-campaigns-search.json"; sourceTree = "<group>"; };
@@ -2278,7 +2278,7 @@
 				40819772221E10C900A298E4 /* StatsPublishedPostsTimeIntervalData.swift */,
 				404057C4221B30400060250C /* StatsSearchTermTimeIntervalData.swift */,
 				40819777221F00E600A298E4 /* StatsSummaryTimeIntervalData.swift */,
-				0CAD702F2E2C017500EFD4BC /* StatsSiteStats.swift */,
+				0CAD702F2E2C017500EFD4BC /* StatsSiteMetricsResponse.swift */,
 				404057C8221B789B0060250C /* StatsTopAuthorsTimeIntervalData.swift */,
 				404057D5221C92660060250C /* StatsTopClicksTimeIntervalData.swift */,
 				404057D1221C56AB0060250C /* StatsTopCountryTimeIntervalData.swift */,
@@ -3542,7 +3542,7 @@
 				0CCD4C5C2C41700B00B53F9A /* UIDevice+Extensions.swift in Sources */,
 				74A44DD11F13C64B006CD8F4 /* RemoteNotificationSettings.swift in Sources */,
 				FEF7419D28085D89002C4203 /* RemoteBloggingPrompt.swift in Sources */,
-				0CAD70302E2C017500EFD4BC /* StatsSiteStats.swift in Sources */,
+				0CAD70302E2C017500EFD4BC /* StatsSiteMetricsResponse.swift in Sources */,
 				74DA56331F06EAF000FE9BF4 /* MediaServiceRemoteREST.m in Sources */,
 				17CD0CC320C58A0D000D9620 /* ReaderSiteSearchServiceRemote.swift in Sources */,
 				74DA563B1F06EB3000FE9BF4 /* RemoteMedia.m in Sources */,