Use ulid for tag and recipe ids

server/Cargo.toml

@@ -19,7 +19,6 @@ serde_json = "1.0.117"
 cookie = "0.18.1"
 sha256 = "1.5.0"
 toml = "0.8.13"
-uuid = { version = "1.8.0", features = ["v4", "fast-rng", "serde"] }
 chrono = { version = "0.4.38", default-features = false, features = [
 	"now",
 	"serde",
@@ -36,3 +35,7 @@ sea-query = { version = "0.30.7", default-features = false, features = [
 	"backend-sqlite",
 	"derive",
 ] }
+ulid = { version = "1.1.2", default-features = false, features = [
+	"std",
+	"serde",
+] }

server/src/core/recipe.rs

@@ -8,7 +8,7 @@ pub async fn create(
     datastore: &Pool,
     user: domain::user::Authenticated,
     recipe: CreatingRecipe,
-) -> Result<uuid::Uuid, Error> {
+) -> Result<domain::recipe::Id, Error> {
     let document = RecipeDocument {
         title: recipe.title.into(),
         instructions: recipe.instructions.into(),
@@ -17,10 +17,10 @@ pub async fn create(
         tag_ids: recipe.tag_ids,
     };
 
-    let id = uuid::Uuid::new_v4();
+    let id = domain::recipe::Id::new();
 
     datastore
-        .create_recipe(id.to_string(), user.id, document)
+        .create_recipe(id.clone().into(), user.id, document)
         .await
         .map_err(|err| Error::Other(err.into()))?;
 
@@ -39,10 +39,14 @@ pub async fn update(
         notes: recipe.notes.map(std::convert::Into::into),
         tag_ids: recipe.tag_ids,
     };
-    let id = recipe.id.to_string();
 
     datastore
-        .update_recipe(id, user.id, document, recipe.previous_hash)
+        .update_recipe(
+            recipe.id.clone().into(),
+            user.id,
+            document,
+            recipe.previous_hash,
+        )
         .await
         .map_err(|err| match err {
             datastore::Error::NotFound => {
@@ -54,9 +58,9 @@ pub async fn update(
     Ok(())
 }
 
-pub async fn get(datastore: &Pool, id: uuid::Uuid) -> Result<Recipe, Error> {
+pub async fn get(datastore: &Pool, id: domain::recipe::Id) -> Result<Recipe, Error> {
     datastore
-        .get_recipe(id.to_string())
+        .get_recipe(id.clone().into())
         .await
         .map_err(|err| match err {
             datastore::Error::NotFound => Error::NotFound(format!("recipe {id} does not exist")),

server/src/core/tag.rs

@@ -1,14 +1,10 @@
 use crate::{core::Error, datastore::Pool, domain};
 
-fn validation_to_other(err: domain::ValidationError) -> Error {
-    Error::Other(err.into())
-}
-
 pub async fn create(
     datastore: &Pool,
     user: domain::user::Authenticated,
     tag: domain::tag::Creating,
-) -> Result<i64, Error> {
+) -> Result<domain::tag::Id, Error> {
     let id = datastore
         .create_tag(user.id, tag.name.into())
         .await
@@ -18,18 +14,8 @@ pub async fn create(
 }
 
 pub async fn get_all(datastore: &Pool) -> Result<Vec<domain::tag::Tag>, Error> {
-    let result = datastore
+    datastore
         .get_tags()
         .await
-        .map_err(|err| Error::Other(err.into()))?;
-
-    result
-        .into_iter()
-        .map(|tag| {
-            Ok(domain::tag::Tag {
-                id: tag.id,
-                name: tag.name.try_into().map_err(validation_to_other)?,
-            })
-        })
-        .collect()
+        .map_err(|err| Error::Other(err.into()))
 }

server/src/core/user.rs

@@ -1,9 +1,7 @@
-use uuid::Uuid;
-
 use crate::{
     core::Error,
     datastore::{self, Pool},
-    domain::{RegisteringUser, SessionKey},
+    domain::{self, RegisteringUser, SessionKey},
     oidc,
     session_store::SessionStore,
 };
@@ -28,7 +26,7 @@ pub async fn on_authenticated(
     authenticated: &oidc::Authenticated,
 ) -> Result<SessionKey, Error> {
     let registering = RegisteringUser {
-        potential_id: Uuid::new_v4().to_string(),
+        potential_id: domain::user::Id::new().into(),
         oauth_id: format!("custom|{}", authenticated.subject),
         name: authenticated.name.to_string(),
     };

server/src/datastore.rs

@@ -13,7 +13,7 @@ pub struct RecipeDocument {
     pub ingredients: String,
     pub instructions: String,
     pub notes: Option<String>,
-    pub tag_ids: Vec<i64>,
+    pub tag_ids: Vec<domain::tag::Id>,
 }
 
 #[derive(Debug, Clone)]
@@ -22,12 +22,6 @@ pub struct HashedRecipeDocument {
     pub hash: String,
 }
 
-#[derive(Debug, Clone)]
-pub struct Tag {
-    pub id: i64,
-    pub name: String,
-}
-
 // Error
 
 #[derive(Error, Debug)]
@@ -51,12 +45,6 @@ impl From<domain::ValidationError> for Error {
     }
 }
 
-impl From<uuid::Error> for Error {
-    fn from(value: uuid::Error) -> Self {
-        Error::Unknown(value.into())
-    }
-}
-
 impl From<tokio::sync::oneshot::error::RecvError> for Error {
     fn from(value: tokio::sync::oneshot::error::RecvError) -> Self {
         Error::Unknown(anyhow!(value))
@@ -226,7 +214,11 @@ impl Pool {
     }
 
     // tags
-    pub async fn create_tag(&self, user_id: String, name: String) -> Result<i64, Error> {
+    pub async fn create_tag(
+        &self,
+        user_id: String,
+        name: String,
+    ) -> Result<domain::tag::Id, Error> {
         let (tx, rx) = oneshot::channel();
         let msg = Message::CreateTag {
             user_id,
@@ -237,7 +229,7 @@ impl Pool {
         self.send_message(rx, msg).await
     }
 
-    pub async fn get_tags(&self) -> Result<Vec<Tag>, Error> {
+    pub async fn get_tags(&self) -> Result<Vec<domain::tag::Tag>, Error> {
         let (tx, rx) = oneshot::channel();
         let msg = Message::GetTags { respond_to: tx };
 
@@ -305,11 +297,11 @@ pub enum Message {
 
     // tags
     GetTags {
-        respond_to: oneshot::Sender<Result<Vec<Tag>, Error>>,
+        respond_to: oneshot::Sender<Result<Vec<domain::tag::Tag>, Error>>,
     },
     CreateTag {
         user_id: String,
         name: String,
-        respond_to: oneshot::Sender<Result<i64, Error>>,
+        respond_to: oneshot::Sender<Result<domain::tag::Id, Error>>,
     },
 }