feat: Updates views to use new api controllers and db items.

Sources/App/Controllers/EmployeeViewController.swift

@@ -4,14 +4,15 @@ import Vapor
 
 struct EmployeeViewController: RouteCollection {
 
-  private let api = ApiController()
+  private let employees = EmployeeDB()
+  private let api = EmployeeApiController()
 
   func boot(routes: any RoutesBuilder) throws {
-    let employees = routes.protected.grouped("employees")
-    employees.get(use: index(req:))
-    employees.get("form", use: employeeForm(req:))
-    employees.post(use: create(req:))
-    employees.group(":employeeID") {
+    let protected = routes.protected.grouped("employees")
+    protected.get(use: index(req:))
+    protected.get("form", use: employeeForm(req:))
+    protected.post(use: create(req:))
+    protected.group(":employeeID") {
       $0.get(use: edit(req:))
       $0.delete(use: delete(req:))
       $0.put(use: update(req:))
@@ -21,13 +22,16 @@ struct EmployeeViewController: RouteCollection {
 
   @Sendable
   func index(req: Request) async throws -> View {
-    return try await req.view.render("employees/index", EmployeesCTX(api: api, req: req))
+    return try await req.view.render("employees/index", EmployeesCTX(db: employees, req: req))
   }
 
   @Sendable
   func create(req: Request) async throws -> View {
-    _ = try await api.createEmployee(req: req)
-    return try await req.view.render("employees/index", EmployeesCTX(oob: true, api: api, req: req))
+    try Employee.Create.validate(content: req)
+    let model = try req.content.decode(Employee.Create.self)
+    _ = try await employees.create(model, on: req.db)
+    // _ = try await db.createEmployee(req: req)
+    return try await req.view.render("employees/index", EmployeesCTX(oob: true, db: employees, req: req))
   }
 
   @Sendable
@@ -37,14 +41,14 @@ struct EmployeeViewController: RouteCollection {
     }
     employee.active.toggle()
     try await employee.save(on: req.db)
-    let employees = try await api.getSortedEmployees(req: req)
+    let employees = try await employees.fetchAll(on: req.db)
     return try await req.view.render("employees/table", ["employees": employees])
   }
 
   @Sendable
   func delete(req: Request) async throws -> View {
-    _ = try await api.deleteEmployee(req: req)
-    let employees = try await api.getSortedEmployees(req: req)
+    _ = try await api.delete(req: req)
+    let employees = try await employees.fetchAll(on: req.db)
     return try await req.view.render("employees/table", ["employees": employees])
   }
 
@@ -58,8 +62,8 @@ struct EmployeeViewController: RouteCollection {
 
   @Sendable
   func update(req: Request) async throws -> View {
-    _ = try await api.updateEmployee(req: req)
-    return try await req.view.render("employees/index", EmployeesCTX(oob: true, api: api, req: req))
+    _ = try await api.update(req: req)
+    return try await req.view.render("employees/index", EmployeesCTX(oob: true, db: employees, req: req))
   }
 
   @Sendable
@@ -77,11 +81,11 @@ private struct EmployeesCTX: Content {
   init(
     oob: Bool = false,
     employee: Employee? = nil,
-    api: ApiController,
+    db: EmployeeDB,
     req: Request
   ) async throws {
     self.oob = oob
-    self.employees = try await api.getSortedEmployees(req: req)
+    self.employees = try await db.fetchAll(on: req.db)
     self.form = .init(employee: employee.map { $0.toDTO() })
   }
 }
@@ -108,13 +112,3 @@ private struct EmployeeFormCTX: Content {
     let employee: Employee.DTO?
   }
 }
-
-private extension ApiController {
-
-  func getSortedEmployees(req: Request) async throws -> [Employee.DTO] {
-    var employees = try await employeesIndex(req: req)
-    employees.sort { ($0.active ?? false) && !($1.active ?? false) }
-    employees.sort { ($0.lastName ?? "") < ($1.lastName ?? "") }
-    return employees
-  }
-}