Do not add default query if it exists in the original URL

Author: crazytonyli

WordPressKit/HTTPRequestBuilder.swift

@@ -153,8 +153,9 @@ final class HTTPRequestBuilder {
         // Add default query items if they don't exist in `appendedQuery`.
         var newQuery = appendedQuery
         if !defaultQuery.isEmpty {
+            let allQuery = (original.queryItems ?? []) + newQuery
             let toBeAdded = defaultQuery.filter { item in
-                !newQuery.contains(where: { $0.name == item.name})
+                !allQuery.contains(where: { $0.name == item.name})
             }
             newQuery.append(contentsOf: toBeAdded)
         }

WordPressKitTests/Utilities/HTTPRequestBuilderTests.swift

@@ -205,6 +205,15 @@ class HTTPRequestBuilderTests: XCTestCase {
         try XCTAssertEqual(builder.query(name: "foo", value: "bar").build().url?.query, "locale=zh&foo=bar")
     }
 
+    func testDefaultQueryExistsInOriginalURL() throws {
+        let url = try HTTPRequestBuilder(url: URL(string: "https://wordpress.org/hello?locale=foo")!)
+            .query(defaults: [URLQueryItem(name: "locale", value: "en")])
+            .build()
+            .url
+
+        XCTAssertEqual(url?.query, "locale=foo")
+    }
+
     func testJSONBody() throws {
         var request = try HTTPRequestBuilder(url: URL(string: "https://wordpress.org")!)
             .method(.post)