Better database layout with uuid primary keys

Serialize and deserialize the uuid ids as base62 strings in the URLs.

src/handlers/api/entry.rs

@@ -6,9 +6,13 @@ use sqlx::PgPool;
 
 use crate::error::Error;
 use crate::models::entry::{create_entry, get_entry, CreateEntry, Entry};
+use crate::uuid::Base62Uuid;
 
-pub async fn get(State(pool): State<PgPool>, Path(id): Path<i32>) -> Result<Json<Entry>, Error> {
-    Ok(Json(get_entry(&pool, id).await?))
+pub async fn get(
+    State(pool): State<PgPool>,
+    Path(id): Path<Base62Uuid>,
+) -> Result<Json<Entry>, Error> {
+    Ok(Json(get_entry(&pool, id.as_uuid()).await?))
 }
 
 pub async fn post(

src/handlers/api/feed.rs

@@ -5,10 +5,11 @@ use axum::{
 use sqlx::PgPool;
 
 use crate::error::{Error, Result};
-use crate::models::feed::{create_feed, get_feed, delete_feed, CreateFeed, Feed};
+use crate::models::feed::{create_feed, delete_feed, get_feed, CreateFeed, Feed};
+use crate::uuid::Base62Uuid;
 
-pub async fn get(State(pool): State<PgPool>, Path(id): Path<i32>) -> Result<Json<Feed>> {
-    Ok(Json(get_feed(&pool, id).await?))
+pub async fn get(State(pool): State<PgPool>, Path(id): Path<Base62Uuid>) -> Result<Json<Feed>> {
+    Ok(Json(get_feed(&pool, id.as_uuid()).await?))
 }
 
 pub async fn post(
@@ -18,6 +19,6 @@ pub async fn post(
     Ok(Json(create_feed(&pool, payload).await?))
 }
 
-pub async fn delete(State(pool): State<PgPool>, Path(id): Path<i32>) -> Result<()> {
-    delete_feed(&pool, id).await
+pub async fn delete(State(pool): State<PgPool>, Path(id): Path<Base62Uuid>) -> Result<()> {
+    delete_feed(&pool, id.as_uuid()).await
 }

src/handlers/entry.rs

@@ -1,4 +1,4 @@
-use axum::extract::{State, Path};
+use axum::extract::{Path, State};
 use axum::response::Response;
 use maud::{html, PreEscaped};
 use sqlx::PgPool;
@@ -6,9 +6,14 @@ use sqlx::PgPool;
 use crate::error::Result;
 use crate::models::entry::get_entry;
 use crate::partials::layout::Layout;
+use crate::uuid::Base62Uuid;
 
-pub async fn get(Path(id): Path<i32>, State(pool): State<PgPool>, layout: Layout) -> Result<Response> {
-    let entry = get_entry(&pool, id).await?;
+pub async fn get(
+    Path(id): Path<Base62Uuid>,
+    State(pool): State<PgPool>,
+    layout: Layout,
+) -> Result<Response> {
+    let entry = get_entry(&pool, id.as_uuid()).await?;
     Ok(layout.render(html! {
         @let title = entry.title.unwrap_or_else(|| "Untitled".to_string());
         h1 { a href=(entry.url) { (title) } }

src/handlers/home.rs

@@ -7,6 +7,7 @@ use crate::error::Result;
 use crate::models::entry::{get_entries, GetEntriesOptions};
 use crate::partials::layout::Layout;
 use crate::utils::get_domain;
+use crate::uuid::Base62Uuid;
 
 pub async fn get(State(pool): State<PgPool>, layout: Layout) -> Result<Response> {
     let entries = get_entries(&pool, GetEntriesOptions::default()).await?;
@@ -14,7 +15,7 @@ pub async fn get(State(pool): State<PgPool>, layout: Layout) -> Result<Response>
         ul class="entries" {
             @for entry in entries {
                 @let title = entry.title.unwrap_or_else(|| "Untitled".to_string());
-                @let url = format!("/entry/{}", entry.id);
+                @let url = format!("/entry/{}", Base62Uuid::from(entry.entry_id));
                 @let domain = get_domain(&entry.url).unwrap_or_default();
                 li { a href=(url) { (title) } em class="domain" { (domain) }}
             }