Add creation_timestamp to challenge categories

Bootstrap-Academy · Oct 14, 2023 · 940ed06 · 940ed06
1 parent f1dcf4e
commit 940ed06
Show file tree

Hide file tree

Showing 25 changed files with 67 additions and 22 deletions.
diff --git a/challenges/src/endpoints/challenges.rs b/challenges/src/endpoints/challenges.rs
@@ -51,7 +51,7 @@ impl Challenges {
         _auth: VerifiedUserAuth,
     ) -> ListCategories::Response<VerifiedUserAuth> {
         let mut query = challenges_challenge_categories::Entity::find()
-            .order_by_asc(challenges_challenge_categories::Column::Title);
+            .order_by_asc(challenges_challenge_categories::Column::CreationTimestamp);
         if let Some(title) = title.0 {
             query = query.filter(challenges_challenge_categories::Column::Title.contains(title));
         }
@@ -125,6 +125,7 @@ impl Challenges {
                 id: Set(Uuid::new_v4()),
                 title: Set(data.0.title),
                 description: Set(data.0.description),
+                creation_timestamp: Set(Utc::now().naive_utc()),
             }
             .insert(&***db)
             .await?
@@ -147,6 +148,7 @@ impl Challenges {
                     id: Unchanged(category.id),
                     title: data.0.title.update(category.title),
                     description: data.0.description.update(category.description),
+                    creation_timestamp: Unchanged(category.creation_timestamp),
                 }
                 .update(&***db)
                 .await?

diff --git a/entity/src/challenges_ban.rs b/entity/src/challenges_ban.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_challenge_categories.rs b/entity/src/challenges_challenge_categories.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 
@@ -11,6 +11,7 @@ pub struct Model {
     pub title: String,
     #[sea_orm(column_type = "Text")]
     pub description: String,
+    pub creation_timestamp: DateTime,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

diff --git a/entity/src/challenges_challenges.rs b/entity/src/challenges_challenges.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_coding_challenge_result.rs b/entity/src/challenges_coding_challenge_result.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_coding_challenge_submissions.rs b/entity/src/challenges_coding_challenge_submissions.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_coding_challenges.rs b/entity/src/challenges_coding_challenges.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_course_tasks.rs b/entity/src/challenges_course_tasks.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_matching_attempts.rs b/entity/src/challenges_matching_attempts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_matchings.rs b/entity/src/challenges_matchings.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_multiple_choice_attempts.rs b/entity/src/challenges_multiple_choice_attempts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_multiple_choice_quizes.rs b/entity/src/challenges_multiple_choice_quizes.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_question_attempts.rs b/entity/src/challenges_question_attempts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_questions.rs b/entity/src/challenges_questions.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_subtask_reports.rs b/entity/src/challenges_subtask_reports.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_subtasks.rs b/entity/src/challenges_subtasks.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_tasks.rs b/entity/src/challenges_tasks.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/challenges_user_subtasks.rs b/entity/src/challenges_user_subtasks.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/entity/src/lib.rs b/entity/src/lib.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 pub mod prelude;
 

diff --git a/entity/src/prelude.rs b/entity/src/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 pub use super::{
     challenges_ban::Entity as ChallengesBan,

diff --git a/entity/src/sea_orm_active_enums.rs b/entity/src/sea_orm_active_enums.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/migration/src/lib.rs b/migration/src/lib.rs
@@ -34,6 +34,7 @@ mod m20230719_174846_user_subtasks_last_attempt;
 mod m20230815_162457_remove_subtask_fee;
 mod m20230815_203544_remove_subtask_unlocked;
 mod m20230816_173651_retire_subtasks;
+mod m20231014_142202_category_creation_timestamp;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
@@ -68,6 +69,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20230815_162457_remove_subtask_fee::Migration),
             Box::new(m20230815_203544_remove_subtask_unlocked::Migration),
             Box::new(m20230816_173651_retire_subtasks::Migration),
+            Box::new(m20231014_142202_category_creation_timestamp::Migration),
         ]
     }
 }
diff --git a/migration/src/m20230322_163425_challenges_init.rs b/migration/src/m20230322_163425_challenges_init.rs
@@ -238,12 +238,13 @@ impl MigrationTrait for Migration {
 }
 
 #[derive(Iden)]
-enum ChallengeCategory {
+pub enum ChallengeCategory {
     #[iden = "challenges_challenge_categories"]
     Table,
     Id,
     Title,
     Description,
+    CreationTimestamp,
 }
 
 #[derive(Iden)]

diff --git a/migration/src/m20231014_142202_category_creation_timestamp.rs b/migration/src/m20231014_142202_category_creation_timestamp.rs
@@ -0,0 +1,36 @@
+use sea_orm_migration::prelude::*;
+
+use crate::m20230322_163425_challenges_init::ChallengeCategory;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(ChallengeCategory::Table)
+                    .add_column(
+                        ColumnDef::new(ChallengeCategory::CreationTimestamp)
+                            .timestamp()
+                            .not_null()
+                            .default(Expr::current_timestamp()),
+                    )
+                    .to_owned(),
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(ChallengeCategory::Table)
+                    .drop_column(ChallengeCategory::CreationTimestamp)
+                    .to_owned(),
+            )
+            .await
+    }
+}
diff --git a/schemas/src/challenges/challenges.rs b/schemas/src/challenges/challenges.rs
@@ -13,6 +13,8 @@ pub struct Category {
     pub title: String,
     /// The description of the category
     pub description: String,
+    /// The creation timestamp of the category
+    pub creation_timestamp: DateTime<Utc>,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -132,6 +134,7 @@ impl From<challenges_challenge_categories::Model> for Category {
             id: value.id,
             title: value.title,
             description: value.description,
+            creation_timestamp: value.creation_timestamp.and_utc(),
         }
     }
 }