Merge pull request #502 from wordpress-mobile/feature/18375-fix_prompt_date

Blogging Prompts: fix prompt date

Author: ScoutHarris

WordPressKit.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressKit'
-  s.version       = '4.52.0-beta.1'
+  s.version       = '4.52.0-beta.2'
 
   s.summary       = 'WordPressKit offers a clean and simple WordPress.com and WordPress.org API.'
   s.description   = <<-DESC

WordPressKit/RemoteBloggingPrompt.swift

@@ -25,6 +25,15 @@ extension RemoteBloggingPrompt: Decodable {
         case answeredUserAvatarURLs = "answered_users_sample"
     }
 
+    /// Used to format the fetched object's date string to a date.
+    private static var dateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = .init(identifier: "en_US_POSIX")
+        formatter.timeZone = .init(secondsFromGMT: 0)
+        formatter.dateFormat = "yyyy-MM-dd"
+        return formatter
+    }()
+
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
@@ -34,7 +43,7 @@ extension RemoteBloggingPrompt: Decodable {
         self.content = try container.decode(String.self, forKey: .content)
         self.attribution = try container.decode(String.self, forKey: .attribution)
         self.answered = try container.decode(Bool.self, forKey: .answered)
-        self.date = try container.decode(Date.self, forKey: .date)
+        self.date = Self.dateFormatter.date(from: try container.decode(String.self, forKey: .date)) ?? Date()
         self.answeredUsersCount = try container.decode(Int.self, forKey: .answeredUsersCount)
 
         let userAvatars = try container.decode([UserAvatar].self, forKey: .answeredUserAvatarURLs)

WordPressKitTests/BloggingPromptsServiceRemoteTests.swift

@@ -5,7 +5,12 @@ import XCTest
 class BloggingPromptsServiceRemoteTests: RemoteTestCase, RESTTestable {
 
     private let siteID = NSNumber(value: 1)
-    private let dateFormatter = JSONDecoder.DateDecodingStrategy.DateFormat.noTime.formatter
+    private let dateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = .init(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyy-MM-dd"
+        return formatter
+    }()
 
     var mockApi: WordPressComRestApi!
     var service: BloggingPromptsServiceRemote!
@@ -29,8 +34,6 @@ class BloggingPromptsServiceRemoteTests: RemoteTestCase, RESTTestable {
     // MARK: Tests
 
     func test_fetchPrompts_returnsRemotePrompts() {
-        let formatter = JSONDecoder.DateDecodingStrategy.DateFormat.noTime.formatter
-        let expectedDate = formatter.date(from: "2022-01-01") // using value from the first prompt in blogging-prompts-success.json.
         let expectedAvatarURLString = "https://0.gravatar.com/avatar/example?s=96&d=identicon&r=G"
         stubRemoteResponse(.bloggingPromptsEndpoint, filename: .mockFileName, contentType: .ApplicationJSON)
 
@@ -49,7 +52,12 @@ class BloggingPromptsServiceRemoteTests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(firstPrompt.title, "Prompt number 1")
             XCTAssertEqual(firstPrompt.content, "<!-- wp:pullquote -->\n<figure class=\"wp-block-pullquote\"><blockquote><p>Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.</p><cite>(courtesy of plinky.com)</cite></blockquote></figure>\n<!-- /wp:pullquote -->")
             XCTAssertEqual(firstPrompt.attribution, "dayone")
-            XCTAssertEqual(firstPrompt.date, expectedDate)
+
+            let firstDateComponents = firstPrompt.date.dateAndTimeComponents()
+            XCTAssertEqual(firstDateComponents.year!, 2022)
+            XCTAssertEqual(firstDateComponents.month!, 5)
+            XCTAssertEqual(firstDateComponents.day!, 3)
+
             XCTAssertFalse(firstPrompt.answered)
             XCTAssertEqual(firstPrompt.answeredUsersCount, 0)
 
@@ -58,6 +66,11 @@ class BloggingPromptsServiceRemoteTests: RemoteTestCase, RESTTestable {
             XCTAssertEqual(secondPrompt.answeredUserAvatarURLs.count, 1)
             XCTAssertTrue(secondPrompt.attribution.isEmpty)
 
+            let secondDateComponents = secondPrompt.date.dateAndTimeComponents()
+            XCTAssertEqual(secondDateComponents.year!, 2021)
+            XCTAssertEqual(secondDateComponents.month!, 9)
+            XCTAssertEqual(secondDateComponents.day!, 12)
+
             let avatarURL = secondPrompt.answeredUserAvatarURLs.first!
             XCTAssertEqual(avatarURL.absoluteString, expectedAvatarURLString)
 

WordPressKitTests/Mock Data/blogging-prompts-success.json

@@ -6,7 +6,7 @@
       "title": "Prompt number 1",
       "content": "<!-- wp:pullquote -->\n<figure class=\"wp-block-pullquote\"><blockquote><p>Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.</p><cite>(courtesy of plinky.com)</cite></blockquote></figure>\n<!-- /wp:pullquote -->",
       "attribution": "dayone",
-      "date": "2022-01-01",
+      "date": "2022-05-03",
       "answered": false,
       "answered_users_count": 0,
       "answered_users_sample": []
@@ -17,7 +17,7 @@
       "title": "Prompt number 10",
       "content": "<!-- wp:pullquote -->\n<figure class=\"wp-block-pullquote\"><blockquote><p>Tell us about a time when you felt out of place.</p><cite>(courtesy of plinky.com)</cite></blockquote></figure>\n<!-- /wp:pullquote -->",
       "attribution": "",
-      "date": "2022-01-02",
+      "date": "2021-09-12",
       "answered": false,
       "answered_users_count": 1,
       "answered_users_sample": [