Bump deps

notificohq · Dec 30, 2024 · ba4d113 · ba4d113
1 parent 6421bbd
commit ba4d113
Show file tree

Hide file tree

Showing 22 changed files with 165 additions and 174 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/notifico-dbpipeline/src/entity/event.rs b/notifico-dbpipeline/src/entity/event.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-dbpipeline/src/entity/mod.rs b/notifico-dbpipeline/src/entity/mod.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub mod prelude;
 

diff --git a/notifico-dbpipeline/src/entity/pipeline.rs b/notifico-dbpipeline/src/entity/pipeline.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-dbpipeline/src/entity/pipeline_event_j.rs b/notifico-dbpipeline/src/entity/pipeline_event_j.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-dbpipeline/src/entity/prelude.rs b/notifico-dbpipeline/src/entity/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub use super::event::Entity as Event;
 pub use super::pipeline::Entity as Pipeline;

diff --git a/notifico-project/src/entity/mod.rs b/notifico-project/src/entity/mod.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub mod prelude;
 

diff --git a/notifico-project/src/entity/prelude.rs b/notifico-project/src/entity/prelude.rs
@@ -1,3 +1,3 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub use super::project::Entity as Project;
diff --git a/notifico-project/src/entity/project.rs b/notifico-project/src/entity/project.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-subscription/migration/src/lib.rs b/notifico-subscription/migration/src/lib.rs
@@ -1,17 +1,13 @@
 pub use sea_orm_migration::prelude::*;
 
-mod m20220101_000001_create_table;
 mod m20241224_225755_recipient;
 
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![
-            Box::new(m20220101_000001_create_table::Migration),
-            Box::new(m20241224_225755_recipient::Migration),
-        ]
+        vec![Box::new(m20241224_225755_recipient::Migration)]
     }
 
     fn migration_table_name() -> DynIden {

diff --git a/notifico-subscription/migration/src/m20220101_000001_create_table.rs b/notifico-subscription/migration/src/m20220101_000001_create_table.rs
diff --git a/notifico-subscription/migration/src/m20241224_225755_recipient.rs b/notifico-subscription/migration/src/m20241224_225755_recipient.rs
@@ -80,12 +80,29 @@ impl MigrationTrait for Migration {
             .await?;
 
         manager
-            .create_foreign_key(
-                ForeignKey::create()
-                    .from(Subscription::Table, Subscription::RecipientId)
-                    .to(Recipient::Table, Recipient::Id)
-                    .on_delete(ForeignKeyAction::Cascade)
-                    .on_update(ForeignKeyAction::Restrict)
+            .create_table(
+                Table::create()
+                    .table(Subscription::Table)
+                    .if_not_exists()
+                    .col(pk_uuid(Subscription::Id))
+                    .col(uuid(Subscription::RecipientId))
+                    .col(string(Subscription::Event))
+                    .col(string(Subscription::Channel))
+                    .col(boolean(Subscription::IsSubscribed))
+                    .foreign_key(
+                        ForeignKey::create()
+                            .from(Subscription::Table, Subscription::RecipientId)
+                            .to(Recipient::Table, Recipient::Id)
+                            .on_delete(ForeignKeyAction::Cascade)
+                            .on_update(ForeignKeyAction::Restrict),
+                    )
+                    .index(
+                        Index::create()
+                            .name("idx_subscription_project_id")
+                            .table(Subscription::Table)
+                            .col(Subscription::RecipientId)
+                            .unique(),
+                    )
                     .to_owned(),
             )
             .await?;
@@ -131,5 +148,9 @@ enum RecipientGroupJ {
 #[derive(DeriveIden)]
 enum Subscription {
     Table,
+    Id,
+    Event,
+    Channel,
     RecipientId,
+    IsSubscribed,
 }
diff --git a/notifico-subscription/src/entity/contact.rs b/notifico-subscription/src/entity/contact.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-subscription/src/entity/group.rs b/notifico-subscription/src/entity/group.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-subscription/src/entity/mod.rs b/notifico-subscription/src/entity/mod.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub mod prelude;
 

diff --git a/notifico-subscription/src/entity/prelude.rs b/notifico-subscription/src/entity/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub use super::contact::Entity as Contact;
 pub use super::group::Entity as Group;

diff --git a/notifico-subscription/src/entity/recipient.rs b/notifico-subscription/src/entity/recipient.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 
@@ -18,6 +18,8 @@ pub enum Relation {
     Contact,
     #[sea_orm(has_many = "super::recipient_group_j::Entity")]
     RecipientGroupJ,
+    #[sea_orm(has_one = "super::subscription::Entity")]
+    Subscription,
 }
 
 impl Related<super::contact::Entity> for Entity {
@@ -32,6 +34,12 @@ impl Related<super::recipient_group_j::Entity> for Entity {
     }
 }
 
+impl Related<super::subscription::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Subscription.def()
+    }
+}
+
 impl Related<super::group::Entity> for Entity {
     fn to() -> RelationDef {
         super::recipient_group_j::Relation::Group.def()

diff --git a/notifico-subscription/src/entity/recipient_group_j.rs b/notifico-subscription/src/entity/recipient_group_j.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 

diff --git a/notifico-subscription/src/entity/subscription.rs b/notifico-subscription/src/entity/subscription.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;
 
@@ -15,6 +15,21 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::recipient::Entity",
+        from = "Column::RecipientId",
+        to = "super::recipient::Column::Id",
+        on_update = "Restrict",
+        on_delete = "Cascade"
+    )]
+    Recipient,
+}
+
+impl Related<super::recipient::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Recipient.def()
+    }
+}
 
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/notifico-template/src/entity/mod.rs b/notifico-template/src/entity/mod.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub mod prelude;
 

diff --git a/notifico-template/src/entity/prelude.rs b/notifico-template/src/entity/prelude.rs
@@ -1,3 +1,3 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 pub use super::template::Entity as Template;
diff --git a/notifico-template/src/entity/template.rs b/notifico-template/src/entity/template.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.3
 
 use sea_orm::entity::prelude::*;