Gets dynamic dispatch working for serialization.

Yue · Yue · commit 3982fbd38d33 · 2025-11-24T02:22:22.000-08:00
diff --git a/migration/src/m20251122_212357_create_users_table.rs b/migration/src/m20251122_212357_create_users_table.rs
@@ -11,7 +11,7 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table("users")
                     .if_not_exists()
-                    .col(pk_uuid("id"))
+                    .col(pk_auto("id"))
                     .col(string("username").unique_key())
                     .col(binary("password"))
                     .to_owned(),
diff --git a/migration/src/m20251124_040703_create_topics_table.rs b/migration/src/m20251124_040703_create_topics_table.rs
@@ -11,7 +11,7 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table("topics")
                     .if_not_exists()
-                    .col(pk_uuid("id"))
+                    .col(pk_auto("id"))
                     .col(string("title"))
                     .col(string("description"))
                     .to_owned(),
diff --git a/migration/src/m20251124_054355_seed_topics_table.rs b/migration/src/m20251124_054355_seed_topics_table.rs
@@ -1,4 +1,4 @@
-use sea_orm_migration::{prelude::*, schema::*};
+use sea_orm_migration::{prelude::*};
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;
@@ -8,8 +8,26 @@ impl MigrationTrait for Migration {
     async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         let statement = Query::insert()
             .into_table("topics")
-            .columns(["id", "title", "description"])
-            .values_panic([0.into(), "memes".into(), "this is where the memes are".into()])
+            .columns(["title", "description", "id"])
+            .values_panic(["memes".into(), "this is where the memes are".into(), 0.into()])
+            .to_owned();
+
+        manager.exec_stmt(statement).await?;
+
+
+        let statement = Query::insert()
+            .into_table("topics")
+            .columns(["title", "description", "id"])
+            .values_panic(["sad".into(), "this is where the sad are".into(), 1.into()])
+            .to_owned();
+
+        manager.exec_stmt(statement).await?;
+
+        
+        let statement = Query::insert()
+            .into_table("topics")
+            .columns(["title", "description", "id"])
+            .values_panic(["ponies".into(), "this is where the pony are".into(), 2.into()])
             .to_owned();
 
         manager.exec_stmt(statement).await?;
@@ -19,6 +37,8 @@ impl MigrationTrait for Migration {
 
     async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         let statement = Query::delete().from_table("topics").cond_where(Cond::any().add(Expr::col("id").eq(0))).to_owned();
+        let statement = Query::delete().from_table("topics").cond_where(Cond::any().add(Expr::col("id").eq(1))).to_owned();
+        let statement = Query::delete().from_table("topics").cond_where(Cond::any().add(Expr::col("id").eq(2))).to_owned();
 
         manager.exec_stmt(statement).await?;
 
diff --git a/src/database/entities/mod.rs b/src/database/entities/mod.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.19
 
 pub mod prelude;
 
diff --git a/src/database/entities/prelude.rs b/src/database/entities/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.19
 
 pub use super::topics::Entity as Topics;
 pub use super::users::Entity as Users;
diff --git a/src/database/entities/topics.rs b/src/database/entities/topics.rs
@@ -1,13 +1,13 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.19
 
 use sea_orm::entity::prelude::*;
 use serde::Serialize;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize)]
 #[sea_orm(table_name = "topics")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
+    pub id: i64,
     pub title: String,
     pub description: String,
 }
diff --git a/src/database/entities/users.rs b/src/database/entities/users.rs
@@ -1,13 +1,13 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.19
 
 use sea_orm::entity::prelude::*;
 use serde::Deserialize;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize)]
 #[sea_orm(table_name = "users")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
+    pub id: i64,
     #[sea_orm(unique)]
     pub username: String,
     #[sea_orm(column_type = "Binary(1)")]
diff --git a/src/routes/home.rs b/src/routes/home.rs
@@ -1,18 +1,21 @@
-use std::{collections::HashMap};
-use rocket::response::content::RawHtml;
 use crate::utilities::page::Render;
