feat: WIP
This commit is contained in:
@@ -1,35 +1,35 @@
|
||||
import ApiController
|
||||
import Routes
|
||||
import Vapor
|
||||
|
||||
extension ApiController {
|
||||
|
||||
func respond(_ route: SiteRoute.Api, request: Vapor.Request) async throws -> any AsyncResponseEncodable {
|
||||
guard let encodable = try await json(route, request.logger) else {
|
||||
return HTTPStatus.ok
|
||||
}
|
||||
return AnyJSONResponse(value: encodable)
|
||||
}
|
||||
}
|
||||
|
||||
struct AnyJSONResponse: AsyncResponseEncodable {
|
||||
public var headers: HTTPHeaders = ["Content-Type": "application/json"]
|
||||
let value: any Encodable
|
||||
|
||||
init(additionalHeaders: HTTPHeaders = [:], value: any Encodable) {
|
||||
if additionalHeaders.contains(name: .contentType) {
|
||||
self.headers = additionalHeaders
|
||||
} else {
|
||||
headers.add(contentsOf: additionalHeaders)
|
||||
}
|
||||
self.value = value
|
||||
}
|
||||
|
||||
func encodeResponse(for request: Request) async throws -> Response {
|
||||
try Response(
|
||||
status: .ok,
|
||||
headers: headers,
|
||||
body: .init(data: JSONEncoder().encode(value))
|
||||
)
|
||||
}
|
||||
}
|
||||
// import ApiController
|
||||
// import Routes
|
||||
// import Vapor
|
||||
//
|
||||
// extension ApiController {
|
||||
//
|
||||
// func respond(_ route: SiteRoute.Api, request: Vapor.Request) async throws -> any AsyncResponseEncodable {
|
||||
// guard let encodable = try await json(route, request.logger) else {
|
||||
// return HTTPStatus.ok
|
||||
// }
|
||||
// return AnyJSONResponse(value: encodable)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// struct AnyJSONResponse: AsyncResponseEncodable {
|
||||
// public var headers: HTTPHeaders = ["Content-Type": "application/json"]
|
||||
// let value: any Encodable
|
||||
//
|
||||
// init(additionalHeaders: HTTPHeaders = [:], value: any Encodable) {
|
||||
// if additionalHeaders.contains(name: .contentType) {
|
||||
// self.headers = additionalHeaders
|
||||
// } else {
|
||||
// headers.add(contentsOf: additionalHeaders)
|
||||
// }
|
||||
// self.value = value
|
||||
// }
|
||||
//
|
||||
// func encodeResponse(for request: Request) async throws -> Response {
|
||||
// try Response(
|
||||
// status: .ok,
|
||||
// headers: headers,
|
||||
// body: .init(data: JSONEncoder().encode(value))
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ApiController
|
||||
// import ApiController
|
||||
import Dependencies
|
||||
import PsychrometricClientLive
|
||||
import Vapor
|
||||
@@ -9,19 +9,19 @@ import ViewController
|
||||
struct DependenciesMiddleware: AsyncMiddleware {
|
||||
|
||||
private let values: DependencyValues.Continuation
|
||||
private let apiController: ApiController
|
||||
// private let apiController: ApiController
|
||||
private let psychrometricClient: PsychrometricClient
|
||||
// private let database: DatabaseClient
|
||||
private let viewController: ViewController
|
||||
|
||||
init(
|
||||
// database: DatabaseClient,
|
||||
apiController: ApiController = .liveValue,
|
||||
// apiController: ApiController = .liveValue,
|
||||
psychrometricClient: PsychrometricClient = .liveValue,
|
||||
viewController: ViewController = .liveValue
|
||||
) {
|
||||
self.values = withEscapedDependencies { $0 }
|
||||
self.apiController = apiController
|
||||
// self.apiController = apiController
|
||||
// self.database = database
|
||||
self.psychrometricClient = psychrometricClient
|
||||
self.viewController = viewController
|
||||
@@ -30,7 +30,7 @@ struct DependenciesMiddleware: AsyncMiddleware {
|
||||
func respond(to request: Request, chainingTo next: any AsyncResponder) async throws -> Response {
|
||||
try await values.yield {
|
||||
try await withDependencies {
|
||||
$0.apiController = apiController
|
||||
// $0.apiController = apiController
|
||||
// $0.database = database
|
||||
// $0.dateFormatter = .liveValue
|
||||
$0.psychrometricClient = psychrometricClient
|
||||
|
||||
@@ -55,12 +55,12 @@ private func siteHandler(
|
||||
request: Request,
|
||||
route: SiteRoute
|
||||
) async throws -> any AsyncResponseEncodable {
|
||||
@Dependency(\.apiController) var apiController
|
||||
// @Dependency(\.apiController) var apiController
|
||||
@Dependency(\.viewController) var viewController
|
||||
|
||||
switch route {
|
||||
case let .api(route):
|
||||
return try await apiController.respond(route, request: request)
|
||||
// case let .api(route):
|
||||
// return try await apiController.respond(route, request: request)
|
||||
case .health:
|
||||
return HTTPStatus.ok
|
||||
case let .view(route):
|
||||
|
||||
Reference in New Issue
Block a user