feat: allow includeAll with additional includes

Author: cbaker6

Sources/ParseSwift/API/API+Command.swift

@@ -474,7 +474,7 @@ internal extension API.Command {
 
         var params: [String: String]?
         if let includeParams = include {
-            params = ["include": "\(includeParams)"]
+            params = ["include": "\(Set(includeParams))"]
         }
 
         return API.Command<T, T>(

Sources/ParseSwift/Objects/ParseInstallation.swift

@@ -508,7 +508,7 @@ extension ParseInstallation {
 
         var params: [String: String]?
         if let includeParams = include {
-            params = ["include": "\(includeParams)"]
+            params = ["include": "\(Set(includeParams))"]
         }
 
         return API.Command(method: .GET,

Sources/ParseSwift/Objects/ParseUser.swift

@@ -916,7 +916,7 @@ extension ParseUser {
 
         var params: [String: String]?
         if let includeParams = include {
-            params = ["include": "\(includeParams)"]
+            params = ["include": "\(Set(includeParams))"]
         }
 
         return API.Command(method: .GET,

Sources/ParseSwift/ParseConstants.swift

@@ -17,6 +17,7 @@ enum ParseConstants {
     static let fileDownloadsDirectory = "Downloads"
     static let bundlePrefix = "com.parse.ParseSwift"
     static let batchLimit = 50
+    static let includeAllKey = "*"
     #if os(iOS)
     static let deviceType = "ios"
     #elseif os(macOS)

Sources/ParseSwift/Types/Query.swift

@@ -259,7 +259,11 @@ public struct Query<T>: Encodable, Equatable where T: ParseObject {
      */
     public func includeAll() -> Query<T> {
         var mutableQuery = self
-        mutableQuery.include = ["*"]
+        if mutableQuery.include != nil {
+            mutableQuery.include?.insert(ParseConstants.includeAllKey)
+        } else {
+            mutableQuery.include = [ParseConstants.includeAllKey]
+        }
         return mutableQuery
     }
 

Tests/ParseSwiftTests/ParseQueryTests.swift

@@ -205,6 +205,11 @@ class ParseQueryTests: XCTestCase { // swiftlint:disable:this type_body_length
         let query2 = GameScore.query.includeAll()
         XCTAssertEqual(query2.include?.count, 1)
         XCTAssertEqual(query2.include, ["*"])
+        let query3 = GameScore.query
+            .include("hello")
+            .includeAll()
+        XCTAssertEqual(query3.include?.count, 2)
+        XCTAssertEqual(query3.include, Set(["hello", "*"]))
     }
 
     func testExcludeKeys() throws {