feat: Some updates to employee views.

Resources/Views/employees/table-row.leaf

@@ -0,0 +1,40 @@
+<tr id="employee_#(id)">
+  <td>#capitalized(firstName) #capitalized(lastName)</td>
+  <td style="width: 10%; text-align: center;">
+    #if(active):
+    <a class="toggle"
+       hx-patch="/employees/#(id)/toggle-active"
+       hx-target="#employee_#(id)"
+       hx-swap="outerHTML"
+       >
+      <img src="images/toggle-on.svg" alt="Active">
+    </a>
+    #else:
+    <a class="toggle"
+       hx-patch="/employees/#(id)/toggle-active"
+       hx-target="#employee_#(id)"
+       hx-swap="outerHTML"
+       >
+      <img src="images/toggle-off.svg" alt="Active">
+    </a>
+    #endif
+  </td>
+  <td style="width: 100px;">
+      <a class="btn btn-delete"
+         href="javascript:void(0)"
+         hx-delete="/employees/#(id)"
+         hx-target="#employee-table"
+         hx-swap="outerHTML"
+         hx-confirm="Are you sure you want to delete this employee?"
+         >
+        #extend("img/trash-can")
+      </a>
+      <a class="btn btn-edit" hx-get="/employees/#(id)"
+         hx-target="#employee-form"
+         hx-on::after-request=" if(event.detail.successful) toggleContent('form')"
+         >
+         #extend("img/pencil")
+      </a>
+  </td>
+
+</tr>

Resources/Views/employees/table.leaf

@@ -17,46 +17,7 @@
   </thead>
   <tbody>
     #for(employee in employees):
-    <tr id="employee_#(employee.id)">
-      <td>#capitalized(employee.firstName) #capitalized(employee.lastName)</td>
-      <td style="width: 10%; text-align: center;">
-        #if(employee.active):
-        <a class="toggle"
-                hx-post="/employees/#(employee.id)/toggle-active"
-                hx-target="#employee-table"
-                hx-swap="outerHTML"
-                >
-          <img src="images/toggle-on.svg" alt="Active">
-        </a>
-        #else:
-        <a class="toggle"
-                hx-post="/employees/#(employee.id)/toggle-active"
-                hx-target="#employee-table"
-                hx-swap="outerHTML"
-                >
-          <img src="images/toggle-off.svg" alt="Active">
-        </a>
-        #endif
-      </td>
-      <td style="width: 100px;">
-          <a class="btn btn-delete"
-             href="javascript:void(0)"
-             hx-delete="/employees/#(employee.id)"
-             hx-target="#employee-table"
-             hx-swap="outerHTML"
-             hx-confirm="Are you sure you want to delete this employee?"
-             >
-            #extend("img/trash-can")
-          </a>
-          <a class="btn btn-edit" hx-get="/employees/#(employee.id)"
-             hx-target="#employee-form"
-             hx-on::after-request=" if(event.detail.successful) toggleContent('form')"
-             >
-             #extend("img/pencil")
-          </a>
-      </td>
-
-    </tr>
+      #extend("employees/table-row", employee)
     #endfor
   </tbody>
 </table>

Sources/App/Controllers/DB/EmployeeDB.swift

@@ -19,10 +19,18 @@ struct EmployeeDB: Sendable {
   var get: @Sendable (Employee.IDValue) async throws -> Employee.DTO?
   var update: @Sendable (Employee.IDValue, Employee.Update) async throws -> Employee.DTO
   var delete: @Sendable (Employee.IDValue) async throws -> Void
+  var toggleActive: @Sendable (Employee.IDValue) async throws -> Employee.DTO
 
   func fetchAll() async throws -> [Employee.DTO] {
     try await fetchAll(false)
   }
+
+  func get(_ id: String?) async throws -> Employee.DTO? {
+    guard let idString = id, let id = UUID(uuidString: idString) else {
+      throw Abort(.badRequest, reason: "Employee id not valid.")
+    }
+    return try await get(id)
+  }
 }
 
 extension EmployeeDB: TestDependencyKey {
@@ -61,54 +69,15 @@ extension EmployeeDB: TestDependencyKey {
           throw Abort(.badRequest, reason: "Employee id not found.")
         }
         try await employee.delete(on: database)
+      },
+      toggleActive: { id in
+        guard let employee = try await Employee.find(id, on: database) else {
+          throw Abort(.notFound)
+        }
+        employee.active.toggle()
+        try await employee.save(on: database)
+        return employee.toDTO()
       }
     )
   }
 }
