Add support to Encodable types, fix ClientTests

Author: ppamorim

Sources/MeiliSearch/Client.swift

@@ -135,7 +135,36 @@ public struct MeiliSearch {
      For a partial update of the document see `updateDocument`.
 
      - parameter UID:        The unique identifier for the Document's index to be found.
-     - parameter documents:  The documents data (JSON) to be processed.
+     - parameter documents:  The documents to be processed.
+     - parameter completion: The completion closure used to notify when the server
+     completes the update request, it returns a `Result` object that contains `Update`
+     value. If the request was sucessful or `Error` if a failure occured.
+     */
+    public func addDocuments<T>(
+        UID: String,
+        documents: [T],
+        encoder: JSONEncoder? = nil,
+        primaryKey: String?,
+        _ completion: @escaping (Result<Update, Swift.Error>) -> Void) where T: Encodable {
+        self.documents.add(
+            UID,
+            documents,
+            encoder,
+            primaryKey,
+            completion)
+    }
+
+    /**
+     Add a list of documents as data or replace them if they already exist.
+
+     If you send an already existing document (same id) the whole existing document will
+     be overwritten by the new document. Fields previously in the document not present in
+     the new document are removed.
+
+     For a partial update of the document see `updateDocument`.
+
+     - parameter UID:        The unique identifier for the Document's index to be found.
+     - parameter documents:  The  data to be processed.
      - parameter completion: The completion closure used to notify when the server
      completes the update request, it returns a `Result` object that contains `Update`
      value. If the request was sucessful or `Error` if a failure occured.

Sources/MeiliSearch/Constants.swift

@@ -5,7 +5,13 @@ struct Constants {
     static let customJSONDecoder: JSONDecoder = {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(Formatter.iso8601)
-
         return decoder
     }()
+
+    static let customJSONEecoder: JSONEncoder = {
+        let encoder = JSONEncoder()
+        encoder.dateEncodingStrategy = .formatted(Formatter.iso8601)
+        return encoder
+    }()
+
 }

Sources/MeiliSearch/Documents.swift

@@ -75,6 +75,7 @@ struct Documents {
         _ document: Data,
         _ primaryKey: String?,
         _ completion: @escaping (Result<Update, Swift.Error>) -> Void) {
+
         var query: String = "/indexes/\(UID)/documents"
         if let primaryKey: String = primaryKey {
             query += "?primaryKey=\(primaryKey)"
@@ -94,6 +95,42 @@ struct Documents {
         }
     }
 
+    func add<T>(
+        _ UID: String,
+        _ documents: [T],
+        _ encoder: JSONEncoder? = nil,
+        _ primaryKey: String?,
+        _ completion: @escaping (Result<Update, Swift.Error>) -> Void) where T: Encodable {
+
+        var query: String = "/indexes/\(UID)/documents"
+        if let primaryKey: String = primaryKey {
+            query += "?primaryKey=\(primaryKey)"
+        }
+
+        let data: Data!
+
+        switch encodeJSON(documents, encoder) {
+        case .success(let documentData):
+          data = documentData
+        case .failure(let error):
+          completion(.failure(error))
+          return
+        }
+
+        request.post(api: query, data) { result in
+
+            switch result {
+            case .success(let data):
+
+                Documents.decodeJSON(data, completion: completion)
+
+            case .failure(let error):
+                completion(.failure(error))
+            }
+
+        }
+    }
+
     func update(
         _ UID: String,
         _ document: Data,
@@ -209,19 +246,24 @@ struct Documents {
         _ customDecoder: JSONDecoder? = nil,
         completion: (Result<T, Swift.Error>) -> Void) {
         do {
-
-            let decoder: JSONDecoder
-            if let customDecoder: JSONDecoder = customDecoder {
-              decoder = customDecoder
-            } else {
-              decoder = Constants.customJSONDecoder
-            }
-
-            let value: T = try decoder.decode(T.self, from: data)
+            let value: T = try (customDecoder ?? Constants.customJSONDecoder)
+              .decode(T.self, from: data)
             completion(.success(value))
         } catch {
             completion(.failure(error))
         }
     }
 
+    private func encodeJSON<T: Encodable>(
+        _ documents: [T],
+        _ encoder: JSONEncoder?) -> Result<Data, Swift.Error> {
+        do {
+            let data: Data = try (encoder ?? Constants.customJSONEecoder)
+              .encode(documents)
+            return .success(data)
+        } catch {
+            return .failure(error)
+        }
+    }
+
 }

Sources/MeiliSearch/Stats.swift

@@ -56,7 +56,7 @@ struct Stats {
 
                 do {
                     let allStats = try Constants.customJSONDecoder.decode(AllStats.self, from: data)
-                    
+
                     completion(.success(allStats))
                 } catch {
                     completion(.failure(error))

Sources/MeiliSearch/System.swift

@@ -58,7 +58,7 @@ struct System {
 
                 do {
                     let vesion = try Constants.customJSONDecoder.decode(Version.self, from: data)
-                    
+
                     completion(.success(vesion))
                 } catch {
                     completion(.failure(error))

Sources/MeiliSearch/Updates.swift

@@ -62,7 +62,7 @@ struct Updates {
 
                 do {
                     let result = try Constants.customJSONDecoder.decode([Update.Result].self, from: data)
-                    
+
                     completion(.success(result))
                 } catch {
                     completion(.failure(error))

Tests/MeiliSearchIntegrationTests/DocumentsTests.swift

@@ -54,7 +54,7 @@ class DocumentsTests: XCTestCase {
         self.client.deleteIndex(UID: uid) { _ in
             self.client.getOrCreateIndex(UID: uid) { result in
                 switch result {
-                case .success(_):
+                case .success:
                     break
                 case .failure(let error):
                     print(error)

Tests/MeiliSearchIntegrationTests/IndexesTests.swift

@@ -16,7 +16,7 @@ class IndexesTests: XCTestCase {
         pool(client)
 
         let expectation = XCTestExpectation(description: "Try to delete index between tests")
-        self.client.deleteIndex(UID: self.uid) { result in
+        self.client.deleteIndex(UID: self.uid) { _ in
             expectation.fulfill()
         }
         self.wait(for: [expectation], timeout: 1.0)

Tests/MeiliSearchIntegrationTests/Pooling.swift

@@ -8,7 +8,6 @@
 import Foundation
 @testable import MeiliSearch
 
-
 public func pool(_ client: MeiliSearch) {
 
     let semaphore = DispatchSemaphore(value: 1)

Tests/MeiliSearchIntegrationTests/XCTestManifests.swift

@@ -13,7 +13,7 @@ import XCTest
 #if !os(macOS)
 public func allTests() -> [XCTestCaseEntry] {
     [
-        testCase(DocumentsTests.allTests),
+        testCase(DocumentsTests.allTests)
     ]
 }
 #endif