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

feat working on vendor views.

Browse Source
This commit is contained in:
Michael Housh
2025-01-16 08:02:13 -05:00
parent 6f2e87e886
commit d4a8444700
8 changed files with 239 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/App/Controllers/Api/VendorApiController.swift
View File

@@ -31,7 +31,7 @@ struct VendorApiController: RouteCollection {
@Sendable
func update(req: Request) async throws -> Vendor {
return try await vendors.update(req.ensureIDPathComponent(), req.content.decode(Vendor.Update.self))
return try await vendors.update(req.ensureIDPathComponent(), with: req.content.decode(Vendor.Update.self))
}
@Sendable

194
Sources/App/Controllers/View/VendorViewController.swift
View File

@@ -1,108 +1,86 @@
// import Fluent
// import Vapor
//
// struct VendorViewController: RouteCollection {
// private let api = VendorApiController()
//
// func boot(routes: any RoutesBuilder) throws {
// let vendors = routes.protected.grouped("vendors")
//
// vendors.get(use: index(req:))
// vendors.post(use: create(req:))
// vendors.group(":vendorID") {
// $0.delete(use: delete(req:))
// $0.put(use: update(req:))
// }
// }
//
// @Sendable
// func index(req: Request) async throws -> View {
// return try await req.view.render("vendors/index", makeCtx(req: req))
// }
//
// @Sendable
// func create(req: Request) async throws -> View {
// let ctx = try req.content.decode(CreateVendorCTX.self)
// req.logger.debug("CTX: \(ctx)")
// let vendor = Vendor.Create(name: ctx.name).toModel()
// try await vendor.save(on: req.db)
//
// if let branchString = ctx.branches {
// let branches = branchString.split(separator: ",")
// .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
//
// for branch in branches {
// try await vendor.$branches.create(
// VendorBranch(name: String(branch), vendorId: vendor.requireID()),
// on: req.db
// )
// }
// }
//
// return try await req.view.render("vendors/table", makeCtx(req: req))
// }
//
// @Sendable
// func delete(req: Request) async throws -> HTTPStatus {
// try await api.delete(req: req)
// }
//
// @Sendable
// func update(req: Request) async throws -> View {
// _ = try await api.update(req: req)
// return try await req.view.render("vendors/table", makeCtx(req: req, oob: true))
// }
//
// private func makeCtx(req: Request, vendor: Vendor? = nil, oob: Bool = false) async throws -> VendorsCTX {
// let vendors = try await Vendor.query(on: req.db)
// .with(\.$branches)
// .sort(\.$name, .ascending)
// .all()
// .map { $0.toDTO() }
//
// return .init(
// vendors: vendors,
// form: .init(vendor: vendor, oob: oob)
// )
// }
// }
//
// struct VendorFormCTX: Content {
// let htmxForm: HtmxFormCTX<Context>
//
// init(vendor: Vendor? = nil, oob: Bool = false) {
// self.htmxForm = .init(
// formClass: "vendor-form",
// formId: "vendor-form",
// htmxTargetUrl: vendor == nil ? .post("/vendors") : .put("/vendors"),
// htmxTarget: "#vendor-table",
// htmxPushUrl: false,
// htmxResetAfterRequest: true,
// htmxSwapOob: oob ? .outerHTML : nil,
// htmxSwap: oob ? nil : .outerHTML,
// context: .init(vendor: vendor)
// )
// }
//
// struct Context: Content {
// let vendor: Vendor?
// let branches: String?
// let buttonLabel: String
//
// init(vendor: Vendor? = nil) {
// self.vendor = vendor
// self.branches = vendor?.branches.map(\.name).joined(separator: ", ")
// self.buttonLabel = vendor == nil ? "Create" : "Update"
// }
// }
// }
//
// private struct VendorsCTX: Content {
// let vendors: [Vendor.DTO]
// let form: VendorFormCTX
// }
//
// private struct CreateVendorCTX: Content {
// let name: String
// let branches: String?
// }
import DatabaseClient
import Dependencies
import Elementary
import SharedModels
import Vapor
import VaporElementary
struct VendorViewController: RouteCollection {
@Dependency(\.database.vendors) var vendors
@Dependency(\.database.vendorBranches) var vendorBranches
func boot(routes: any RoutesBuilder) throws {
let route = routes.grouped("vendors")
route.get(use: index)
route.post(use: create)
route.get("create", use: form)
route.group(":id") {
$0.get(use: detail)
$0.put(use: update)
$0.post("branches", use: createBranch(req:))
}
}
@Sendable
func index(req: Request) async throws -> HTMLResponse {
try await req.render {
try await mainPage(VendorForm())
}
}
@Sendable
func create(req: Request) async throws -> HTMLResponse {
let vendor = try await vendors.create(req.content.decode(Vendor.Create.self))
return await req.render { VendorDetail(vendor: vendor) }
}
@Sendable
func form(req: Request) async throws -> HTMLResponse {
await req.render { VendorForm(.float(shouldShow: true)) }
}
@Sendable
func detail(req: Request) async throws -> HTMLResponse {
guard let vendor = try await vendors.get(req.ensureIDPathComponent(), .withBranches) else {
throw Abort(.badRequest, reason: "Vendor does not exist.")
}
let html = VendorDetail(vendor: vendor)
guard req.isHtmxRequest else {
return try await req.render { try await mainPage(html) }
}
return await req.render { html }
}
@Sendable
func update(req: Request) async throws -> HTMLResponse {
let vendor = try await vendors.update(
req.ensureIDPathComponent(),
with: req.content.decode(Vendor.Update.self),
returnWithBranches: true
)
return await req.render { VendorDetail(vendor: vendor) }
}
@Sendable
func createBranch(req: Request) async throws -> HTMLResponse {
let vendorID = try req.ensureIDPathComponent()
let create = try req.content.decode(CreateBranch.self)
let branch = try await vendorBranches.create(.init(name: create.name, vendorID: vendorID))
return await req.render { VendorDetail.BranchTable.Row(branch: branch) }
}
private func mainPage<C: HTML>(_ html: C) async throws -> some SendableHTMLDocument where C: Sendable {
let vendors = try await vendors.fetchAll(.withBranches)
return MainPage(displayNav: true, route: .vendors) {
div(.class("container")) {
html
VendorTable(vendors: vendors)
}
}
}
}
struct CreateBranch: Content {
let name: String
}