feat: Uses base routes for api... Not sure I like this solution, perhaps just make base parsers.

This commit is contained in:
2025-01-21 21:25:35 -05:00
parent 497355ce1f
commit eb1e27e03a
8 changed files with 160 additions and 112 deletions

View File

@@ -2,15 +2,13 @@ import CasePaths
import Foundation
@preconcurrency import URLRouting
@CasePathable
@dynamicMemberLookup
public enum ApiRoute: Sendable, Equatable {
case employee(EmployeeRoute)
case purchaseOrder(BaseRoute.PurchaseOrderRoute)
case user(BaseRoute.UserRoute)
case vendor(BaseRoute.VendorRoute)
case vendorBranch(BaseRoute.VendorBranchRoute)
case purchaseOrder(PurchaseOrderRoute)
case user(UserRoute)
case vendor(VendorRoute)
case vendorBranch(VendorBranchRoute)
static let rootPath = Path { "api"; "v1" }
@@ -21,24 +19,22 @@ public enum ApiRoute: Sendable, Equatable {
}
Route(.case(Self.purchaseOrder)) {
rootPath
BaseRoute.PurchaseOrderRoute.router
PurchaseOrderRoute.router
}
Route(.case(Self.user)) {
rootPath
BaseRoute.UserRoute.router
UserRoute.router
}
Route(.case(Self.vendor)) {
rootPath
BaseRoute.VendorRoute.router
VendorRoute.router
}
Route(.case(Self.vendorBranch)) {
rootPath
BaseRoute.VendorBranchRoute.router
VendorBranchRoute.router
}
}
@CasePathable
@dynamicMemberLookup
public enum EmployeeRoute: Sendable, Equatable {
case base(BaseRoute.EmployeeRoute)
case delete(id: Employee.ID)
@@ -48,7 +44,67 @@ public enum ApiRoute: Sendable, Equatable {
BaseRoute.EmployeeRoute.router
}
Route(.case(Self.delete(id:))) {
Path { BaseRoute.EmployeeRoute.rootPath; UUID.parser() }
Path { BaseRoute.EmployeeRoute.rootPath; Employee.ID.parser() }
Method.delete
}
}
}
public enum PurchaseOrderRoute: Sendable, Equatable {
case base(BaseRoute.PurchaseOrderRoute)
case delete(id: PurchaseOrder.ID)
public static let router = OneOf {
Route(.case(Self.base)) {
BaseRoute.PurchaseOrderRoute.router
}
Route(.case(Self.delete(id:))) {
Path { BaseRoute.PurchaseOrderRoute.rootPath; PurchaseOrder.ID.parser() }
Method.delete
}
}
}
public enum UserRoute: Sendable, Equatable {
case base(BaseRoute.UserRoute)
case delete(id: User.ID)
public static let router = OneOf {
Route(.case(Self.base)) {
BaseRoute.UserRoute.router
}
Route(.case(Self.delete(id:))) {
Path { BaseRoute.UserRoute.rootPath; User.ID.parser() }
Method.delete
}
}
}
public enum VendorRoute: Sendable, Equatable {
case base(BaseRoute.VendorRoute)
case delete(id: Vendor.ID)
public static let router = OneOf {
Route(.case(Self.base)) {
BaseRoute.VendorRoute.router
}
Route(.case(Self.delete(id:))) {
Path { BaseRoute.VendorRoute.rootPath; Vendor.ID.parser() }
Method.delete
}
}
}
public enum VendorBranchRoute: Sendable, Equatable {
case base(BaseRoute.VendorBranchRoute)
case delete(id: VendorBranch.ID)
public static let router = OneOf {
Route(.case(Self.base)) {
BaseRoute.VendorBranchRoute.router
}
Route(.case(Self.delete(id:))) {
Path { "vendors"; "branches"; VendorBranch.ID.parser() }
Method.delete
}
}

View File

@@ -5,9 +5,6 @@ import Foundation
public enum BaseRoute {}
public extension BaseRoute {
@CasePathable
@dynamicMemberLookup
enum EmployeeRoute: Sendable, Equatable {
case create(Employee.Create)
case get(id: Employee.ID)
@@ -37,11 +34,11 @@ public extension BaseRoute {
Method.get
}
Route(.case(Self.get(id:))) {
Path { rootPath; UUID.parser() }
Path { rootPath; Employee.ID.parser() }
Method.get
}
Route(.case(Self.update(id:updates:))) {
Path { rootPath; UUID.parser() }
Path { rootPath; Employee.ID.parser() }
Method.put
OneOf {
Body(.json(Employee.Update.self))
@@ -62,7 +59,6 @@ public extension BaseRoute {
public extension BaseRoute {
enum PurchaseOrderRoute: Sendable, Equatable {
case create(PurchaseOrder.Create)
case delete(id: PurchaseOrder.ID)
case get(id: PurchaseOrder.ID)
case index
case page(page: Int, limit: Int)
@@ -90,10 +86,6 @@ public extension BaseRoute {
}
}
}
Route(.case(Self.delete(id:))) {
Path { rootPath; Digits() }
Method.delete
}
Route(.case(Self.get(id:))) {
Path { rootPath; Digits() }
Method.get
@@ -117,7 +109,6 @@ public extension BaseRoute {
public extension BaseRoute {
enum UserRoute: Sendable, Equatable {
case create(User.Create)
case delete(id: User.ID)
case get(id: User.ID)
case index
case update(id: User.ID, updates: User.Update)
@@ -141,10 +132,6 @@ public extension BaseRoute {
}
}
}
Route(.case(Self.delete(id:))) {
Path { rootPath; User.ID.parser() }
Method.delete
}
Route(.case(Self.get(id:))) {
Path { rootPath; User.ID.parser() }
Method.get
@@ -178,7 +165,6 @@ public extension BaseRoute {
enum VendorRoute: Sendable, Equatable {
case index(withBranches: Bool? = nil)
case create(Vendor.Create)
case delete(id: Vendor.ID)
case get(id: Vendor.ID)
case update(id: Vendor.ID, updates: Vendor.Update)
@@ -198,10 +184,6 @@ public extension BaseRoute {
}
}
}
Route(.case(Self.delete(id:))) {
Path { rootPath; Vendor.ID.parser() }
Method.delete
}
Route(.case(Self.get(id:))) {
Path { rootPath; Vendor.ID.parser() }
Method.get
@@ -237,7 +219,6 @@ public extension BaseRoute {
public extension BaseRoute {
enum VendorBranchRoute: Sendable, Equatable {
case create(VendorBranch.Create)
case delete(id: VendorBranch.ID)
case get(id: VendorBranch.ID)
case index(for: Vendor.ID? = nil)
case update(id: VendorBranch.ID, updates: VendorBranch.Update)
@@ -257,11 +238,6 @@ public extension BaseRoute {
}
}
}
Route(.case(Self.delete(id:))) {
Path { "vendors"; "branches"; VendorBranch.ID.parser() }
Method.delete
}
Route(.case(Self.get(id:))) {
Path { "vendors"; "branches"; VendorBranch.ID.parser() }
Method.get