simplify code and add the same initializer on APIGatewayResponse

Author: sebsto

Sources/AWSLambdaEvents/APIGateway+V2+Encodable.swift renamed to Sources/AWSLambdaEvents/APIGateway+Encodable.swift

@@ -22,8 +22,29 @@ import class Foundation.JSONEncoder
 import struct Foundation.Data
 #endif
 
-public enum APIGatewayResponseError: Error {
-    case failedToEncodeBody(Error)
+extension Encodable {
+    fileprivate func string() throws -> String {
+        let encoded = try JSONEncoder().encode(self)
+        return String(decoding: encoded, as: UTF8.self)
+    }
+}
+
+extension APIGatewayResponse {
+
+    public init<Input: Encodable>(
+        statusCode: HTTPResponse.Status,
+        headers: HTTPHeaders? = nil,
+        multiValueHeaders: HTTPMultiValueHeaders? = nil,
+        body: Input
+    ) throws {
+        self.init(
+            statusCode: statusCode,
+            headers: headers,
+            multiValueHeaders: multiValueHeaders,
+            body: try body.string(),
+            isBase64Encoded: nil
+        )
+    }
 }
 
 extension APIGatewayV2Response {
@@ -32,19 +53,14 @@ extension APIGatewayV2Response {
         statusCode: HTTPResponse.Status,
         headers: HTTPHeaders? = nil,
         body: Input,
-        isBase64Encoded: Bool? = nil,
         cookies: [String]? = nil
     ) throws {
-        let encodedBody: Data
-        do {
-            encodedBody = try JSONEncoder().encode(body)
-        } catch {
-            throw APIGatewayResponseError.failedToEncodeBody(error)
-        }
-        self.statusCode = statusCode
-        self.headers = headers
-        self.body = String(data: encodedBody, encoding: .utf8) ?? ""
-        self.isBase64Encoded = isBase64Encoded
-        self.cookies = cookies
+        self.init(
+            statusCode: statusCode,
+            headers: headers,
+            body: try body.string(),
+            isBase64Encoded: nil,
+            cookies: cookies
+        )
     }
 }

Tests/AWSLambdaEventsTests/APIGateway+V2+EncodableTests.swift renamed to Tests/AWSLambdaEventsTests/APIGateway+EncodableTests.swift

@@ -17,7 +17,7 @@ import Testing
 
 @testable import AWSLambdaEvents
 
-struct APIGatewayV2EncodableResponseTests {
+struct APIGatewayEncodableResponseTests {
 
     // MARK: Encoding
     struct BusinessResponse: Codable, Equatable {
@@ -26,7 +26,7 @@ struct APIGatewayV2EncodableResponseTests {
     }
 
     @Test
-    func testResponseEncoding() throws {
+    func testResponseEncodingV2() throws {
 
         // given
         let businessResponse = BusinessResponse(message: "Hello World", code: 200)
@@ -48,4 +48,28 @@ struct APIGatewayV2EncodableResponseTests {
             #expect(encodedBody == businessResponse)
         }
     }
+
+    @Test
+    func testResponseEncoding() throws {
+
+        // given
+        let businessResponse = BusinessResponse(message: "Hello World", code: 200)
+
+        var response: APIGatewayResponse? = nil
+        #expect(throws: Never.self) {
+            try response = APIGatewayResponse(statusCode: .ok, body: businessResponse)
+        }
+        try #require(response?.body != nil)
+
+        // when
+        let body = response?.body?.data(using: .utf8)
+        try #require(body != nil)
+
+        #expect(throws: Never.self) {
+            let encodedBody = try JSONDecoder().decode(BusinessResponse.self, from: body!)
+
+            // then
+            #expect(encodedBody == businessResponse)
+        }
+    }
 }

Tests/AWSLambdaEventsTests/APIGatewayTests.swift

@@ -95,8 +95,8 @@ class APIGatewayTests: XCTestCase {
         let isBase64Encoded: Bool?
     }
 
-    func testResponseEncoding() {
-        let resp = APIGatewayResponse(
+    func testResponseEncoding() throws {
+        let resp = try APIGatewayResponse(
             statusCode: .ok,
             headers: ["Server": "Test"],
             body: "abc123"