feat: Begins integrating database client into vapor app.

Sources/App/Controllers/Api/EmployeeApiController.swift

@@ -1,64 +1,64 @@
-import Dependencies
-import Fluent
-import Vapor
-
-struct EmployeeApiController: RouteCollection {
-
-  @Dependency(\.employees) var employees
-
-  func boot(routes: any RoutesBuilder) throws {
-    let protected = routes.apiProtected(route: "employees")
-    protected.get(use: index(req:))
-    protected.post(use: create(req:))
-    protected.group(":employeeID") {
-      $0.get(use: get(req:))
-      $0.put(use: update(req:))
-      $0.delete(use: delete(req:))
-    }
-  }
-
-  @Sendable
-  func index(req: Request) async throws -> [Employee.DTO] {
-    let params = try req.query.decode(EmployeesIndexQuery.self)
-    return try await employees.fetchAll(params.active == true ? .active : .default)
-  }
-
-  @Sendable
-  func create(req: Request) async throws -> Employee.DTO {
-    try await employees.create(
-      req.ensureValidContent(Employee.Create.self)
-    )
-  }
-
-  @Sendable
-  func get(req: Request) async throws -> Employee.DTO {
-    guard let id = req.parameters.get("employeeID", as: Employee.IDValue.self),
-          let employee = try await employees.get(id)
-    else {
-      throw Abort(.notFound)
-    }
-    return employee
-  }
-
-  @Sendable
-  func update(req: Request) async throws -> Employee.DTO {
-    guard let employeeID = req.parameters.get("employeeID", as: Employee.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Employee id value not provided")
-    }
-    let updates = try req.ensureValidContent(Employee.Update.self)
-    return try await employees.update(employeeID, updates)
-  }
-
-  @Sendable
-  func delete(req: Request) async throws -> HTTPStatus {
-    guard let employeeID = req.parameters.get("employeeID", as: Employee.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Employee id value not provided")
-    }
-    try await employees.delete(employeeID)
-    return .ok
-  }
-}
-
-struct EmployeesIndexQuery: Content {
-  let active: Bool?
-}
+// import Dependencies
+// import Fluent
+// import Vapor
+//
+// struct EmployeeApiController: RouteCollection {
+//
+//   @Dependency(\.employees) var employees
+//
+//   func boot(routes: any RoutesBuilder) throws {
+//     let protected = routes.apiProtected(route: "employees")
+//     protected.get(use: index(req:))
+//     protected.post(use: create(req:))
+//     protected.group(":employeeID") {
+//       $0.get(use: get(req:))
+//       $0.put(use: update(req:))
+//       $0.delete(use: delete(req:))
+//     }
+//   }
+//
+//   @Sendable
+//   func index(req: Request) async throws -> [Employee.DTO] {
+//     let params = try req.query.decode(EmployeesIndexQuery.self)
+//     return try await employees.fetchAll(params.active == true ? .active : .default)
+//   }
+//
+//   @Sendable
+//   func create(req: Request) async throws -> Employee.DTO {
+//     try await employees.create(
+//       req.ensureValidContent(Employee.Create.self)
+//     )
+//   }
+//
+//   @Sendable
+//   func get(req: Request) async throws -> Employee.DTO {
+//     guard let id = req.parameters.get("employeeID", as: Employee.IDValue.self),
+//           let employee = try await employees.get(id)
+//     else {
+//       throw Abort(.notFound)
+//     }
+//     return employee
+//   }
+//
+//   @Sendable
+//   func update(req: Request) async throws -> Employee.DTO {
+//     guard let employeeID = req.parameters.get("employeeID", as: Employee.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Employee id value not provided")
+//     }
+//     let updates = try req.ensureValidContent(Employee.Update.self)
+//     return try await employees.update(employeeID, updates)
+//   }
+//
+//   @Sendable
+//   func delete(req: Request) async throws -> HTTPStatus {
+//     guard let employeeID = req.parameters.get("employeeID", as: Employee.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Employee id value not provided")
+//     }
+//     try await employees.delete(employeeID)
+//     return .ok
+//   }
+// }
+//
+// struct EmployeesIndexQuery: Content {
+//   let active: Bool?
+// }

Sources/App/Controllers/Api/PurchaseOrderApiController.swift

