hhe/vapor-po
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Housh
2025-01-21 21:25:35 -05:00
parent 497355ce1f
commit eb1e27e03a
8 changed files with 160 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/ApiRouteTests/EmployeeApiRouteTests.swift
View File

@@ -63,6 +63,7 @@ struct EmployeeApiRouteTests {
let route = try router.parse(&request)
#expect(
route == .employee(.base(.index))
// route == .employee(\.index)
)
}

12
Tests/ApiRouteTests/PurchaseOrderApiRouteTests.swift
View File

@@ -29,7 +29,7 @@ struct PurchaseOrderApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .purchaseOrder(.create(.init(
#expect(route == .purchaseOrder(.base(.create(.init(
id: 1,
workOrder: 12345,
materials: "some",
@@ -38,7 +38,7 @@ struct PurchaseOrderApiRouteTests {
createdByID: id,
createdForID: id,
vendorBranchID: id
))))
)))))
}
@Test
@@ -60,7 +60,7 @@ struct PurchaseOrderApiRouteTests {
path: "/api/v1/purchase-orders/\(id)"
)
let route = try router.parse(&request)
#expect(route == .purchaseOrder(.get(id: id)))
#expect(route == .purchaseOrder(.base(.get(id: id))))
}
@Test
@@ -70,7 +70,7 @@ struct PurchaseOrderApiRouteTests {
path: "/api/v1/purchase-orders"
)
let route = try router.parse(&request)
#expect(route == .purchaseOrder(.index))
#expect(route == .purchaseOrder(.base(.index)))
}
@Test
@@ -80,7 +80,7 @@ struct PurchaseOrderApiRouteTests {
path: "/api/v1/purchase-orders/next"
)
let route = try router.parse(&request)
#expect(route == .purchaseOrder(.page(page: 1, limit: 25)))
#expect(route == .purchaseOrder(.base(.page(page: 1, limit: 25))))
var request2 = URLRequestData(
method: "GET",
@@ -88,6 +88,6 @@ struct PurchaseOrderApiRouteTests {
query: ["page": ["2"], "limit": ["50"]]
)
let route2 = try router.parse(&request2)
#expect(route2 == .purchaseOrder(.page(page: 2, limit: 50)))
#expect(route2 == .purchaseOrder(.base(.page(page: 2, limit: 50))))
}
}

10
Tests/ApiRouteTests/UserApiRouteTests.swift
View File

@@ -25,12 +25,12 @@ struct UserApiRouteTests {
)
let route = try router.parse(&request)
#expect(
route == .user(.create(.init(
route == .user(.base(.create(.init(
username: "foo",
email: "foo@bar.com",
password: "super-secret",
confirmPassword: "super-secret"
))))
)))))
}
@Test
@@ -52,7 +52,7 @@ struct UserApiRouteTests {
path: "/api/v1/users/\(id)"
)
let route = try router.parse(&request)
#expect(route == .user(.get(id: id)))
#expect(route == .user(.base(.get(id: id))))
}
@Test
@@ -62,7 +62,7 @@ struct UserApiRouteTests {
path: "/api/v1/users"
)
let route = try router.parse(&request)
#expect(route == .user(.index))
#expect(route == .user(.base(.index)))
}
@Test
@@ -80,6 +80,6 @@ struct UserApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .user(.update(id: id, updates: .init(username: "bar", email: "bar@foo.com"))))
#expect(route == .user(.base(.update(id: id, updates: .init(username: "bar", email: "bar@foo.com")))))
}
}

10
Tests/ApiRouteTests/VendorApiRouteTests.swift
View File

@@ -21,7 +21,7 @@ struct VendorApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .vendor(.create(.init(name: "Test"))))
#expect(route == .vendor(.base(.create(.init(name: "Test")))))
}
@Test
@@ -43,7 +43,7 @@ struct VendorApiRouteTests {
path: "/api/v1/vendors/\(id)"
)
let route = try router.parse(&request)
#expect(route == .vendor(.get(id: id)))
#expect(route == .vendor(.base(.get(id: id))))
}
@Test
@@ -53,7 +53,7 @@ struct VendorApiRouteTests {
path: "/api/v1/vendors"
)
let route = try router.parse(&request)
#expect(route == .vendor(.index()))
#expect(route == .vendor(.base(.index())))
var request2 = URLRequestData(
method: "GET",
@@ -61,7 +61,7 @@ struct VendorApiRouteTests {
query: ["branches": ["true"]]
)
let route2 = try router.parse(&request2)
#expect(route2 == .vendor(.index(withBranches: true)))
#expect(route2 == .vendor(.base(.index(withBranches: true))))
}
@Test
@@ -78,6 +78,6 @@ struct VendorApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .vendor(.update(id: id, updates: .init(name: "Test"))))
#expect(route == .vendor(.base(.update(id: id, updates: .init(name: "Test")))))
}
}

10
Tests/ApiRouteTests/VendorBranchApiRouteTests.swift
View File

@@ -23,7 +23,7 @@ struct VendorBranchApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .vendorBranch(.create(.init(name: "Test", vendorID: id))))
#expect(route == .vendorBranch(.base(.create(.init(name: "Test", vendorID: id)))))
}
@Test
@@ -45,7 +45,7 @@ struct VendorBranchApiRouteTests {
path: "/api/v1/vendors/branches/\(id)"
)
let route = try router.parse(&request)
#expect(route == .vendorBranch(.get(id: id)))
#expect(route == .vendorBranch(.base(.get(id: id))))
}
@Test
@@ -56,7 +56,7 @@ struct VendorBranchApiRouteTests {
path: "/api/v1/vendors/branches"
)
let route = try router.parse(&request)
#expect(route == .vendorBranch(.index()))
#expect(route == .vendorBranch(.base(.index())))
var request2 = URLRequestData(
method: "GET",
@@ -64,7 +64,7 @@ struct VendorBranchApiRouteTests {
query: ["vendorID": ["\(id)"]]
)
let route2 = try router.parse(&request2)
#expect(route2 == .vendorBranch(.index(for: id)))
#expect(route2 == .vendorBranch(.base(.index(for: id))))
}
@Test
@@ -81,7 +81,7 @@ struct VendorBranchApiRouteTests {
body: .init(json.utf8)
)
let route = try router.parse(&request)
#expect(route == .vendorBranch(.update(id: id, updates: .init(name: "Test"))))
#expect(route == .vendorBranch(.base(.update(id: id, updates: .init(name: "Test")))))
}
}