Skip to content

Commit 80fcfa9

Browse files
committed
Fixed a bug when requesting with array query items.
1 parent eac7729 commit 80fcfa9

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

Sources/CybozuUserAPI/CybozuUserAPI.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public struct CybozuUserAPI: Sendable {
5656
offset: Int? = nil
5757
) async throws -> FetchUsersResponse {
5858
var queryItems = [URLQueryItem]()
59-
queryItems.appendQueryItem(name: "ids", value: ids?.arrayString)
60-
queryItems.appendQueryItem(name: "codes", value: codes?.arrayString)
59+
queryItems.appendQueryItems(name: "ids", values: ids?.compactMap(String.init))
60+
queryItems.appendQueryItems(name: "codes", values: codes)
6161
queryItems.appendQueryItem(name: "size", value: size?.description)
6262
queryItems.appendQueryItem(name: "offset", value: offset?.description)
6363
let request = makeRequest(httpMethod: .get, endpoint: .users, queryItems: queryItems)

Sources/CybozuUserAPI/Extensions/Array+Extension.swift

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,17 @@
77

88
import Foundation
99

10-
extension [Int] {
11-
var arrayString: String {
12-
"[" + map(\.description).joined(separator: ",") + "]"
13-
}
14-
}
10+
extension [URLQueryItem] {
11+
mutating func appendQueryItem(name: String, value: String?) {
12+
guard let value else { return }
13+
append(.init(name: name, value: value))
1514

16-
extension [String] {
17-
var arrayString: String {
18-
"[" + joined(separator: ",") + "]"
1915
}
20-
}
2116

22-
extension [URLQueryItem] {
23-
mutating func appendQueryItem(name: String, value: String?) {
24-
if let value {
25-
append(.init(name: name, value: value))
17+
mutating func appendQueryItems(name: String, values: [String]?) {
18+
guard let values else { return }
19+
values.enumerated().forEach { offset, value in
20+
append(.init(name: "\(name)[\(offset)]", value: value))
2621
}
2722
}
2823
}

0 commit comments

Comments
 (0)