@@ -1,61 +1,61 @@
-import Dependencies
-import Fluent
-import Vapor
-
-// TODO: Add update route.
-
-struct PurchaseOrderApiController: RouteCollection {
-
-  @Dependency(\.purchaseOrders) var purchaseOrders
-
-  func boot(routes: any RoutesBuilder) throws {
-    let protected = routes.apiProtected(route: "purchase-orders")
-    protected.get(use: index(req:))
-    protected.post(use: create(req:))
-    protected.group(":id") {
-      $0.get(use: get(req:))
-      $0.delete(use: delete(req:))
-    }
-  }
-
-  @Sendable
-  func index(req: Request) async throws -> [PurchaseOrder.DTO] {
-    try await purchaseOrders.fetchAll()
-  }
-
-  @Sendable
-  func create(req: Request) async throws -> PurchaseOrder.DTO {
-    try await purchaseOrders.create(
-      req.ensureValidContent(PurchaseOrder.Create.self),
-      req.auth.require(User.self).requireID()
-    )
-  }
-
-  @Sendable
-  func get(req: Request) async throws -> PurchaseOrder.DTO {
-    guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self),
-          let purchaseOrder = try await purchaseOrders.get(id)
-    else {
-      throw Abort(.notFound)
-    }
-    return purchaseOrder
-  }
-
-  @Sendable
-  func delete(req: Request) async throws -> HTTPStatus {
-    guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Purchase order id not provided.")
-    }
-    try await purchaseOrders.delete(id)
-    return .ok
-  }
-
-  // @Sendable
-  // func update(req: Request) async throws -> PurchaseOrder.DTO {
-  //   guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self) else {
-  //     throw Abort(.badRequest, reason: "Purchase order id not provided.")
-  //   }
-  //   try await purchaseOrders.delete(id: id, on: req.db)
-  //   return .ok
-  // }
-}
+// import Dependencies
+// import Fluent
+// import Vapor
+//
+// // TODO: Add update route.
+//
+// struct PurchaseOrderApiController: RouteCollection {
+//
+//   @Dependency(\.purchaseOrders) var purchaseOrders
+//
+//   func boot(routes: any RoutesBuilder) throws {
+//     let protected = routes.apiProtected(route: "purchase-orders")
+//     protected.get(use: index(req:))
+//     protected.post(use: create(req:))
+//     protected.group(":id") {
+//       $0.get(use: get(req:))
+//       $0.delete(use: delete(req:))
+//     }
+//   }
+//
+//   @Sendable
+//   func index(req: Request) async throws -> [PurchaseOrder.DTO] {
+//     try await purchaseOrders.fetchAll()
+//   }
+//
+//   @Sendable
+//   func create(req: Request) async throws -> PurchaseOrder.DTO {
+//     try await purchaseOrders.create(
+//       req.ensureValidContent(PurchaseOrder.Create.self),
+//       req.auth.require(User.self).requireID()
+//     )
+//   }
+//
+//   @Sendable
+//   func get(req: Request) async throws -> PurchaseOrder.DTO {
+//     guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self),
+//           let purchaseOrder = try await purchaseOrders.get(id)
+//     else {
+//       throw Abort(.notFound)
+//     }
+//     return purchaseOrder
+//   }
+//
+//   @Sendable
+//   func delete(req: Request) async throws -> HTTPStatus {
+//     guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Purchase order id not provided.")
+//     }
+//     try await purchaseOrders.delete(id)
+//     return .ok
+//   }
+//
+//   // @Sendable
+//   // func update(req: Request) async throws -> PurchaseOrder.DTO {
+//   //   guard let id = req.parameters.get("id", as: PurchaseOrder.IDValue.self) else {
+//   //     throw Abort(.badRequest, reason: "Purchase order id not provided.")
+//   //   }
+//   //   try await purchaseOrders.delete(id: id, on: req.db)
+//   //   return .ok
+//   // }
+// }

Sources/App/Controllers/Api/UserApiController.swift

@@ -1,11 +1,13 @@
+import DatabaseClient
 import Dependencies
 import Fluent
