feat: Convert Uuid IDs to StrongIds

ji-devs · Jul 14, 2023 · a6405ae · a6405ae
1 parent 5ccef63
commit a6405ae
Show file tree

Hide file tree

Showing 40 changed files with 544 additions and 222 deletions.
diff --git a/backend/api/Cargo.lock b/backend/api/Cargo.lock
diff --git a/backend/api/Cargo.toml b/backend/api/Cargo.toml
@@ -60,6 +60,7 @@ quote = "1.0.18"
 hashfn = "0.2.0"
 csv = "1.1.6"
 async-stripe = { version = "0.22.2", features = ["runtime-tokio-hyper-rustls"] }
+strong_id = { version = "0.2.0" }
 
 # project deps
 ji_core = { path = "../ji_core", features = ["db"] }

diff --git a/backend/api/src/db/category.rs b/backend/api/src/db/category.rs
@@ -47,7 +47,7 @@ order by index
 }
 
 #[instrument(skip(db))]
-pub async fn get_exact(db: &sqlx::PgPool, ids: &[Uuid]) -> sqlx::Result<Vec<Category>> {
+pub async fn get_exact(db: &sqlx::PgPool, ids: &[CategoryId]) -> sqlx::Result<Vec<Category>> {
     sqlx::query!(
         //language=SQL
         r#"
@@ -60,7 +60,7 @@ from category
          inner join unnest($1::uuid[]) with ordinality t(id, ord) USING (id)
 order by t.ord
 "#,
-        ids
+        &ids.iter().map(|id| id.0).collect::<Vec<_>>(),
     )
     .fetch(db)
     .map_ok(|it| Category {
@@ -81,11 +81,15 @@ order by t.ord
 }
 
 #[instrument(skip(db))]
-pub async fn get_subtree(db: &sqlx::PgPool, ids: &[Uuid]) -> sqlx::Result<Vec<Category>> {
-    sqlx::query_file_as!(RawCategory, "query/category/get_subtree.sql", ids)
-        .fetch_all(db)
-        .await
-        .map(build_tree)
+pub async fn get_subtree(db: &sqlx::PgPool, ids: &[CategoryId]) -> sqlx::Result<Vec<Category>> {
+    sqlx::query_file_as!(
+        RawCategory,
+        "query/category/get_subtree.sql",
+        &ids.iter().map(|id| id.0).collect::<Vec<_>>()
+    )
+    .fetch_all(db)
+    .await
+    .map(build_tree)
 }
 
 #[instrument(skip_all)]
@@ -110,11 +114,18 @@ order by index
 }
 
 #[instrument(skip_all)]
-pub async fn get_ancestor_tree(db: &sqlx::PgPool, ids: &[Uuid]) -> sqlx::Result<Vec<Category>> {
-    sqlx::query_file_as!(RawCategory, "query/category/get_ancestor_tree.sql", ids)
-        .fetch_all(db)
-        .await
-        .map(build_tree)
+pub async fn get_ancestor_tree(
+    db: &sqlx::PgPool,
+    ids: &[CategoryId],
+) -> sqlx::Result<Vec<Category>> {
+    sqlx::query_file_as!(
+        RawCategory,
+        "query/category/get_ancestor_tree.sql",
+        &ids.iter().map(|id| id.0).collect::<Vec<_>>()
+    )
+    .fetch_all(db)
+    .await
+    .map(build_tree)
 }
 
 #[instrument(skip(db))]

diff --git a/backend/pages/Cargo.lock b/backend/pages/Cargo.lock