Merge templater into notifico-app

Cargo.toml

@@ -19,15 +19,14 @@ members = [
     ## Other
     "notifico-core",
     "notifico-template",
-    "notifico-template/migration",
     "notifico-attachment",
 ]
 
 [workspace.dependencies]
 sea-orm = { version = "1.1.4", features = ["sqlx-sqlite", "sqlx-postgres", "sqlx-mysql", "runtime-tokio-native-tls", "macros"] }
 reqwest = { version = "0.12.12", default-features = false, features = ["json", "native-tls", "native-tls-alpn", "charset", "http2", "multipart", "stream"] }
 axum = { version = "0.8.1", features = ["macros"] }
-axum-extra = { version = "0.10.0", features = ["typed-header"] }
+axum-extra = { version = "0.11.0", features = ["typed-header"] }
 clap = { version = "4.5.23", features = ["derive", "color", "usage", "env"] }
 tokio = { version = "1.43", features = ["macros", "rt", "sync", "rt-multi-thread", "signal"] }
 url = { version = "2.5.4", features = ["serde"] }

notifico-app/Cargo.toml

@@ -28,6 +28,7 @@ rust-embed = { version = "8.5.0", features = ["mime-guess"] }
 sea-orm = { workspace = true }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
+thiserror = "2.0.11"
 tokio = { workspace = true }
 tower-http = { version = "0.6.2", features = ["cors"] }
 tracing = "0.1"
@@ -37,3 +38,4 @@ utoipa = { workspace = true }
 utoipa-axum = { workspace = true }
 utoipa-swagger-ui = { workspace = true }
 uuid = { workspace = true }
+multimap = "0.10.0"

notifico-app/migration/src/lib.rs

@@ -4,6 +4,7 @@ pub use sea_orm_migration::prelude::*;
 mod m20250108_000001_create_project_table;
 mod m20250108_000002_create_pipeline_event;
 mod m20250108_000003_recipient;
+mod m20250121_000001_create_template_table;
 
 pub struct Migrator;
 
@@ -14,6 +15,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20250108_000001_create_project_table::Migration),
             Box::new(m20250108_000002_create_pipeline_event::Migration),
             Box::new(m20250108_000003_recipient::Migration),
+            Box::new(m20250121_000001_create_template_table::Migration),
         ]
     }
 

notifico-app/src/controllers/event.rs

@@ -1,9 +1,7 @@
-use crate::entity;
-use async_trait::async_trait;
-use notifico_core::error::EngineError;
-use notifico_core::http::admin::{
-    AdminCrudTable, ItemWithId, ListQueryParams, ListableTrait, PaginatedResult,
+use crate::crud_table::{
+    AdminCrudError, AdminCrudTable, ItemWithId, ListQueryParams, ListableTrait, PaginatedResult,
 };
+use crate::entity;
 use sea_orm::prelude::Uuid;
 use sea_orm::ActiveValue::{Set, Unchanged};
 use sea_orm::{ActiveModelTrait, PaginatorTrait};
@@ -21,19 +19,18 @@ impl EventDbController {
     }
 }
 
-#[async_trait]
 impl AdminCrudTable for EventDbController {
     type Item = Event;
 
-    async fn get_by_id(&self, id: Uuid) -> Result<Option<Self::Item>, EngineError> {
+    async fn get_by_id(&self, id: Uuid) -> Result<Option<Self::Item>, AdminCrudError> {
         let model = entity::event::Entity::find_by_id(id).one(&self.db).await?;
         Ok(model.map(|m| m.into()))
     }
 
     async fn list(
         &self,
         params: ListQueryParams,
-    ) -> Result<PaginatedResult<ItemWithId<Self::Item>>, EngineError> {
+    ) -> Result<PaginatedResult<ItemWithId<Self::Item>>, AdminCrudError> {
         let params = params.try_into()?;
         Ok(PaginatedResult {
             items: entity::event::Entity::find()
@@ -53,7 +50,7 @@ impl AdminCrudTable for EventDbController {
         })
     }
 
-    async fn create(&self, item: Self::Item) -> Result<ItemWithId<Self::Item>, EngineError> {
+    async fn create(&self, item: Self::Item) -> Result<ItemWithId<Self::Item>, AdminCrudError> {
         let id = Uuid::now_v7();
 
         entity::event::ActiveModel {
@@ -71,7 +68,7 @@ impl AdminCrudTable for EventDbController {
         &self,
         id: Uuid,
         item: Self::Item,
-    ) -> Result<ItemWithId<Self::Item>, EngineError> {
+    ) -> Result<ItemWithId<Self::Item>, AdminCrudError> {
         entity::event::ActiveModel {
             id: Unchanged(id),
             name: Set(item.name.clone()),
@@ -83,7 +80,7 @@ impl AdminCrudTable for EventDbController {
         Ok(ItemWithId { id, item })
     }
 
-    async fn delete(&self, id: Uuid) -> Result<(), EngineError> {
+    async fn delete(&self, id: Uuid) -> Result<(), AdminCrudError> {
         entity::event::ActiveModel {
             id: Set(id),
             ..Default::default()