+import SharedModels
 import Vapor
 
 // TODO: Add update and get by id.
 struct UserApiController: RouteCollection {
 
-  @Dependency(\.users) var users
+  @Dependency(\.database.users) var users
 
   func boot(routes: any RoutesBuilder) throws {
     let unProtected = routes.apiUnprotected(route: "users")
@@ -20,26 +22,28 @@ struct UserApiController: RouteCollection {
   }
 
   @Sendable
-  func index(req: Request) async throws -> [User.DTO] {
+  func index(req: Request) async throws -> [User] {
     try await users.fetchAll()
   }
 
   @Sendable
-  func create(req: Request) async throws -> User.DTO {
+  func create(req: Request) async throws -> User {
     // Allow the first user to be created without authentication.
-    let count = try await User.query(on: req.db).count()
+    // let count = try await User.query(on: req.db).count()
+    let count = try await users.count()
     if count > 0 {
       guard req.auth.get(User.self) != nil else {
         throw Abort(.unauthorized)
       }
     }
-    return try await users.create(req.ensureValidContent(User.Create.self))
+    return try await users.create(req.content.decode(User.Create.self))
   }
 
   @Sendable
-  func login(req: Request) async throws -> UserToken {
+  func login(req: Request) async throws -> User {
     let user = try req.auth.require(User.self)
-    return try await users.login(user)
+    return user
+    // return try await users.login(user)
   }
 
   // @Sendable
@@ -50,9 +54,10 @@ struct UserApiController: RouteCollection {
 
   @Sendable
   func delete(req: Request) async throws -> HTTPStatus {
-    guard let id = req.parameters.get("id", as: User.IDValue.self) else {
-      throw Abort(.badRequest, reason: "User id not provided")
-    }
+    // guard let id = req.parameters.get("id", as: User.IDValue.self) else {
+    //   throw Abort(.badRequest, reason: "User id not provided")
+    // }
+    let id = try req.ensureIDPathComponent()
     try await users.delete(id)
     return .ok
   }

Sources/App/Controllers/Api/VendorApiController.swift

@@ -1,57 +1,57 @@
-import Dependencies
-import Fluent
-import Vapor
-
-struct VendorApiController: RouteCollection {
-
-  @Dependency(\.vendors) var vendors
-
-  func boot(routes: any RoutesBuilder) throws {
-    let protected = routes.apiProtected(route: "vendors")
-    protected.get(use: index(req:))
-    protected.post(use: create(req:))
-    protected.group(":id") {
-      $0.put(use: update(req:))
-      $0.delete(use: delete(req:))
-    }
-  }
-
-  @Sendable
-  func index(req: Request) async throws -> [Vendor.DTO] {
-    let params = try req.query.decode(VendorsIndexQuery.self)
-    return try await vendors.fetchAll(params.fetchRequest)
-  }
-
-  @Sendable
-  func create(req: Request) async throws -> Vendor.DTO {
-    try await vendors.create(req.ensureValidContent(Vendor.Create.self))
-  }
-
-  @Sendable
-  func update(req: Request) async throws -> Vendor.DTO {
-    guard let id = req.parameters.get("id", as: Vendor.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor id not provided.")
-    }
-    try Vendor.Update.validate(content: req)
-    let updates = try req.content.decode(Vendor.Update.self)
-    return try await vendors.update(id, updates)
-  }
-
-  @Sendable
-  func delete(req: Request) async throws -> HTTPStatus {
-    guard let id = req.parameters.get("id", as: Vendor.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor id not provided.")
-    }
-    try await vendors.delete(id)
-    return .ok
-  }
-}
-
-struct VendorsIndexQuery: Content {
-  let branches: Bool?
-
-  var fetchRequest: VendorDB.FetchRequest {
-    if branches == true { return .withBranches }
-    return .default
-  }
-}
+// import Dependencies
+// import Fluent
+// import Vapor
+//
+// struct VendorApiController: RouteCollection {
+//
+//   @Dependency(\.vendors) var vendors
+//
+//   func boot(routes: any RoutesBuilder) throws {
+//     let protected = routes.apiProtected(route: "vendors")
+//     protected.get(use: index(req:))
+//     protected.post(use: create(req:))
+//     protected.group(":id") {
+//       $0.put(use: update(req:))
+//       $0.delete(use: delete(req:))
+//     }
+//   }
+//
+//   @Sendable
+//   func index(req: Request) async throws -> [Vendor.DTO] {
+//     let params = try req.query.decode(VendorsIndexQuery.self)
+//     return try await vendors.fetchAll(params.fetchRequest)
+//   }
+//
+//   @Sendable
+//   func create(req: Request) async throws -> Vendor.DTO {
+//     try await vendors.create(req.ensureValidContent(Vendor.Create.self))
+//   }
+//
+//   @Sendable
+//   func update(req: Request) async throws -> Vendor.DTO {
+//     guard let id = req.parameters.get("id", as: Vendor.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor id not provided.")
+//     }
+//     try Vendor.Update.validate(content: req)
+//     let updates = try req.content.decode(Vendor.Update.self)
+//     return try await vendors.update(id, updates)
+//   }
+//
+//   @Sendable
+//   func delete(req: Request) async throws -> HTTPStatus {
+//     guard let id = req.parameters.get("id", as: Vendor.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor id not provided.")
+//     }
+//     try await vendors.delete(id)
+//     return .ok
+//   }
+// }
+//
+// struct VendorsIndexQuery: Content {
+//   let branches: Bool?
+//
+//   var fetchRequest: VendorDB.FetchRequest {
+//     if branches == true { return .withBranches }
+//     return .default
+//   }
+// }

Sources/App/Controllers/Api/VendorBranchApiController.swift

@@ -1,67 +1,67 @@
-import Dependencies
-import Fluent
-import Vapor
-
-struct VendorBranchApiController: RouteCollection {
-
-  @Dependency(\.vendorBranches) var vendorBranches
-
-  func boot(routes: any RoutesBuilder) throws {
-    let prefix = routes.apiProtected(route: "vendors")
-    let root = prefix.grouped("branches")
-    root.get(use: index(req:))
-    root.group(":id") {
-      $0.put(use: update(req:))
-      $0.delete(use: delete(req:))
-    }
-
-    prefix.group(":vendorID", "branches") {
-      $0.get(use: indexForVendor(req:))
-      $0.post(use: create(req:))
-    }
-  }
-
-  @Sendable
-  func index(req: Request) async throws -> [VendorBranch.DTO] {
-    try await vendorBranches.fetchAll()
-  }
-
-  @Sendable
-  func indexForVendor(req: Request) async throws -> [VendorBranch.DTO] {
-    guard let id = req.parameters.get("vendorID", as: Vendor.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor id not provided.")
-    }
-    return try await vendorBranches.fetchAll(.for(vendorID: id))
-  }
-
-  @Sendable
-  func create(req: Request) async throws -> VendorBranch.DTO {
-    guard let id = req.parameters.get("vendorID", as: Vendor.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor id not provided.")
-    }
-    return try await vendorBranches.create(
-      req.ensureValidContent(VendorBranch.Create.self),
-      id
-    )
-  }
-
-  @Sendable
-  func update(req: Request) async throws -> VendorBranch.DTO {
-    guard let id = req.parameters.get("id", as: VendorBranch.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor branch id not provided.")
-    }
-    try VendorBranch.Update.validate(content: req)
-    let updates = try req.content.decode(VendorBranch.Update.self)
-    return try await vendorBranches.update(id, updates)
-  }
-
-  @Sendable
-  func delete(req: Request) async throws -> HTTPStatus {
-    guard let id = req.parameters.get("id", as: VendorBranch.IDValue.self) else {
-      throw Abort(.badRequest, reason: "Vendor branch id not provided.")
-    }
-    try await vendorBranches.delete(id)
-    return .ok
-  }
-
-}
+// import Dependencies
+// import Fluent
+// import Vapor
+//
+// struct VendorBranchApiController: RouteCollection {
+//
+//   @Dependency(\.vendorBranches) var vendorBranches
+//
+//   func boot(routes: any RoutesBuilder) throws {
+//     let prefix = routes.apiProtected(route: "vendors")
+//     let root = prefix.grouped("branches")
+//     root.get(use: index(req:))
+//     root.group(":id") {
+//       $0.put(use: update(req:))
+//       $0.delete(use: delete(req:))
+//     }
+//
+//     prefix.group(":vendorID", "branches") {
+//       $0.get(use: indexForVendor(req:))
+//       $0.post(use: create(req:))
+//     }
+//   }
+//
+//   @Sendable
+//   func index(req: Request) async throws -> [VendorBranch.DTO] {
+//     try await vendorBranches.fetchAll()
+//   }
+//
+//   @Sendable
+//   func indexForVendor(req: Request) async throws -> [VendorBranch.DTO] {
+//     guard let id = req.parameters.get("vendorID", as: Vendor.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor id not provided.")
+//     }
+//     return try await vendorBranches.fetchAll(.for(vendorID: id))
+//   }
+//
+//   @Sendable
+//   func create(req: Request) async throws -> VendorBranch.DTO {
+//     guard let id = req.parameters.get("vendorID", as: Vendor.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor id not provided.")
+//     }
+//     return try await vendorBranches.create(
+//       req.ensureValidContent(VendorBranch.Create.self),
+//       id
+//     )
+//   }
+//
+//   @Sendable
+//   func update(req: Request) async throws -> VendorBranch.DTO {
+//     guard let id = req.parameters.get("id", as: VendorBranch.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor branch id not provided.")
+//     }
+//     try VendorBranch.Update.validate(content: req)
+//     let updates = try req.content.decode(VendorBranch.Update.self)
+//     return try await vendorBranches.update(id, updates)
+//   }
+//
+//   @Sendable
+//   func delete(req: Request) async throws -> HTTPStatus {
+//     guard let id = req.parameters.get("id", as: VendorBranch.IDValue.self) else {
+//       throw Abort(.badRequest, reason: "Vendor branch id not provided.")
+//     }
+//     try await vendorBranches.delete(id)
+//     return .ok
+//   }
+//
+// }