Codable encoder key strategy update

Examples/moltin iOS Example/Models/CustomProduct.swift

@@ -12,7 +12,7 @@ class CustomProduct: Product {
     var backgroundColor: UIColor?
 
     enum ProductCodingKeys: String, CodingKey {
-        case backgroundColor = "background_colour"
+        case backgroundColor = "backgroundColour"
     }
 
     required init(from decoder: Decoder) throws {

Examples/moltin iOS Example/Models/ProductCategory.swift

@@ -13,8 +13,8 @@ class ProductCategory: moltin.Category {
     var backgroundImage: String?
 
     enum ProductCategoryCodingKeys: String, CodingKey {
-        case backgroundColor = "background_colour"
-        case backgroundImage = "background_image"
+        case backgroundColor = "backgroundColour"
+        case backgroundImage
     }
 
     required init(from decoder: Decoder) throws {

Examples/moltin tvOS Example/CategoriesViewController.swift

@@ -58,8 +58,8 @@ class ProductCategory: moltin.Category {
     var backgroundImage: String?
 
     enum ProductCategoryCodingKeys: String, CodingKey {
-        case backgroundColor = "background_colour"
-        case backgroundImage = "background_image"
+        case backgroundColor = "backgroundColour"
+        case backgroundImage
     }
 
     required init(from decoder: Decoder) throws {

Sources/SDK/Models/Address.swift

@@ -36,23 +36,6 @@ open class Address: Codable {
     /// The country for this address
     public var country: String?
 
-    enum CodingKeys: String, CodingKey {
-        case firstName = "first_name"
-        case lastName = "last_name"
-        case companyName = "company_name"
-        case line1 = "line_1"
-        case line2 = "line_2"
-
-        case id
-        case type
-        case name
-        case instructions
-        case city
-        case county
-        case postcode
-        case country
-    }
-
     /// Create a new address with first name and last name
     public init(
         withFirstName firstName: String,

Sources/SDK/Models/Cart.swift

@@ -11,10 +11,6 @@ import Foundation
 public class CartMeta: Codable {
     /// The display price information for this cart
     public let displayPrice: DisplayPrices
-
-    enum CodingKeys: String, CodingKey {
-        case displayPrice = "display_price"
-    }
 }
 
 /// The display price for a `CartItem`
@@ -31,21 +27,12 @@ public struct CartItemDisplayPrices: Codable {
     public let withTax: CartItemDisplayPrice
     /// The display price for this cart item without tax
     public let withoutTax: CartItemDisplayPrice
-
-    enum CodingKeys: String, CodingKey {
-        case withTax = "with_tax"
-        case withoutTax = "without_tax"
-    }
 }
 
 /// The meta information for this `CartItem`
 public class CartItemMeta: Codable {
     /// The display price for this cart item
     public let displayPrice: CartItemDisplayPrices
-
-    enum CodingKeys: String, CodingKey {
-        case displayPrice = "display_price"
-    }
 }
 
 /// Represents a `Cart` in Moltin
@@ -84,21 +71,6 @@ open class CartItem: Codable {
     public let links: [String: String]
     /// The meta information for this cart
     public let meta: CartItemMeta
-
-    enum CodingKeys: String, CodingKey {
-        case productId = "product_id"
-        case unitPrice = "unit_price"
-
-        case id
-        case type
-        case name
-        case description
-        case sku
-        case quantity
-        case value
-        case links
-        case meta
-    }
 }
 
 /// Represents various types of cart items

Sources/SDK/Models/Currency.swift

@@ -39,20 +39,4 @@ open class Currency: Codable {
     public let links: [String: String]
     /// The meta information for this currency
     public let meta: CurrencyMeta
-
-    enum CodingKeys: String, CodingKey {
-        case exchangeRate = "exchange_rate"
-        case decimalPoint = "decimal_point"
-        case thousandSeparator = "thousand_separator"
-        case decimalPlaces = "decimal_places"
-
-        case id
-        case type
-        case code
-        case format
-        case `default`
-        case enabled
-        case links
-        case meta
-    }
 }

Sources/SDK/Models/File.swift

@@ -43,16 +43,4 @@ open class File: Codable {
     public let links: [String: String]
     /// The meta information for this file
     public let meta: FileMeta
-
-    enum CodingKeys: String, CodingKey {
-        case id
-        case type
-        case fileName = "file_name"
-        case mimeType = "mime_type"
-        case fileSize = "file_size"
-        case `public`
-        case link
-        case links
-        case meta
-    }
 }

Sources/SDK/Models/Flow.swift

@@ -47,21 +47,6 @@ open class Field: Codable {
     public let relationships: Relationships?
     /// The meta information for this Field
     public let meta: FieldMeta?
-
-    enum CodingKeys: String, CodingKey {
-        case fieldType = "field_type"
-
-        case id
-        case type
-        case slug
-        case name
-        case description
-        case required
-        case unique
-        case enabled
-        case relationships
-        case meta
-    }
 }
 
 /// Represents a `Flow` in Moltin

Sources/SDK/Models/Order.swift

@@ -13,11 +13,6 @@ public class OrderMeta: Codable {
     public let displayPrice: DisplayPrices
     /// The timestamps for an order
     public let timestamps: Timestamps
-
-    enum CodingKeys: String, CodingKey {
-        case displayPrice = "display_price"
-        case timestamps
-    }
 }
 
 /// Represents the relationships for an `Order`
@@ -52,20 +47,6 @@ open class Order: Codable {
     public let meta: OrderMeta
     /// The relationships for this order
     public let relationships: OrderRelationships?
-
-    enum CodingKeys: String, CodingKey {
-        case id
-        case type
-        case status
-        case payment
-        case shipping
-        case customer
-        case shippingAddress = "shipping_address"
-        case billingAddress = "billing_address"
-        case links
-        case meta
-        case relationships
-    }
 }
 
 /// Denotes a successful order returned from the payment gateway

Sources/SDK/Models/Prices.swift

@@ -23,9 +23,4 @@ public struct DisplayPrices: Codable {
     public let withTax: DisplayPrice
     /// The display price without tax
     public let withoutTax: DisplayPrice
-
-    enum CodingKeys: String, CodingKey {
-        case withTax = "with_tax"
-        case withoutTax = "without_tax"
-    }
 }

Sources/SDK/Models/Product.swift

@@ -15,13 +15,6 @@ public struct ProductPrice: Codable {
     public let currency: String
     /// Whether this price includes tax
     public let includesTax: Bool
-
-    enum CodingKeys: String, CodingKey {
-        case includesTax = "includes_tax"
-
-        case amount
-        case currency
-    }
 }
 
 /// Represents stock levels on a `Product`
@@ -62,15 +55,6 @@ public class ProductMeta: Codable {
     public let variations: [ProductVariation]?
     /// The variation matrix of this product
     public let variationMatrix: [[String: String]]?
-
-    enum CodingKeys: String, CodingKey {
-        case displayPrice = "display_price"
-        case variationMatrix = "variation_matrix"
-
-        case timestamps
-        case stock
-        case variations
-    }
 }
 
 /// Represents a `Product` in moltin
@@ -111,22 +95,6 @@ open class Product: Codable, HasRelationship {
     /// The collections this product belongs to
     public var collections: [Collection]?
 
-    enum CodingKeys: String, CodingKey {
-        case manageStock = "manage_stock"
-        case commodityType = "commodity_type"
-
-        case id
-        case type
-        case name
-        case slug
-        case sku
-        case description
-        case price
-        case status
-        case meta
-        case relationships
-    }
-
     required public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let includes: IncludesContainer = decoder.userInfo[.includes] as? IncludesContainer ?? [:]

Sources/SDK/Models/Relationship.swift

@@ -82,18 +82,4 @@ open class Relationships: Codable {
     public var cartItem: RelationshipSingle?
     /// The `Product` relationships
     public var products: RelationshipMany?
-
-    enum CodingKeys: String, CodingKey {
-        case mainImage = "main_image"
-        case cartItem = "cart_item"
-
-        case files
-        case categories
-        case collections
-        case brands
-        case flow
-        case items
-        case customer
-        case products
-    }
 }

Sources/SDK/Models/Timestamps.swift

@@ -13,9 +13,4 @@ open class Timestamps: Codable {
     public let createdAt: Date
     /// When the resource was updated
     public let updatedAt: Date?
-
-    enum CodingKeys: String, CodingKey {
-        case createdAt = "created_at"
-        case updatedAt = "updated_at"
-    }
 }

Sources/SDK/Requests/MoltinRequest.swift

@@ -52,9 +52,12 @@ public class MoltinRequest {
     public init(withConfiguration configuration: MoltinConfig) {
         self.config = configuration
         self.http = MoltinHTTP(withSession: URLSession.shared)
-        self.parser = MoltinParser(withDecoder: JSONDecoder.dateFormattingDecoder())
         self.query = MoltinQuery()
         self.auth = MoltinAuth(withConfiguration: self.config)
+
+        let encoder = JSONDecoder.dateFormattingDecoder()
+        encoder.keyDecodingStrategy = .convertFromSnakeCase
+        self.parser = MoltinParser(withDecoder: encoder)
     }
 
     // MARK: - Default Calls

Sources/SDK/Utils/CodableExtract.swift

@@ -48,6 +48,7 @@ extension Decodable {
         let itemData = try JSONSerialization.data(withJSONObject: item, options: [])
 
         let decoder = JSONDecoder.dateFormattingDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
         return try decoder.decode(T.self, from: itemData)
     }
 
@@ -59,6 +60,7 @@ extension Decodable {
         let itemData = try JSONSerialization.data(withJSONObject: items, options: [])
 
         let decoder = JSONDecoder.dateFormattingDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
         return try decoder.decode([T].self, from: itemData)
     }
 

Tests/moltin iOS Tests/AuthTests.swift

@@ -42,9 +42,9 @@ class AuthRequestTests: XCTestCase {
 
     func testAuthAuthenticatesSuccessfullyAndPassesThrough() {
         let (_, productRequest) = MockFactory.mockedProductRequest(withJSON: MockProductDataFactory.multiProductData)
-
+        
         let expectationToFulfill = expectation(description: "ProductRequest calls the method and runs the callback closure")
-
+        
         _ = productRequest.all { (result) in
             switch result {
             case .success(_):
@@ -58,10 +58,10 @@ class AuthRequestTests: XCTestCase {
                 }
                 break
             }
-
+            
             expectationToFulfill.fulfill()
         }
-
+        
         waitForExpectations(timeout: 1) { error in
             if let error = error {
                 XCTFail("waitForExpectationsWithTimeout errored: \(error)")