Use custom ISO8601 with ms formatting for Activity published (#596)

Author: mokagio

Podfile

@@ -5,7 +5,9 @@ source 'https://cdn.cocoapods.org/'
 inhibit_all_warnings!
 use_frameworks!
 
-platform :ios, '13.0'
+APP_IOS_DEPLOYMENT_TARGET = Gem::Version.new('13.0')
+
+platform :ios, APP_IOS_DEPLOYMENT_TARGET
 
 def wordpresskit_pods
   pod 'Alamofire', '~> 4.8.0'
@@ -31,3 +33,14 @@ target 'WordPressKitTests' do
   pod 'OHHTTPStubs/Swift', '~> 9.0'
   pod 'OCMock', '~> 3.4'
 end
+
+# Let Pods targets inherit deployment target from the app
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |configuration|
+      ios_deployment_key = 'IPHONEOS_DEPLOYMENT_TARGET'
+      pod_ios_deployment_target = Gem::Version.new(configuration.build_settings[ios_deployment_key])
+      configuration.build_settings.delete(ios_deployment_key) if pod_ios_deployment_target <= APP_IOS_DEPLOYMENT_TARGET
+    end
+  end
+end

Podfile.lock

@@ -50,6 +50,6 @@ SPEC CHECKSUMS:
   WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: 5e4ba02626e43d8ae1cdc02077e9086e8861cd77
+PODFILE CHECKSUM: 7998039b722f0fe77c684f509f0478349cf5fb9b
 
 COCOAPODS: 1.11.3

WordPressKit.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 		3F3195AD266FF94B00397EE7 /* ZendeskMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */; };
 		3F3C9E9C289A3E31009A1357 /* TestCollector+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */; };
 		3F758FD324F6C68200BBA2FC /* AnnouncementServiceRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F758FD224F6C68200BBA2FC /* AnnouncementServiceRemote.swift */; };
+		3F8308A729EE683500354497 /* ActivityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F8308A629EE683500354497 /* ActivityTests.swift */; };
 		3FB8642C2888089F003A86BE /* BuildkiteTestCollector in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB8642B2888089F003A86BE /* BuildkiteTestCollector */; };
 		40247DFA2120D8E100AE1C3C /* AutomatedTransferService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40247DF92120D8E100AE1C3C /* AutomatedTransferService.swift */; };
 		40247DFC2120E69600AE1C3C /* AutomatedTransferStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40247DFB2120E69600AE1C3C /* AutomatedTransferStatus.swift */; };
@@ -713,6 +714,7 @@
 		3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZendeskMetadata.swift; sourceTree = "<group>"; };
 		3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TestCollector+Constants.swift"; sourceTree = "<group>"; };
 		3F758FD224F6C68200BBA2FC /* AnnouncementServiceRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncementServiceRemote.swift; sourceTree = "<group>"; };
+		3F8308A629EE683500354497 /* ActivityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityTests.swift; sourceTree = "<group>"; };
 		3FB8642D288813E9003A86BE /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = "<group>"; };
 		40247DF92120D8E100AE1C3C /* AutomatedTransferService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomatedTransferService.swift; sourceTree = "<group>"; };
 		40247DFB2120E69600AE1C3C /* AutomatedTransferStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomatedTransferStatus.swift; sourceTree = "<group>"; };
@@ -1644,6 +1646,7 @@
 			isa = PBXGroup;
 			children = (
 				826016FF1F9FD60A00533B6C /* ActivityServiceRemoteTests.swift */,
+				3F8308A629EE683500354497 /* ActivityTests.swift */,
 			);
 			name = Activity;
 			sourceTree = "<group>";
@@ -3298,6 +3301,7 @@
 				FACBDD3825ECB4480026705B /* ReaderPostServiceRemote+RelatedPostsTests.swift in Sources */,
 				74585B901F0D51F900E7E667 /* DomainsServiceRemoteRESTTests.swift in Sources */,
 				BAFA775624ADAB3C000F0D3A /* MockPluginDirectoryEntryProvider.swift in Sources */,