-
-// An intermediate layer between our api and view controllers that interacts with the
-// database model.
-// struct EmployeeDB {
-//
-//   func create(_ model: Employee.Create, on db: any Database) async throws -> Employee.DTO {
-//     let model = model.toModel()
-//     try await model.save(on: db)
-//     return model.toDTO()
-//   }
-//
-//   func fetchAll(active: Bool? = nil, on db: any Database) async throws -> [Employee.DTO] {
-//     var query = Employee.query(on: db)
-//       .sort(\.$lastName)
-//
-//     if let active {
-//       query = query.filter(\.$active == active)
-//     }
-//
-//     return try await query.all().map { $0.toDTO() }
-//   }
-//
-//   func get(id: Employee.IDValue, on db: any Database) async throws -> Employee.DTO? {
-//     try await Employee.find(id, on: db).map { $0.toDTO() }
-//   }
-//
-//   func update(
-//     id: Employee.IDValue,
-//     with updates: Employee.Update,
-//     on db: any Database
-//   ) async throws -> Employee.DTO {
-//     guard let employee = try await Employee.find(id, on: db) else {
-//       throw Abort(.badRequest, reason: "Employee id not found.")
-//     }
-//     employee.applyUpdates(updates)
-//     try await employee.save(on: db)
-//     return employee.toDTO()
-//   }
-//
-//   func delete(id: Employee.IDValue, on db: any Database) async throws {
-//     guard let employee = try await Employee.find(id, on: db) else {
-//       throw Abort(.badRequest, reason: "Employee id not found.")
-//     }
-//     try await employee.delete(on: db)
-//   }
-//
-// }

Sources/App/Controllers/View/EmployeeViewController.swift

@@ -6,7 +6,6 @@ import Vapor
 struct EmployeeViewController: RouteCollection {
 
   @Dependency(\.employees) var employees
-  private let api = EmployeeApiController()
 
   func boot(routes: any RoutesBuilder) throws {
     let protected = routes.protected.grouped("employees")
@@ -17,7 +16,7 @@ struct EmployeeViewController: RouteCollection {
       $0.get(use: edit(req:))
       $0.delete(use: delete(req:))
       $0.put(use: update(req:))
-      $0.post("toggle-active", use: toggleActive(req:))
+      $0.patch("toggle-active", use: toggleActive(req:))
     }
   }
 
@@ -36,33 +35,35 @@ struct EmployeeViewController: RouteCollection {
 
   @Sendable
   func toggleActive(req: Request) async throws -> View {
-    guard let employee = try await Employee.find(req.parameters.get("employeeID"), on: req.db) else {
-      throw Abort(.notFound)
+    guard let id = req.parameters.get("employeeID", as: Employee.IDValue.self) else {
+      throw Abort(.badRequest, reason: "Employee id not supplied.")
     }
-    employee.active.toggle()
-    try await employee.save(on: req.db)
-    let employees = try await employees.fetchAll()
-    return try await req.view.render("employees/table", ["employees": employees])
+    let employee = try await employees.toggleActive(id)
+    return try await req.view.render("employees/table-row", employee)
   }
 
   @Sendable
   func delete(req: Request) async throws -> View {
-    _ = try await api.delete(req: req)
+    let id = try req.requireEmployeeID()
+    _ = try await employees.delete(id)
     let employees = try await employees.fetchAll()
     return try await req.view.render("employees/table", ["employees": employees])
   }
 
   @Sendable
   func edit(req: Request) async throws -> View {
-    guard let employee = try await Employee.find(req.parameters.get("employeeID"), on: req.db) else {
+    guard let employee = try await employees.get(req.parameters.get("employeeID")) else {
       throw Abort(.notFound)
     }
-    return try await req.view.render("employees/form", EmployeeFormCTX(employee: employee.toDTO()))
+    return try await req.view.render("employees/form", EmployeeFormCTX(employee: employee))
   }
 
   @Sendable
   func update(req: Request) async throws -> View {
-    _ = try await api.update(req: req)
+    let id = try req.requireEmployeeID()
+    try Employee.Update.validate(content: req)
+    let updates = try req.content.decode(Employee.Update.self)
+    _ = try await employees.update(id, updates)
     return try await req.view.render("employees/index", EmployeesCTX(oob: true, db: employees))
   }
 
@@ -73,6 +74,15 @@ struct EmployeeViewController: RouteCollection {
 
 }
 
+private extension Request {
+  func requireEmployeeID() throws -> Employee.IDValue {
+    guard let id = parameters.get("employeeID", as: Employee.IDValue.self) else {
+      throw Abort(.badRequest, reason: "Employee id not supplied")
+    }
+    return id
+  }
+}
+
 private struct EmployeesCTX: Content {
   let oob: Bool
   let employees: [Employee.DTO]