Add custom coding keys to Activity (#594)

mokagio · web-flow · commit b53112a26d4e · 2023-04-19T09:54:27.000+10:00
diff --git a/WordPressKit.podspec b/WordPressKit.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressKit'
-  s.version       = '7.2.0'
+  s.version       = '7.3.0-beta.1'
 
   s.summary       = 'WordPressKit offers a clean and simple WordPress.com and WordPress.org API.'
   s.description   = <<-DESC
diff --git a/WordPressKit/Activity.swift b/WordPressKit/Activity.swift
@@ -3,16 +3,16 @@ import Foundation
 public struct Activity: Decodable {
 
     private enum CodingKeys: String, CodingKey {
-        case activityId
+        case activityId = "activity_id"
         case summary
         case content
         case published
         case name
         case type
         case gridicon
         case status
-        case isRewindable
-        case rewindId
+        case isRewindable = "is_rewindable"
+        case rewindId = "rewind_id"
         case actor
         case object
         case items
diff --git a/WordPressKit/ActivityServiceRemote.swift b/WordPressKit/ActivityServiceRemote.swift
@@ -184,7 +184,8 @@ private extension ActivityServiceRemote {
         }
 
         do {
-            let decoder = JSONDecoder.apiDecoder
+            let decoder = JSONDecoder()
+            decoder.dateDecodingStrategy = .supportMultipleDateFormats
             let data = try JSONSerialization.data(withJSONObject: orderedItems, options: [])
             let activities = try decoder.decode([Activity].self, from: data)
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ private extension ActivityServiceRemote {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`do {`
`187`		`- let decoder = JSONDecoder.apiDecoder`
	`187`	`+ let decoder = JSONDecoder()`
	`188`	`+ decoder.dateDecodingStrategy = .supportMultipleDateFormats`
`188`	`189`	`let data = try JSONSerialization.data(withJSONObject: orderedItems, options: [])`
`189`	`190`	`let activities = try decoder.decode([Activity].self, from: data)`
`190`	`191`