Skip to content

Commit eedce45

Browse files
mpivchevmpivchev
committed
PR fixes
Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>
1 parent 4fa3e5d commit eedce45

7 files changed

Lines changed: 14 additions & 158 deletions

File tree

‎Sources/NextcloudKit/Models/Assistant/v1/NKTextProcessingTask.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public class NKTextProcessingTask {
3939
self.completionExpectedAt = json["completionExpectedAt"].double
4040
}
4141

42-
static func factories(data: JSON) -> [NKTextProcessingTask]? {
42+
static func deserialize(multipleObjects data: JSON) -> [NKTextProcessingTask]? {
4343
guard let allResults = data.array else { return nil }
4444
return allResults.compactMap(NKTextProcessingTask.init)
4545
}
4646

47-
static func factory(data: JSON) -> NKTextProcessingTask? {
47+
static func deserialize(singleObject data: JSON) -> NKTextProcessingTask? {
4848
NKTextProcessingTask(json: data)
4949
}
5050

‎Sources/NextcloudKit/Models/Assistant/v1/NKTextProcessingTaskType.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class NKTextProcessingTaskType {
2121
self.description = json["description"].string
2222
}
2323

24-
static func factory(data: JSON) -> [NKTextProcessingTaskType]? {
24+
static func deserialize(multipleObjects data: JSON) -> [NKTextProcessingTaskType]? {
2525
guard let allResults = data.array else { return nil }
2626
return allResults.compactMap(NKTextProcessingTaskType.init)
2727
}

‎Sources/NextcloudKit/Models/Assistant/v2/TaskList.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SwiftyJSON
77
public struct TaskList: Codable {
88
public var tasks: [AssistantTask]
99

10-
static func factory(from data: JSON) -> TaskList? {
10+
static func deserialize(from data: JSON) -> TaskList? {
1111
let tasks = data.arrayValue.map { taskJson in
1212
AssistantTask(
1313
id: taskJson["id"].int64Value,
@@ -58,7 +58,7 @@ public struct AssistantTask: Codable {
5858
self.endedAt = endedAt
5959
}
6060

61-
static func factory(from data: JSON) -> AssistantTask? {
61+
static func deserialize(from data: JSON) -> AssistantTask? {
6262
let task = AssistantTask(
6363
id: data["id"].int64Value,
6464
type: data["type"].string,

‎Sources/NextcloudKit/Models/Assistant/v2/TaskTypes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SwiftyJSON
77
public struct TaskTypes: Codable {
88
public let types: [TaskTypeData]
99

10-
static func factory(data: JSON) -> TaskTypes? {
10+
static func deserialize(from data: JSON) -> TaskTypes? {
1111
var taskTypes: [TaskTypeData] = []
1212

1313
for (key, subJson) in data {

‎Sources/NextcloudKit/NextcloudKit+Assistant.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public extension NextcloudKit {
3434
let data = json["ocs"]["data"]["types"]
3535
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
3636
if 200..<300 ~= statusCode {
37-
let results = NKTextProcessingTaskType.factory(data: data)
37+
let results = NKTextProcessingTaskType.deserialize(multipleObjects: data)
3838
options.queue.async { completion(account, results, response, .success) }
3939
} else {
4040
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -75,7 +75,7 @@ public extension NextcloudKit {
7575
let data = json["ocs"]["data"]["task"]
7676
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
7777
if 200..<300 ~= statusCode {
78-
let result = NKTextProcessingTask.factory(data: data)
78+
let result = NKTextProcessingTask.deserialize(singleObject: data)
7979
options.queue.async { completion(account, result, response, .success) }
8080
} else {
8181
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -112,7 +112,7 @@ public extension NextcloudKit {
112112
let data = json["ocs"]["data"]["task"]
113113
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
114114
if 200..<300 ~= statusCode {
115-
let result = NKTextProcessingTask.factory(data: data)
115+
let result = NKTextProcessingTask.deserialize(singleObject: data)
116116
options.queue.async { completion(account, result, response, .success) }
117117
} else {
118118
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -149,7 +149,7 @@ public extension NextcloudKit {
149149
let data = json["ocs"]["data"]["task"]
150150
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
151151
if 200..<300 ~= statusCode {
152-
let result = NKTextProcessingTask.factory(data: data)
152+
let result = NKTextProcessingTask.deserialize(singleObject: data)
153153
options.queue.async { completion(account, result, response, .success) }
154154
} else {
155155
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -186,7 +186,7 @@ public extension NextcloudKit {
186186
let data = json["ocs"]["data"]["tasks"]
187187
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
188188
if 200..<300 ~= statusCode {
189-
let results = NKTextProcessingTask.factories(data: data)
189+
let results = NKTextProcessingTask.deserialize(multipleObjects: data)
190190
options.queue.async { completion(account, results, response, .success) }
191191
} else {
192192
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }

‎Sources/NextcloudKit/NextcloudKit+AssistantV2.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public extension NextcloudKit {
3535
let data = json["ocs"]["data"]["types"]
3636
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
3737
if 200..<300 ~= statusCode {
38-
let dict = TaskTypes.factory(data: data)
38+
let dict = TaskTypes.deserialize(from: data)
3939
let result = dict?.types.map({$0})
4040
var filteredResult = result?
4141
.filter({ $0.inputShape?.input?.type == supportedTaskType && $0.outputShape?.output?.type == supportedTaskType })
@@ -81,7 +81,7 @@ public extension NextcloudKit {
8181
let data = json["ocs"]["data"]["task"]
8282
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
8383
if 200..<300 ~= statusCode {
84-
let result = AssistantTask.factory(from: data)
84+
let result = AssistantTask.deserialize(from: data)
8585
options.queue.async { completion(account, result, response, .success) }
8686
} else {
8787
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -118,7 +118,7 @@ public extension NextcloudKit {
118118
let data = json["ocs"]["data"]["tasks"]
119119
let statusCode = json["ocs"]["meta"]["statuscode"].int ?? NKError.internalError
120120
if 200..<300 ~= statusCode {
121-
let result = TaskList.factory(from: data)
121+
let result = TaskList.deserialize(from: data)
122122
options.queue.async { completion(account, result, response, .success) }
123123
} else {
124124
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }

‎Tests/NextcloudKitIntegrationTests/AssistantV2IntegrationTests.swift‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)