feat: Begins vendor views, working form, and table. Styles need some updates.
This commit is contained in:
@@ -31,7 +31,7 @@ struct ApiController: RouteCollection {
|
||||
purchaseOrders.post(use: createPurchaseOrder(req:))
|
||||
|
||||
users.get(use: usersIndex(req:))
|
||||
users.post(use: createUser(req:))
|
||||
api.post("users", use: createUser(req:))
|
||||
users.group("login") {
|
||||
$0.get(use: self.login(req:))
|
||||
}
|
||||
@@ -83,7 +83,7 @@ struct ApiController: RouteCollection {
|
||||
throw Abort(.notFound)
|
||||
}
|
||||
try await employee.delete(on: req.db)
|
||||
return .noContent
|
||||
return .ok
|
||||
}
|
||||
|
||||
@Sendable
|
||||
@@ -150,6 +150,13 @@ struct ApiController: RouteCollection {
|
||||
|
||||
@Sendable
|
||||
func createUser(req: Request) async throws -> User.DTO {
|
||||
let count = try await User.query(on: req.db).count()
|
||||
if count > 0 {
|
||||
guard req.auth.get(User.self) != nil else {
|
||||
throw Abort(.unauthorized)
|
||||
}
|
||||
}
|
||||
|
||||
try User.Create.validate(content: req)
|
||||
let create = try req.content.decode(User.Create.self)
|
||||
guard create.password == create.confirmPassword else {
|
||||
@@ -184,7 +191,7 @@ struct ApiController: RouteCollection {
|
||||
}
|
||||
|
||||
try await user.delete(on: req.db)
|
||||
return .noContent
|
||||
return .ok
|
||||
}
|
||||
|
||||
// MARK: - Vendors
|
||||
@@ -198,7 +205,10 @@ struct ApiController: RouteCollection {
|
||||
dbQuery = dbQuery.with(\.$branches)
|
||||
}
|
||||
|
||||
return try await dbQuery.all().map { $0.toDTO(includeBranches: params.branches) }
|
||||
return try await dbQuery
|
||||
.sort(\.$name, .ascending)
|
||||
.all()
|
||||
.map { $0.toDTO(includeBranches: params.branches) }
|
||||
}
|
||||
|
||||
@Sendable
|
||||
@@ -228,7 +238,7 @@ struct ApiController: RouteCollection {
|
||||
}
|
||||
|
||||
try await vendor.delete(on: req.db)
|
||||
return .noContent
|
||||
return .ok
|
||||
}
|
||||
|
||||
// MARK: - VendorBranch
|
||||
@@ -258,7 +268,7 @@ struct ApiController: RouteCollection {
|
||||
throw Abort(.notFound)
|
||||
}
|
||||
try await branch.delete(on: req.db)
|
||||
return .noContent
|
||||
return .ok
|
||||
}
|
||||
|
||||
@Sendable
|
||||
|
||||
@@ -5,16 +5,105 @@ struct VendorViewController: RouteCollection {
|
||||
private let api = ApiController()
|
||||
|
||||
func boot(routes: any RoutesBuilder) throws {
|
||||
// Do something.
|
||||
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", makeCtx(req: req))
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func create(req: Request) async throws -> View {
|
||||
let ctx = try req.content.decode(CreateVendorCTX.self)
|
||||
req.logger.info("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
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// _ = try await api.createVendor(req: req)
|
||||
return try await req.view.render("vendor-table", makeCtx(req: req))
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func delete(req: Request) async throws -> HTTPStatus {
|
||||
try await api.deleteVendor(req: req)
|
||||
}
|
||||
|
||||
@Sendable
|
||||
func update(req: Request) async throws -> View {
|
||||
_ = try await api.updateVendor(req: req)
|
||||
return try await req.view.render("vendor-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 vendor: Vendor?
|
||||
let buttonLabel: String
|
||||
let htmxForm: HtmxFormCTX<Context>
|
||||
|
||||
init(vendor: Vendor? = nil, buttonLabel: String = "Create") {
|
||||
self.vendor = vendor
|
||||
self.buttonLabel = buttonLabel
|
||||
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?
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ struct ViewController: RouteCollection {
|
||||
private let api = ApiController()
|
||||
private let employees = EmployeeViewController()
|
||||
private let users = UserViewController()
|
||||
private let vendors = VendorViewController()
|
||||
|
||||
func boot(routes: any RoutesBuilder) throws {
|
||||
let protected = routes.protected
|
||||
@@ -25,6 +26,7 @@ struct ViewController: RouteCollection {
|
||||
// protected.get("users", use: users(req:))
|
||||
try routes.register(collection: employees)
|
||||
try routes.register(collection: users)
|
||||
try routes.register(collection: vendors)
|
||||
}
|
||||
|
||||
@Sendable
|
||||
@@ -99,6 +101,7 @@ private struct UserForm: Content {
|
||||
enum HomeRoute: String, Content {
|
||||
case employees
|
||||
case users
|
||||
case vendors
|
||||
}
|
||||
|
||||
struct HomeCTX: Content {
|
||||
|
||||
Reference in New Issue
Block a user