Expanded StatsFileDownload entity to contain relativeURL and downloadURL

CHANGELOG.md

@@ -34,7 +34,7 @@ _None._
 
 ### Breaking Changes
 
-_None._
+- Expanded `StatsFileDownload` entity to contain `relativeURL` and `downloadURL` [#808]
 
 ### New Features
 

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

@@ -22,11 +22,17 @@ public struct StatsFileDownloadsTimeIntervalData {
 public struct StatsFileDownload {
     public let file: String
     public let downloadCount: Int
+    public let relativeURL: String
+    public let downloadURL: URL
 
     public init(file: String,
-                downloadCount: Int) {
+                downloadCount: Int,
+                relativeURL: String,
+                downloadURL: URL) {
         self.file = file
         self.downloadCount = downloadCount
+        self.relativeURL = relativeURL
+        self.downloadURL = downloadURL
     }
 }
 
@@ -49,11 +55,21 @@ extension StatsFileDownloadsTimeIntervalData: StatsTimeIntervalData {
         }
 
         let fileDownloads: [StatsFileDownload] = fileDownloadsDict.compactMap {
-            guard let file = $0["filename"] as? String, let downloads = $0["downloads"] as? Int else {
+            guard let file = $0["filename"] as? String,
+                  let downloads = $0["downloads"] as? Int,
+                  let relativeURLString = $0["relative_url"] as? String,
+                  let downloadURLString = $0["download_url"] as? String,
+                  let downloadURL = URL(string: downloadURLString)
+            else {
                 return nil
             }
 
-            return StatsFileDownload(file: file, downloadCount: downloads)
+            return StatsFileDownload(
+                file: file,
+                downloadCount: downloads,
+                relativeURL: relativeURLString,
+                downloadURL: downloadURL
+            )
         }
 
         self.periodEndDate = date

Tests/WordPressKitTests/Mock Data/stats-file-downloads.json

@@ -5,12 +5,16 @@
         "2019-07-01": {
             "files": [
                 {
-                    "filename": "/2019/07/test.pdf",
-                    "downloads": 11
+                    "filename": "test.pdf",
+                    "downloads": 11,
+                    "relative_url": "/2019/07/test.pdf",
+                    "download_url": "https://testsite.com/2019/07/test.pdf"
                 },
                 {
-                    "filename": "/2019/07/sampleaudio.mp3",
-                    "downloads": 4
+                    "filename": "sampleaudio.mp3",
+                    "downloads": 4,
+                    "relative_url": "/2019/07/sampleaudio.mp3",
+                    "download_url": "https://testsite.com/2019/07/sampleaudio.mp3"
                 }
             ],
             "other_downloads": 0,

Tests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift

@@ -393,7 +393,8 @@ class StatsRemoteV2Tests: RemoteTestCase, RESTTestable {
 
             XCTAssertEqual(fileDownloads?.fileDownloads.count, 2)
 
-            XCTAssertEqual(fileDownloads?.fileDownloads.first!.file, "/2019/07/test.pdf")
+            XCTAssertEqual(fileDownloads?.fileDownloads.first!.file, "test.pdf")
+            XCTAssertEqual(fileDownloads?.fileDownloads.first!.downloadURL, URL(string: "https://testsite.com/2019/07/test.pdf"))
             XCTAssertEqual(fileDownloads?.fileDownloads.first!.downloadCount, 11)
 
             expect.fulfill()