hhe/vapor-po
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Refactoring route declarations.

Browse Source
This commit is contained in:
Michael Housh
2025-01-19 10:52:15 -05:00
parent d27a19863a
commit 1c8748211c
20 changed files with 954 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

305
Sources/App/routes.swift
View File

@@ -13,13 +13,13 @@ func routes(_ app: Application) throws {
// try app.register(collection: ApiController())
app.mount(SiteRoute.router, use: siteHandler)
try app.register(collection: UserViewController())
try app.register(collection: VendorViewController())
try app.register(collection: EmployeeViewController())
try app.register(collection: PurchaseOrderViewController())
try app.register(collection: PurchaseOrderSearchViewController())
try app.register(collection: UtilsViewController())
// try app.register(collection: UserViewController())
// try app.register(collection: VendorViewController())
// try app.register(collection: EmployeeViewController())
// try app.register(collection: PurchaseOrderViewController())
// try app.register(collection: PurchaseOrderSearchViewController())
// try app.register(collection: UtilsViewController())
//
app.get { _ in
HTMLResponse {
MainPage(displayNav: false, route: .purchaseOrders) {
@@ -29,38 +29,38 @@ func routes(_ app: Application) throws {
}
}
}
app.get("login") { req in
let context = try req.query.decode(LoginContext.self)
return await req.render {
MainPage(displayNav: false, route: .login) {
UserForm(context: .login(next: context.next))
}
}
}
app.post("login") { req in
@Dependency(\.database.users) var users
let loginForm = try req.content.decode(User.Login.self)
let token = try await users.login(loginForm)
let user = try await users.get(token.userID)!
req.session.authenticate(user)
let context = try req.query.decode(LoginContext.self)
return await req.render {
MainPage(displayNav: true, route: .purchaseOrders) {
div(
.hx.get(context.next ?? "/purchase-orders"),
.hx.pushURL(true),
.hx.target("body"),
.hx.trigger(.event(.revealed)),
.hx.indicator(".hx-indicator")
) {
Img.spinner().attributes(.class("hx-indicator"))
}
}
}
}
//
// app.get("login") { req in
// let context = try req.query.decode(LoginContext.self)
// return await req.render {
// MainPage(displayNav: false, route: .login) {
// UserForm(context: .login(next: context.next))
// }
// }
// }
//
// app.post("login") { req in
// @Dependency(\.database.users) var users
// let loginForm = try req.content.decode(User.Login.self)
// let token = try await users.login(loginForm)
// let user = try await users.get(token.userID)!
// req.session.authenticate(user)
// let context = try req.query.decode(LoginContext.self)
//
// return await req.render {
// MainPage(displayNav: true, route: .purchaseOrders) {
// div(
// .hx.get(context.next ?? "/purchase-orders"),
// .hx.pushURL(true),
// .hx.target("body"),
// .hx.trigger(.event(.revealed)),
// .hx.indicator(".hx-indicator")
// ) {
// Img.spinner().attributes(.class("hx-indicator"))
// }
// }
// }
// }
}
private struct LoginContext: Content {
@@ -73,7 +73,17 @@ func siteHandler(
) async throws -> any AsyncResponseEncodable {
switch route {
case let .api(route):
switch route {
return try await route.handle(request: request)
case .health:
return HTTPStatus.ok
case let .view(route):
return try await route.handle(request: request)
}
}
extension ApiRoute {
func handle(request: Request) async throws -> any AsyncResponseEncodable {
switch self {
case let .employee(route):
return try await route.handle(request: request)
case let .purchaseOrder(route):
@@ -85,10 +95,12 @@ func siteHandler(
case let .vendorBranch(route):
return try await route.handle(request: request)
}
case .health:
return HTTPStatus.ok
case let .view(route):
switch route {
}
}
extension SharedModels.ViewRoute {
func handle(request: Request) async throws -> any AsyncResponseEncodable {
switch self {
case let .employee(route):
return try await route.handle(request: request)
@@ -100,11 +112,11 @@ func siteHandler(
}
}
case .purchaseOrder:
fatalError()
case let .purchaseOrder(route):
return try await route.handle(request: request)
case .select:
fatalError()
case let .select(route):
return try await route.handle(request: request)
case let .user(route):
return try await route.handle(request: request)
@@ -288,6 +300,105 @@ extension SharedModels.ViewRoute.EmployeeRoute {
}
extension SharedModels.ViewRoute.PurchaseOrderRoute {
private func mainPage<C: HTML>(
_ html: C,
page: Int,
limit: Int
) async throws -> some SendableHTMLDocument where C: Sendable {
@Dependency(\.database.purchaseOrders) var purchaseOrders
let page = try await purchaseOrders.fetchPage(.init(page: page, per: limit))
return MainPage(displayNav: true, route: .purchaseOrders) {
div(.class("container"), .id("purchase-order-content")) {
html
PurchaseOrderTable(page: page)
}
}
}
private func mainPage<C: HTML>(
_ html: C
) async throws -> some SendableHTMLDocument where C: Sendable {
try await mainPage(html, page: 1, limit: 25)
}
func handle(request: Vapor.Request) async throws -> any AsyncResponseEncodable {
@Dependency(\.database.purchaseOrders) var purchaseOrders
switch self {
case .form:
return try await request.render(mainPage: mainPage) {
PurchaseOrderForm(shouldShow: true)
}
case let .search(route):
return try await route.handle(request: request)
case let .shared(route):
switch route {
case let .create(purchaseOrder):
return try await request.render {
try await PurchaseOrderTable.Row(purchaseOrder: purchaseOrders.create(purchaseOrder))
}
case let .delete(id: id):
try await purchaseOrders.delete(id)
return HTTPStatus.ok
case .index:
return try await request.render {
try await mainPage(PurchaseOrderForm())
}
case let .get(id: id):
guard let purchaseOrder = try await purchaseOrders.get(id) else {
throw Abort(.badRequest, reason: "Purchase order not found.")
}
return try await request.render(mainPage: mainPage) {
PurchaseOrderForm(purchaseOrder: purchaseOrder, shouldShow: true)
}
case let .page(page: page, limit: limit):
return try await request.render {
try await PurchaseOrderTable.Rows(
page: purchaseOrders.fetchPage(.init(page: page, per: limit))
)
}
}
}
}
}
extension SharedModels.ViewRoute.PurchaseOrderRoute.Search {
func mainPage(search: PurchaseOrderSearch = .init()) -> some SendableHTMLDocument {
MainPage(displayNav: true, route: .purchaseOrders) {
div(.class("container"), .id("purchase-order-content")) {
search
PurchaseOrderTable(page: .init(items: [], metadata: .init(page: 0, per: 50, total: 0)))
}
}
}
func handle(request: Vapor.Request) async throws -> any AsyncResponseEncodable {
@Dependency(\.database) var database
switch self {
case let .index(context: context, table: table):
let html = PurchaseOrderSearch(context: context)
if table == true || !request.isHtmxRequest {
return await request.render { mainPage(search: html) }
}
return await request.render { html }
case let .search(context):
let results = try await database.purchaseOrders.search(context.toDatabaseQuery(), .init(page: 1, per: 25))
return await request.render {
PurchaseOrderTable(page: results, context: .search)
}
}
}
}
extension SharedModels.ViewRoute.UserRoute {
private func mainPage<C: HTML>(_ html: C) async throws -> some SendableHTMLDocument where C: Sendable {
@@ -381,11 +492,6 @@ extension SharedModels.ViewRoute.VendorRoute {
VendorForm(.float(shouldShow: true))
}
case let .createBranch(branch):
return try await request.render {
try await VendorDetail.BranchRow(branch: database.vendorBranches.create(branch))
}
case let .shared(route):
switch route {
case let .create(vendor):
@@ -423,5 +529,96 @@ extension SharedModels.ViewRoute.VendorRoute {
}
}
}
}
extension SharedModels.ViewRoute.VendorBranchRoute {
func handle(request: Request) async throws -> any AsyncResponseEncodable {
@Dependency(\.database) var database
switch self {
case let .shared(route):
switch route {
case let .create(branch):
return try await request.render {
try await VendorDetail.BranchRow(branch: database.vendorBranches.create(branch))
}
case let .delete(id: id):
try await database.vendorBranches.delete(id)
return HTTPStatus.ok
// FIX:
case let .get(id: id):
fatalError()
case let .index(for: vendorID):
fatalError()
case let .update(id: id, updates: updates):
fatalError()
}
}
}
}
extension SharedModels.ViewRoute.PurchaseOrderRoute.Search.Request {
func toDatabaseQuery() throws -> PurchaseOrder.SearchContext {
switch context {
case .employee:
guard let createdForID else {
throw Abort(.badRequest, reason: "Employee id not provided")
}
return .employee(createdForID)
case .customer:
guard let customerSearch, !customerSearch.isEmpty else {
throw Abort(.badRequest, reason: "Customer search string is empty.")
}
return .customer(customerSearch)
case .vendor:
guard let vendorBranchID else {
throw Abort(.badRequest, reason: "Vendor branch id not provided.")
}
return .vendor(vendorBranchID)
}
}
}
extension SharedModels.ViewRoute.SelectRoute {
func handle(request: Request) async throws -> any AsyncResponseEncodable {
@Dependency(\.database) var database
switch self {
case let .employee(context: context):
return try await request.render {
try await context.toHTML(employees: database.employees.fetchAll())
}
case let .vendorBranches(context: context):
return try await request.render {
try await context.toHTML(branches: database.vendorBranches.fetchAllWithDetail())
}
}
}
}
extension SharedModels.ViewRoute.SelectRoute.Context {
func toHTML(employees: [Employee]) -> EmployeeSelect {
switch self {
case .purchaseOrderForm:
return .purchaseOrderForm(employees: employees)
case .purchaseOrderSearch:
return .purchaseOrderSearch(employees: employees)
}
}
func toHTML(branches: [VendorBranch.Detail]) -> VendorBranchSelect {
switch self {
case .purchaseOrderForm:
return .purchaseOrderForm(branches: branches)
case .purchaseOrderSearch:
return .purchaseOrderSearch(branches: branches)
}
}
}