+				3F8308A729EE683500354497 /* ActivityTests.swift in Sources */,
 				9AB6D64A218727D60008F274 /* PostServiceRemoteRESTRevisionsTest.swift in Sources */,
 				7430C9BD1F192C0F0051B8E6 /* ReaderPostServiceRemoteTests.m in Sources */,
 				1DC837C229B9F04F009DCD4B /* RemoteVideoPressVideoTests.swift in Sources */,

WordPressKit/Activity.swift

@@ -48,7 +48,9 @@ public struct Activity: Decodable {
               let contentText = content["text"] as? String else {
             throw Error.missingContentText
         }
-        guard let published = try container.decodeIfPresent(Date.self, forKey: .published) else {
+        guard
+            let publishedString = try container.decodeIfPresent(String.self, forKey: .published),
+            let published = Date.dateWithISO8601WithMillisecondsString(publishedString) else {
             throw Error.missingPublishedDate
         }
 

WordPressKitTests/ActivityTests.swift

@@ -0,0 +1,89 @@
+@testable import WordPressKit
+import XCTest
+
+class ActivityTests: XCTestCase {
+
+    func testActivityDecoding() throws {
+        let data = try XCTUnwrap(activityLogComment.data(using: .utf8))
+        // This is part of the test in itself.
+        // If Activity is not configured as expected to decode the JSON input, JSONDecode will throw.
+        let activity = try JSONDecoder().decode(Activity.self, from: data)
+        // Verify custom keys
+        XCTAssertEqual(activity.activityID, "AWRNRTAUjEqjFGbx8DZj")
+        XCTAssertFalse(activity.isRewindable)
+        XCTAssertEqual(activity.rewindID, "1530304735.2771")
+    }
+}
+
+// See https://github.com/wordpress-mobile/WordPress-iOS/blob/16adc688f718136ea57c45d5d26c5c13de9d2b9f/WordPress/WordPressTest/Test%20Data/activity-log-comment.json
+private let activityLogComment: String = """
+{
+    "summary": "Comment approved",
+    "content": {
+        "text": "Comment by aaaaaaaaaa on Hola Lima! 🇵🇪: Great post! True talent!",
+        "ranges": [
+                   {
+                   "url": "https://wordpress.com/comment/137726971/7",
+                   "indices": [
+                               0,
+                               7
+                               ],
+                   "site_id": 137726971,
+                   "root_id": 441,
+                   "section": "comment",
+                   "intent": "edit",
+                   "id": 7
+                   },
+                   {
+                   "url": "https://wordpress.com/edit/post/137726971/441",
+                   "indices": [
+                               25,
+                               40
+                               ],
+                   "site_id": 137726971,
+                   "section": "post",
+                   "intent": "edit",
+                   "context": "single",
+                   "id": 441
+                   }
+                   ]
+    },
+    "name": "comment__approved",
+    "actor": {
+        "type": "Person",
+        "name": "etoledom",
+        "external_user_id": 0,
+        "wpcom_user_id": 129935412,
+        "icon": {
+            "type": "Image",
+            "url": "https://secure.gravatar.com/avatar/8e06b8f61330e7bc0e5eb4e67aa68e0f?s=96&d=identicon&r=g",
+            "width": 96,
+            "height": 96
+        },
+        "role": "administrator"
+    },
+    "type": "Accept",
+    "published": "2018-06-29T20:38:55.277+00:00",
+    "generator": {
+        "jetpack_version": 0,
+        "blog_id": 137726971
+    },
+    "is_rewindable": false,
+    "rewind_id": "1530304735.2771",
+    "gridicon": "comment",
+    "status": null,
+    "activity_id": "AWRNRTAUjEqjFGbx8DZj",
+    "object": {
+        "type": "Comment",
+        "object_id": 7
+    },
+    "target": {
+        "type": "Article",
+        "name": "Hola Lima! 🇵🇪",
+        "post_id": 229,
+        "post_type": "post",
+        "post_status": "publish"
+    },
+    "is_discarded": false
+}
+"""