Merge pull request #652 from algolia/feat/partial-update-improvement

Patch 7.0.1

Author: VladislavFitz

Sources/AlgoliaSearchClient/Models/Search/Indexing/PartialUpdate.swift

@@ -8,19 +8,28 @@
 import Foundation
 
 public struct PartialUpdate: Equatable {
+  
+  typealias Storage = [Attribute: Action]
 
-  let attribute: Attribute
-  let content: PartialUpdate.Content
+  let storage: Storage
 
 }
 
+extension PartialUpdate: ExpressibleByDictionaryLiteral {
+  
+  public init(dictionaryLiteral elements: (Attribute, Action)...) {
+    self.init(storage: .init(uniqueKeysWithValues: elements))
+  }
+  
+}
+
 public extension PartialUpdate {
 
   /// Partially update an object field.
   /// - Parameter attribute: Attribute name to update
   /// - Parameter value: Updated value
   static func update(attribute: Attribute, value: JSON) -> Self {
-    .init(attribute: attribute, content: .init(value: value, operation: nil))
+    .init(storage: [attribute: .set(value)])
   }
 
 }
@@ -180,105 +189,74 @@ public extension PartialUpdate {
 
 extension PartialUpdate {
 
-  static func operation(attribute: Attribute, operation: PartialUpdate.Operation, value: JSON) -> Self {
-    .init(attribute: attribute, content: .init(value: value, operation: operation))
+  static func operation(attribute: Attribute, operation: Operation.Kind, value: JSON) -> Self {
+    return .init(storage: [attribute: .init(operation: operation, value: value)])
   }
 
 }
 
 extension PartialUpdate: Codable {
 
   public init(from decoder: Decoder) throws {
-    let container = try decoder.container(keyedBy: DynamicKey.self)
-    guard let rawAttribute = container.allKeys.first else { throw DecodingError.dataCorrupted(DecodingError.Context(codingPath: [], debugDescription: "No attribute found")) }
-    self.attribute = Attribute(rawValue: rawAttribute.stringValue)
-    self.content = try container.decode(PartialUpdate.Content.self, forKey: rawAttribute)
+    let rawStorage = try [String: Action](from: decoder)
+    storage = rawStorage.mapKeys(Attribute.init)
   }
 
   public func encode(to encoder: Encoder) throws {
-    var container = encoder.container(keyedBy: DynamicKey.self)
-    let key = DynamicKey(stringValue: attribute.rawValue)
-    try container.encode(content, forKey: key)
+    try storage.mapKeys(\.rawValue).encode(to: encoder)
   }
 
 }
 
 extension PartialUpdate {
-
-  enum Operation: String, Codable {
-    /// Increment a numeric attribute
-    case increment = "Increment"
-    
-    /**
-     Increment a numeric integer attribute only if the provided value matches the current value,
-     and otherwise ignore the whole object update.
-     
-     For example, if you pass an IncrementFrom value of 2 for the version attribute,
-     but the current value of the attribute is 1, the engine ignores the update.
-     If the object doesn’t exist, the engine only creates it if you pass an IncrementFrom value of 0.
-     */
-    case incrementFrom = "IncrementFrom"
-    
-    /**
-     Increment a numeric integer attribute only if the provided value is greater than the current value,
-     and otherwise ignore the whole object update.
-     
-     For example, if you pass an IncrementSet value of 2 for the version attribute,
-     and the current value of the attribute is 1, the engine updates the object.
-     If the object doesn’t exist yet, the engine only creates it if you pass an IncrementSet value that’s greater than 0.
-     */
-    case incrementSet = "IncrementSet"
-    
-    /// Decrement a numeric attribute
-    case decrement = "Decrement"
-    
-    /// Append a number or string element to an array attribute
-    case add = "Add"
-    
-    /// Remove all matching number or string elements from an array attribute
-    case remove = "Remove"
+  
+  struct Operation: Codable, Equatable {
 
-    /// Add a number or string element to an array attribute only if it’s not already present
-    case addUnique = "AddUnique"
-  }
-
-}
-
-extension PartialUpdate {
-
-  struct Content: Equatable {
+    let kind: Kind
     let value: JSON
-    let operation: Operation?
-  }
-
-}
-
-extension PartialUpdate.Content: Codable {
-
-  enum CodingKeys: String, CodingKey {
-    case value
-    case operation = "_operation"
-  }
-
-  public init(from decoder: Decoder) throws {
-    guard let container = try? decoder.container(keyedBy: CodingKeys.self), container.contains(.operation) else {
-      self.operation = nil
-      self.value = try JSON(from: decoder)
-      return
+    
+    enum CodingKeys: String, CodingKey {
+      case value
+      case kind = "_operation"
     }
-    self.operation = try container.decode(forKey: .operation)
-    self.value = try container.decode(forKey: .value)
-  }
-
-  public func encode(to encoder: Encoder) throws {
-    if let operation = operation {
-      var container = encoder.container(keyedBy: CodingKeys.self)
-      try container.encode(operation, forKey: .operation)
-      try container.encode(value, forKey: .value)
-    } else {
-      try value.encode(to: encoder)
+    
+    enum Kind: String, Codable {
+      /// Increment a numeric attribute
+      case increment = "Increment"
+      
+      /**
+       Increment a numeric integer attribute only if the provided value matches the current value,
+       and otherwise ignore the whole object update.
+       
+       For example, if you pass an IncrementFrom value of 2 for the version attribute,
+       but the current value of the attribute is 1, the engine ignores the update.
+       If the object doesn’t exist, the engine only creates it if you pass an IncrementFrom value of 0.
+       */
+      case incrementFrom = "IncrementFrom"
+      
+      /**
+       Increment a numeric integer attribute only if the provided value is greater than the current value,
+       and otherwise ignore the whole object update.
+       
+       For example, if you pass an IncrementSet value of 2 for the version attribute,
+       and the current value of the attribute is 1, the engine updates the object.
+       If the object doesn’t exist yet, the engine only creates it if you pass an IncrementSet value that’s greater than 0.
+       */
+      case incrementSet = "IncrementSet"
+      
+      /// Decrement a numeric attribute
+      case decrement = "Decrement"
+      
+      /// Append a number or string element to an array attribute
+      case add = "Add"
+      
+      /// Remove all matching number or string elements from an array attribute
+      case remove = "Remove"
+      
+      /// Add a number or string element to an array attribute only if it’s not already present
+      case addUnique = "AddUnique"
     }
-
+    
   }
 
 }