Merge branch 'develop'

fsalata · Oct 30, 2021 · b72d170 · b72d170
2 parents 2423217 + 9edb121
commit b72d170
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/Counters/Counters/Model/Counter.swift b/Counters/Counters/Model/Counter.swift
@@ -14,6 +14,6 @@ struct Counter: Decodable, Equatable {
 }
 
 struct CounterPayload: Codable, Equatable {
-    let id: String?
-    let title: String?
+    var id: String?
+    var title: String?
 }
diff --git a/Counters/Counters/Service/CountersService.swift b/Counters/Counters/Service/CountersService.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Combine
 
 final class CountersService {
     private let client: APIClient
@@ -20,22 +19,23 @@ final class CountersService {
     }
 
     func increment(id: String, completion: @escaping (Result<[Counter], APIError>, URLResponse?) -> Void) {
-        let payload = CounterPayload(id: id, title: nil)
+        let payload = CounterPayload(id: id)
         client.request(target: CounterServiceTarget.increment(payload: payload), completion: completion)
     }
 
     func decrement(id: String, completion: @escaping (Result<[Counter], APIError>, URLResponse?) -> Void) {
-        let payload = CounterPayload(id: id, title: nil)
+        let payload = CounterPayload(id: id)
         client.request(target: CounterServiceTarget.decrement(payload: payload), completion: completion)
     }
 
     func save(title: String, completion: @escaping (Result<[Counter], APIError>, URLResponse?) -> Void) {
-        let payload = CounterPayload(id: nil, title: title)
+        let payload = CounterPayload(title: title)
         client.request(target: CounterServiceTarget.save(payload: payload), completion: completion)
     }
 
     func delete(id: String, completion: @escaping (Result<[Counter], APIError>, URLResponse?) -> Void) {
-        client.request(target: CounterServiceTarget.delete(payload: CounterPayload(id: id, title: nil)),
+        let payload = CounterPayload(id: id)
+        client.request(target: CounterServiceTarget.delete(payload: payload),
                        completion: completion)
     }
 }
diff --git a/Counters/Create Counter/ViewModel/CreateCounterViewModel.swift b/Counters/Create Counter/ViewModel/CreateCounterViewModel.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Combine
 
 final class CreateCounterViewModel {
     private let service: CountersService

diff --git a/Counters/Network/APIClient.swift b/Counters/Network/APIClient.swift
@@ -4,7 +4,6 @@
 //
 
 import Foundation
-import Combine
 
 class APIClient {
     private var session: URLSessionProtocol

diff --git a/Counters/Network/Protocols/URLSessionProtocol.swift b/Counters/Network/Protocols/URLSessionProtocol.swift
@@ -5,8 +5,6 @@
 
 import Foundation
 
-typealias APIResponse = URLSession.DataTaskPublisher.Output
-
 protocol URLSessionProtocol {
     func dataTask(with request: URLRequest,
                   completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask