Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transform TaskInfo#uid into TaskInfo#taskUid #318

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Transform TaskInfo#uid into TaskInfo#taskUid #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/MeiliSearch/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public struct MeiliSearch {
options: WaitOptions? = nil,
_ completion: @escaping (Result<Task, Swift.Error>
) -> Void) {
self.tasks.waitForTask(taskUid: task.uid, options: options, completion)
self.tasks.waitForTask(taskUid: task.taskUid, options: options, completion)
}

// MARK: Tasks
Expand Down
6 changes: 3 additions & 3 deletions Sources/MeiliSearch/Model/TaskInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public struct TaskInfo: Codable, Equatable {
// MARK: Properties

/// Unique ID for the current `TaskInfo`.
public let uid: Int
public let taskUid: Int

/// Unique ID for the current `TaskInfo`.
public let indexUid: String?
Expand All @@ -24,10 +24,10 @@ public struct TaskInfo: Codable, Equatable {
public let enqueuedAt: String

static func == (lhs: TaskInfo, rhs: Task) -> Bool {
lhs.uid == rhs.uid
lhs.taskUid == rhs.uid
}

public enum CodingKeys: String, CodingKey {
case uid = "taskUid", indexUid, status, type, enqueuedAt
case taskUid, indexUid, status, type, enqueuedAt
}
}
2 changes: 1 addition & 1 deletion Tests/MeiliSearchIntegrationTests/DocumentsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class DocumentsTests: XCTestCase {
self.index.deleteDocument("42") { result in
switch result {
case .success(let task):
self.client.waitForTask(taskUid: task.uid) { result in
self.client.waitForTask(taskUid: task.taskUid) { result in
switch result {
case .success(let task):
XCTAssertEqual(Task.Status.succeeded, task.status)
Expand Down
8 changes: 4 additions & 4 deletions Tests/MeiliSearchIntegrationTests/TaskTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class TasksTests: XCTestCase {
self.index.addDocuments(documents: [movie], primaryKey: nil) { result in
switch result {
case .success(let task):
self.index.getTask(taskUid: task.uid) { result in
self.index.getTask(taskUid: task.taskUid) { result in
switch result {
case .success(let task):
XCTAssertEqual(task.type, "documentAdditionOrUpdate")
Expand All @@ -63,7 +63,7 @@ class TasksTests: XCTestCase {
self.client.createIndex(uid: indexUid) { result in
switch result {
case .success(let task):
self.client.waitForTask(taskUid: task.uid, options: WaitOptions(timeOut: 10.0)) { result in
self.client.waitForTask(taskUid: task.taskUid, options: WaitOptions(timeOut: 10.0)) { result in
switch result {
case .success:
let index = self.client.index(indexUid)
Expand Down Expand Up @@ -99,7 +99,7 @@ class TasksTests: XCTestCase {
self.client.createIndex(uid: self.uid) { result in
switch result {
case .success(let task):
self.client.getTask(taskUid: task.uid) { result in
self.client.getTask(taskUid: task.taskUid) { result in
switch result {
case .success(let task):
XCTAssertEqual(task.type, "indexCreation")
Expand Down Expand Up @@ -180,7 +180,7 @@ class TasksTests: XCTestCase {
self.client.createIndex(uid: self.uid) { result in
switch result {
case .success(let task):
self.client.waitForTask(taskUid: task.uid, options: WaitOptions(timeOut: 1, interval: 0.5)) { result in
self.client.waitForTask(taskUid: task.taskUid, options: WaitOptions(timeOut: 1, interval: 0.5)) { result in
switch result {
case .success(let task):
XCTAssertEqual(task.type, "indexCreation")
Expand Down
6 changes: 3 additions & 3 deletions Tests/MeiliSearchIntegrationTests/Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public func createGenericIndex(client: MeiliSearch, uid: String, _ completion: @
client.createIndex(uid: uid) { result in
switch result {
case .success(let task):
client.waitForTask(taskUid: task.uid, options: WaitOptions(timeOut: 10.0)) { result in
client.waitForTask(taskUid: task.taskUid, options: WaitOptions(timeOut: 10.0)) { result in
switch result {
case .success(let task):
completion(.success(task))
Expand All @@ -69,7 +69,7 @@ public func deleteIndex(client: MeiliSearch, uid: String, _ completion: @escapin
client.deleteIndex(uid) { result in
switch result {
case .success(let task):
client.waitForTask(taskUid: task.uid) { result in
client.waitForTask(taskUid: task.taskUid) { result in
switch result {
case .success(let task):
completion(.success(task))
Expand Down Expand Up @@ -101,7 +101,7 @@ public func addDocuments<T: Encodable>(client: MeiliSearch, uid: String, dataset
index.addDocuments(documents: documents, primaryKey: primaryKey) { result in
switch result {
case .success(let task):
client.waitForTask(taskUid: task.uid) { result in
client.waitForTask(taskUid: task.taskUid) { result in
switch result {
case .success(let task):
completion(.success(task))
Expand Down
2 changes: 1 addition & 1 deletion Tests/MeiliSearchUnitTests/DocumentsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class DocumentsTests: XCTestCase {
) { result in
switch result {
case .success(let update):
XCTAssertEqual(stubTask.uid, update.uid)
XCTAssertEqual(stubTask.taskUid, update.taskUid)
case .failure:
XCTFail("Failed to add or replace Movies document")
}
Expand Down
10 changes: 5 additions & 5 deletions Tests/MeiliSearchUnitTests/IndexesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class IndexesTests: XCTestCase {
self.client.createIndex(uid: self.uid) { result in
switch result {
case .success(let task):
XCTAssertEqual(0, task.uid)
XCTAssertEqual(0, task.taskUid)
expectation.fulfill()
case .failure(let error):
dump(error)
Expand Down Expand Up @@ -163,7 +163,7 @@ class IndexesTests: XCTestCase {
self.client.updateIndex(uid: self.uid, primaryKey: primaryKey) { result in
switch result {
case .success(let task):
XCTAssertEqual(0, task.uid)
XCTAssertEqual(0, task.taskUid)
expectation.fulfill()
case .failure(let error):
dump(error)
Expand All @@ -190,7 +190,7 @@ class IndexesTests: XCTestCase {
self.index.update(primaryKey: primaryKey) { result in
switch result {
case .success(let task):
XCTAssertEqual(0, task.uid)
XCTAssertEqual(0, task.taskUid)
expectation.fulfill()
case .failure(let error):
dump(error)
Expand Down Expand Up @@ -282,7 +282,7 @@ class IndexesTests: XCTestCase {
self.client.deleteIndex(self.uid) { result in
switch result {
case .success(let task):
XCTAssertEqual(0, task.uid)
XCTAssertEqual(0, task.taskUid)
expectation.fulfill()
case .failure(let error):
dump(error)
Expand All @@ -308,7 +308,7 @@ class IndexesTests: XCTestCase {
self.index.delete { result in
switch result {
case .success(let task):
XCTAssertEqual(0, task.uid)
XCTAssertEqual(0, task.taskUid)
expectation.fulfill()
case .failure(let error):
dump(error)
Expand Down