+use erased_serde::Serialize;
+use rocket::response::content::RawHtml;
+use std::sync::Mutex;
+
 
 #[get("/home")]
 pub async fn home() -> RawHtml<String> {
-    let mut environment = vec![];
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
 
-    let mut page_template = include_str!("../../views/home.template.html").to_string();
+    let mut page_template = include_str!("../../views/index.template.html").to_string();
     let page = page_template.render(&environment).unwrap();
 
-    environment.push(("children".to_string(), Box::new(page)));
+    environment.push(("children".to_string(), Mutex::new(Box::new(page))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
     let mut layout = layout_template.render(&environment).unwrap();
 
     RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/src/routes/index.rs b/src/routes/index.rs
@@ -1,21 +1,25 @@
+use crate::{services::{post_service::PostService, user_service::UserService}, utilities::page::Render};
 use erased_serde::Serialize;
-use rocket::{State, futures::lock::Mutex, response::content::RawHtml};
-use crate::{services::post_service::PostService, utilities::page::Render};
+use rocket::{State, response::content::RawHtml};
+use std::sync::Mutex;
+
 
 #[get("/index")]
 pub async fn index(post_service: &State<PostService>) -> RawHtml<String> {
-    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize>>)>::new();
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
+    let posts = post_service.get_posts().await;
+
+    environment.push(("posts".to_string(), Mutex::new(Box::new(posts))));
 
     let mut page_template = include_str!("../../views/index.template.html").to_string();
-    let page = page_template.render(&environment).await.unwrap();
+    let page = page_template.render(&environment).unwrap();
 
-    let posts = post_service.get_posts().await;
 
     environment.push(("children".to_string(), Mutex::new(Box::new(page))));
-    environment.push(("posts".to_string(), Mutex::new(Box::new(posts))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
-    let mut layout = layout_template.render(&environment).await.unwrap();
+    let mut layout = layout_template.render(&environment).unwrap();
 
-    RawHtml(layout.render(&environment).await.unwrap())
+    RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/src/routes/layout.rs b/src/routes/layout.rs
@@ -1,18 +1,21 @@
-use std::{collections::HashMap};
-use rocket::response::content::RawHtml;
 use crate::utilities::page::Render;
+use erased_serde::Serialize;
+use rocket::response::content::RawHtml;
+use std::sync::Mutex;
+
 
 #[get("/layout")]
 pub async fn layout() -> RawHtml<String> {
-    let mut environment = vec![];
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
 
-    let mut page_template = include_str!("../../views/layout.template.html").to_string();
+    let mut page_template = include_str!("../../views/index.template.html").to_string();
     let page = page_template.render(&environment).unwrap();
 
-    environment.push(("children".to_string(), Box::new(page)));
+    environment.push(("children".to_string(), Mutex::new(Box::new(page))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
     let mut layout = layout_template.render(&environment).unwrap();
 
     RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/src/routes/login.rs b/src/routes/login.rs
@@ -1,18 +1,21 @@
-use std::{collections::HashMap};
-use rocket::response::content::RawHtml;
 use crate::utilities::page::Render;
+use erased_serde::Serialize;
+use rocket::response::content::RawHtml;
+use std::sync::Mutex;
+
 
 #[get("/login")]
 pub async fn login() -> RawHtml<String> {
-    let mut environment = vec![];
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
 
-    let mut page_template = include_str!("../../views/login.template.html").to_string();
+    let mut page_template = include_str!("../../views/index.template.html").to_string();
     let page = page_template.render(&environment).unwrap();
 
-    environment.push(("children".to_string(), Box::new(page)));
+    environment.push(("children".to_string(), Mutex::new(Box::new(page))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
     let mut layout = layout_template.render(&environment).unwrap();
 
     RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/src/routes/registration.rs b/src/routes/registration.rs
@@ -1,18 +1,21 @@
-use std::{collections::HashMap};
-use rocket::response::content::RawHtml;
 use crate::utilities::page::Render;
+use erased_serde::Serialize;
+use rocket::response::content::RawHtml;
+use std::sync::Mutex;
+
 
 #[get("/registration")]
 pub async fn registration() -> RawHtml<String> {
-    let mut environment = vec![];
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
 
-    let mut page_template = include_str!("../../views/registration.template.html").to_string();
+    let mut page_template = include_str!("../../views/index.template.html").to_string();
     let page = page_template.render(&environment).unwrap();
 
-    environment.push(("children".to_string(), Box::new(page)));
+    environment.push(("children".to_string(), Mutex::new(Box::new(page))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
     let mut layout = layout_template.render(&environment).unwrap();
 
     RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/src/services/post_service.rs b/src/services/post_service.rs
@@ -4,7 +4,7 @@ use rocket::{
     futures::lock::{Mutex, MutexGuard},
 };
 use sea_orm::{
-    ActiveModelTrait, ActiveValue::Set, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, prelude::Uuid
+    DatabaseConnection, EntityTrait
 };
 
 use crate::{database::entities::topics::{ActiveModel, Entity, Model}, services::service_trait::RequiresDatabase};
diff --git a/src/services/user_service.rs b/src/services/user_service.rs
@@ -36,7 +36,6 @@ impl UserService  {
         let new_user = ActiveUserModel {
             username: Set(username.to_owned()),
             password: Set(hashed_password),
-            id: Set(Uuid::new_v4()),
             ..Default::default()
         };
 
diff --git a/src/utilities/page.rs b/src/utilities/page.rs
@@ -1,34 +1,49 @@
-use std::{collections::HashMap, sync::Arc};
+use std::sync::Mutex;
 
+use erased_serde::Serialize;
 use lol_html::{HtmlRewriter, Settings, element, html_content::Element};
 use mlua::{Lua, LuaSerdeExt};
-use erased_serde::{Serialize};
-use rocket::futures::lock::Mutex;
 
 pub trait Render {
-    async fn render(&mut self, environment: &Vec<(String, Mutex<Box<dyn Serialize>>)>) -> Result<String, String>;
+    fn render(
+        &mut self,
+        environment: &Vec<(String, Mutex<Box<dyn Serialize + Send>>)>,
+    ) -> Result<String, String>;
 }
 
 impl Render for String {
-    async fn render(&mut self, environment: &Vec<(String, Mutex<Box<dyn Serialize>>)>) -> Result<String, String> {
-        let lua = Lua::new();
+    fn render(
+        &mut self,
+        environment: &Vec<(String, Mutex<Box<dyn Serialize + Send>>)>,
+    ) -> Result<String, String> {
         let mut env = vec![];
+        let lua = Lua::new();
 
         for (k, v) in environment {
-            let value = v.lock().await;
+            let value = v.lock().unwrap();
             let value = value.as_ref();
+
             let value = lua.to_value(&value).unwrap();
             env.push((k.to_owned(), value));
-        };
+        }
+
+        for (k, v) in env {
+            lua.globals().set(k, v).expect("Unable to assign globals.")
+        }
 
-        render(self, env)
+        lua.load("function maybe(v, o) return v or o end")
+            .exec()
+            .expect("Invalid Lua expression.");
+        lua.load("function format(...) data = string.format(data, ...) end")
+            .exec()
+            .expect("Invalid Lua expression.");
+        lua.load("function each(k) local template = data; data = ''; for _, post in ipairs(k) do data = data .. template:gsub('%$([a-zA-Z_]+)', post) end end").exec().expect("Invalud Lua expression.");
+
+        render(self, lua)
     }
 }
 
-pub fn render(
-    template: &String,
-    environment: Vec<(String, mlua::Value)>
-) -> Result<String, String> {
+pub fn render(template: &String, lua: Lua) -> Result<String, String> {
     let mut buffer = vec![];
     let mut rewriter = HtmlRewriter::new(
         Settings {
@@ -38,26 +53,18 @@ pub fn render(
                 el.remove();
                 if let Some(handlers) = el.end_tag_handlers() {
                     let source = template.clone();
-                    let env = environment.clone();
                     let e = expression.clone();
+                    let lua = lua.clone();
 
                     handlers.push(Box::new(move |end| {
                         let end_location = end.source_location().bytes().start;
                         let html = source[start_location..end_location].to_string();
 
-                        let lua = Lua::new();
-
-                        for (k, v) in env {
-                            lua.globals()
-                                .set(k, v)
-                                .expect("Unable to assign globals.")
-                        }
-
                         lua.globals().set("data", html).unwrap();
-                        lua.load("function maybe(v, o) return v or o end").exec().expect("Invalid Lua expression.");
-                        lua.load("function format(...) data = string.format(data, ...) end").exec().expect("Invalid Lua expression.");
-                        lua.load("function each(k) local template = data; data = ''; for _, post in ipairs(k) do data = data .. template:gsub('%$([a-zA-Z_]+)', post) end end").exec().expect("Invalud Lua expression.");
-                        lua.load(&e).exec().expect(format!("Invalid Lua expression. {}", e).as_str());
+
+                        lua.load(&e)
+                            .exec()
+                            .expect(format!("Invalid Lua expression. {}", e).as_str());
 
                         let data: String = lua.globals().get("data").unwrap();
 
diff --git a/tools/templates/route.template b/tools/templates/route.template
@@ -1,18 +1,21 @@
-use std::{collections::HashMap};
-use rocket::response::content::RawHtml;
 use crate::utilities::page::Render;
+use erased_serde::Serialize;
+use rocket::response::content::RawHtml;
+use std::sync::Mutex;
+
 
 #[get("/$route_path")]
 pub async fn $route() -> RawHtml<String> {
-    let mut environment = vec![];
+    let mut environment = Vec::<(String, Mutex<Box<dyn Serialize + Send>>)>::new();
 
-    let mut page_template = include_str!("../../views/$route_path.template.html").to_string();
+    let mut page_template = include_str!("../../views/index.template.html").to_string();
     let page = page_template.render(&environment).unwrap();
 
-    environment.push(("children".to_string(), Box::new(page)));
+    environment.push(("children".to_string(), Mutex::new(Box::new(page))));
 
     let mut layout_template = include_str!("../../views/layout.template.html").to_string();
     let mut layout = layout_template.render(&environment).unwrap();
 
     RawHtml(layout.render(&environment).unwrap())
 }
+
diff --git a/views/index.template.html b/views/index.template.html
@@ -1,4 +1,4 @@
 <Lua code="each(posts)">
-    <h2>$post_title</h2>
-    <p>$post_description</p>
+    <h2>$title</h2>
+    <p>$description</p>
 </Lua>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
	`1`	+//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.19
`2`	`2`
`3`	`3`	`pub mod prelude;`
`4`	`4`