Merge pull request #43 from NaifAlrashed/master

make search related container structs decodable

Author: jasonbosco

Sources/Typesense/Models/DocumentIndexParameters.swift

@@ -14,4 +14,4 @@ public struct DocumentIndexParameters: Codable {
         case dirtyValues = "dirty_values"
     }
 
-}
+}

Sources/Typesense/Models/MultiSearchResult.swift

@@ -9,7 +9,7 @@ import Foundation
 
 
 
-public struct MultiSearchResult<T: Codable>: Codable {
+public struct MultiSearchResult<T: Decodable>: Decodable {
 
     public var results: [SearchResult<T>]
     public var conversation: SearchResultConversation?

Sources/Typesense/Models/PresetValue.swift

@@ -25,4 +25,4 @@ public enum PresetValue: Codable {
             try singleCollectionSearch.encode(to: encoder)
         }
     }
-}
+}

Sources/Typesense/Models/SearchGroupedHit.swift

@@ -8,7 +8,7 @@
 import Foundation
 import AnyCodable
 
-public struct SearchGroupedHit<T: Codable>: Codable {
+public struct SearchGroupedHit<T: Decodable>: Decodable {
 
     public var found: Int?
     public var groupKey: [AnyCodable]

Sources/Typesense/Models/SearchResult.swift

@@ -9,7 +9,7 @@ import Foundation
 
 
 
-public struct SearchResult<T: Codable>: Codable {
+public struct SearchResult<T: Decodable>: Decodable {
 
     public var facetCounts: [FacetCounts]?
     /** The number of documents found */

Sources/Typesense/Models/SearchResultHit.swift

@@ -9,7 +9,7 @@ import Foundation
 
 
 
-public struct SearchResultHit<T: Codable>: Codable {
+public struct SearchResultHit<T: Decodable>: Decodable {
 
     /** (Deprecated) Contains highlighted portions of the search fields */
     public var highlights: [SearchHighlight]?
@@ -36,15 +36,6 @@ public struct SearchResultHit<T: Codable>: Codable {
         self.geoDistanceMeters = try container.decodeIfPresent([String : Int].self, forKey: SearchResultHit<T>.CodingKeys.geoDistanceMeters)
         self.vectorDistance = try container.decodeIfPresent(Float.self, forKey: SearchResultHit<T>.CodingKeys.vectorDistance)
     }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(highlights, forKey: CodingKeys.highlights)
-        try container.encode(document, forKey: CodingKeys.document)
-        try container.encode(textMatch, forKey: CodingKeys.textMatch)
-        try container.encode(geoDistanceMeters, forKey: CodingKeys.geoDistanceMeters)
-        try container.encode(vectorDistance, forKey: CodingKeys.vectorDistance)
-    }
 
     public enum CodingKeys: String, CodingKey { 
         case highlights

get-models.sh

@@ -18,22 +18,22 @@ find . -name "MultiSearchParameters.swift" -exec sed -i '' 's/maxHits: OneOfMult
 find . -name "MultiSearchCollectionParameters.swift" -exec sed -i '' 's/maxHits: Any\?/maxHits: String\?/g' {} \;
 
 # Add Generics to SearchResult
-find . -name "SearchResult.swift" -exec sed -i '' 's/SearchResult:/SearchResult<T: Codable>:/g' {} \;
+find . -name "SearchResult.swift" -exec sed -i '' 's/SearchResult:/SearchResult<T: Decodable>:/g' {} \;
 find . -name "SearchResult.swift" -exec sed -i '' 's/groupedHits: \[SearchGroupedHit\]\?/groupedHits: \[SearchGroupedHit<T>\]\?/g' {} \; 
 find . -name "SearchResult.swift" -exec sed -i '' 's/hits: \[SearchResultHit\]\?/hits: \[SearchResultHit<T>\]\?/g' {} \;
 
 # Add Generics to MultiSearchResult
 find . -name "MultiSearchResult.swift" -exec sed -i '' 's/results: \[SearchResult\]/results: \[SearchResult<T>\]/g' {} \;
-find . -name "MultiSearchResult.swift" -exec sed -i '' 's/MultiSearchResult:/MultiSearchResult<T: Codable>:/g' {} \;
+find . -name "MultiSearchResult.swift" -exec sed -i '' 's/MultiSearchResult:/MultiSearchResult<T: Decodable>:/g' {} \;
 
 # Add Generics to SearchResultHit
-find . -name "SearchResultHit.swift" -exec sed -i '' 's/SearchResultHit:/SearchResultHit<T: Codable>:/g' {} \;
+find . -name "SearchResultHit.swift" -exec sed -i '' 's/SearchResultHit:/SearchResultHit<T: Decodable>:/g' {} \;
 
 # Convert document parameter to a generic T
 find . -name "SearchResultHit.swift" -exec sed -i '' 's/document: \[String:Any\]\?/document: T?/g' {} \;
 
 # Add Generics to SearchGroupedHit
-find . -name "SearchGroupedHit.swift" -exec sed -i '' 's/SearchGroupedHit:/SearchGroupedHit<T: Codable>:/g' {} \;
+find . -name "SearchGroupedHit.swift" -exec sed -i '' 's/SearchGroupedHit:/SearchGroupedHit<T: Decodable>:/g' {} \;
 find . -name "SearchGroupedHit.swift" -exec sed -i '' 's/hits: \[SearchResultHit\]/hits: \[SearchResultHit<T>\]/g' {} \;
 
 # Convert matchedTokens to custom defined StringQuantum