Skip to content

Add an encodable version of the APIGatewayResponse #86

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.

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

Merged
merged 6 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 66 additions & 0 deletions Sources/AWSLambdaEvents/APIGateway+Encodable.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftAWSLambdaRuntime open source project
//
// Copyright (c) 2017-2022 Apple Inc. and the SwiftAWSLambdaRuntime project authors
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
// See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
//
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//

import HTTPTypes

#if canImport(FoundationEssentials)
import class FoundationEssentials.JSONEncoder
import struct FoundationEssentials.Data
#else
import class Foundation.JSONEncoder
import struct Foundation.Data
#endif

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,
encodableBody: Input
) throws {
self.init(
statusCode: statusCode,
headers: headers,
multiValueHeaders: multiValueHeaders,
body: try encodableBody.string(),
isBase64Encoded: nil
)
}
}

extension APIGatewayV2Response {

public init<Input: Encodable>(
statusCode: HTTPResponse.Status,
headers: HTTPHeaders? = nil,
encodableBody: Input,
cookies: [String]? = nil
) throws {
self.init(
statusCode: statusCode,
headers: headers,
body: try encodableBody.string(),
isBase64Encoded: nil,
cookies: cookies
)
}
}
75 changes: 75 additions & 0 deletions Tests/AWSLambdaEventsTests/APIGateway+EncodableTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftAWSLambdaRuntime open source project
//
// Copyright (c) 2017-2020 Apple Inc. and the SwiftAWSLambdaRuntime project authors
// Licensed under Apache License v2.0
//
// See LICENSE.txt for license information
// See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
//
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//

import Foundation
import Testing

@testable import AWSLambdaEvents

struct APIGatewayEncodableResponseTests {

// MARK: Encoding
struct BusinessResponse: Codable, Equatable {
let message: String
let code: Int
}

@Test
func testResponseEncodingV2() throws {

// given
let businessResponse = BusinessResponse(message: "Hello World", code: 200)

var response: APIGatewayV2Response? = nil
#expect(throws: Never.self) {
try response = APIGatewayV2Response(statusCode: .ok, encodableBody: 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)
}
}

@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, encodableBody: 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)
}
}
}
Loading