Merge pull request #108 from dbsystel/async-await

Adds support for asny await

Author: lightsprint09

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.5
 //
 //  Package.swift
 //

Source/NetworkService+Async.swift

@@ -0,0 +1,63 @@
+//
+//  File.swift
+//  
+//
+//  Created by Lukas Schmidt on 19.12.21.
+//
+
+import Foundation
+
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+public extension NetworkService {
+
+    /**
+     Fetches a resource asynchronously from remote location. Execution of the requests starts immediately.
+
+     **Example**:
+     ```swift
+     let networkService: NetworkService = //
+     let resource: Resource<String> = //
+
+     let (result, response) = try await networkService.request(resource)
+     ```
+
+     - parameter resource: The resource you want to fetch.
+
+     - returns: a touple  containing the parsed result and the HTTP response
+     - Throws: A `NetworkError`
+     */
+    @discardableResult
+    func request<Result>(_ resource: Resource<Result>) async throws -> (Result, HTTPURLResponse) {
+        return try await withCheckedThrowingContinuation({ coninuation in
+            request(resource: resource, onCompletionWithResponse: {
+                coninuation.resume(with: $0)
+            })
+        })
+    }
+
+    /**
+     Fetches a resource asynchronously from remote location. Execution of the requests starts immediately.
+
+     **Example**:
+     ```swift
+     let networkService: NetworkService = //
+     let resource: ResourceWithError<String, CustomError> = //
+
+     let (result, response) = try await networkService.request(resource)
+     ```
+
+     - parameter resource: The resource you want to fetch.
+
+     - returns: a touple  containing the parsed result and the HTTP response
+     - Throws: Custom Error provided by ResourceWithError
+     */
+    @discardableResult
+    func request<Result, E: Error>(_ resource: ResourceWithError<Result, E>) async throws -> (Result, HTTPURLResponse) {
+        return try await withCheckedThrowingContinuation({ coninuation in
+            request(resource: resource, onCompletionWithResponse: {
+                coninuation.resume(with: $0)
+            })
+        })
+    }
+
+}

Tests/NetworkServiceTest.swift

@@ -238,4 +238,34 @@ class NetworkServiceTest: XCTestCase {
         }
         XCTAssertEqual(networkAccess.request?.url?.absoluteString, "https://bahn.de/train")
     }
+
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    func testGIVEN_aRequest_WHEN_requestWithAsyncResultAndResponse_THEN_ShouldRespond() async throws {
+        // GIVEN
+        networkAccess.changeMock(data: Train.validJSONData, response: .defaultMock, error: nil)
+
+        //When
+        let (result, response) = try await networkService.request(resource)
+
+
+        //Then
+        XCTAssertEqual(result.name, self.trainName)
+        XCTAssertEqual(response, .defaultMock)
+        XCTAssertEqual(networkAccess.request?.url?.absoluteString, "https://bahn.de/train")
+    }
+
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    func testGIVEN_aRequest_WHEN_requestWithAsyncResultAndResponse_THEN_ShouldThwo() async {
+        // GIVEN
+        let error = NSError(domain: "", code: 0, userInfo: nil)
+        networkAccess.changeMock(data: nil, response: nil, error: error)
+
+        //When
+        do {
+            try await networkService.request(resource)
+            XCTFail("Schould throw")
+        } catch let error {
+            XCTAssertTrue(error is NetworkError)
+        }
+    }
 }

Tests/NetworkServiceWithErrorTest.swift

@@ -164,4 +164,34 @@ class NetworkServiceWithErrorTest: XCTestCase {
         }
         XCTAssertEqual(networkAccess.request?.url?.absoluteString, "https://bahn.de/train")
     }
+
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    func testGIVEN_aRequest_WHEN_requestWithAsyncResultAndResponse_THEN_ShouldRespond() async throws {
+        // GIVEN
+        networkAccess.changeMock(data: Train.validJSONData, response: .defaultMock, error: nil)
+
+        //When
+        let (result, response) = try await networkService.request(resource)
+
+
+        //Then
+        XCTAssertEqual(result.name, self.trainName)
+        XCTAssertEqual(response, .defaultMock)
+        XCTAssertEqual(networkAccess.request?.url?.absoluteString, "https://bahn.de/train")
+    }
+
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    func testGIVEN_aRequest_WHEN_requestWithAsyncResultAndResponse_THEN_ShouldThwo() async {
+        // GIVEN
+        let error = NSError(domain: "", code: 0, userInfo: nil)
+        networkAccess.changeMock(data: nil, response: nil, error: error)
+
+        //When
+        do {
+            try await networkService.request(resource)
+            XCTFail("Schould throw")
+        } catch let error {
+            XCTAssertTrue(error is CustomError)
+        }
+    }
 }