feat: add post question

Cargo.toml

@@ -31,14 +31,13 @@ diff = "0.1.13"
 moka = { version = "0.12.8", features = ["future"] }
 rand = "0.8.5"
 reqwest = "0.12.5"
+uuid = { version = "1.9.1", features = ["v4"] }
 
 #database
 migration = {path = "migration"}
 sea-orm = { version = "0.12.15", features = ["macros", "sqlx-postgres", "runtime-tokio-rustls"] }
 futures = "0.3.30"
 chrono = "0.4.38"
-uuid = { version = "1.9.1", features = ["v4"] }
-ciborium = "0.2.2"
 
 
 [build-dependencies]

migration/src/lib.rs

@@ -7,6 +7,7 @@ mod m20240816_073728_create_answer_table;
 mod m20240817_030711_add_required_to_question;
 mod m20240817_035143_add_control_to_survey;
 mod m20240817_100708_create_admin_table;
+mod m20240817_154332_create_score_table;
 
 pub struct Migrator;
 
@@ -21,6 +22,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20240817_030711_add_required_to_question::Migration),
             Box::new(m20240817_035143_add_control_to_survey::Migration),
             Box::new(m20240817_100708_create_admin_table::Migration),
+            Box::new(m20240817_154332_create_score_table::Migration),
         ]
     }
 }

migration/src/m20240816_073728_create_answer_table.rs

@@ -20,11 +20,9 @@ impl MigrationTrait for Migration {
                     )
                     .col(ColumnDef::new(Answer::Survey).integer().not_null())
                     .col(ColumnDef::new(Answer::User).big_unsigned().not_null())
-                    .col(ColumnDef::new(Answer::Judge).big_unsigned().null())
                     .col(ColumnDef::new(Answer::Answers).json().not_null())
                     .col(ColumnDef::new(Answer::Score).integer().null())
                     .col(ColumnDef::new(Answer::CreateTime).timestamp().not_null().default(Expr::current_timestamp()))
-                    .col(ColumnDef::new(Answer::JudgedTime).timestamp().null())
                     .col(ColumnDef::new(Answer::Completed).boolean().not_null().default(false))
                     .to_owned(),
             )
@@ -44,10 +42,8 @@ enum Answer {
     Id,
     Survey,
     User,
-    Judge,
     Answers,
     Score,
     CreateTime,
-    JudgedTime,
     Completed
 }

migration/src/m20240817_154332_create_score_table.rs

@@ -0,0 +1,47 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(Score::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(Score::Id)
+                            .integer()
+                            .not_null()
+                            .auto_increment()
+                            .primary_key(),
+                    )
+                    .col(ColumnDef::new(Score::User).big_unsigned().not_null())
+                    .col(ColumnDef::new(Score::Judge).big_unsigned().not_null())
+                    .col(ColumnDef::new(Score::Survey).integer().not_null())
+                    .col(ColumnDef::new(Score::Answer).integer().not_null())
+                    .col(ColumnDef::new(Score::Scores).array(ColumnType::Json).not_null())
+                    .to_owned(),
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_table(Table::drop().table(Score::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum Score {
+    Table,
+    Id,
+    User,
+    Judge,
+    Survey,
+    Answer,
+    Scores,
+}

src/controller/question/modify.rs

@@ -1,19 +1,24 @@
-use crate::model::question::QuestionType;
+use crate::model::question::{Condition, QuestionType};
 use crate::service::questions::save_question;
 use axum::Json;
-use sea_orm::JsonValue;
 use serde::Serialize;
+use crate::model::ValueWithTitle;
 
 pub async fn new_question(Json(question): Json<NewQuestionRequest>) -> String {
-    let id = save_question(question.content, question.r#type, question.values, question.condition, question.required, None).await;
+    let content = serde_json::to_value(question.content).unwrap();
+    let values = question.values.map(|values| 
+        values.iter().map(|v| serde_json::to_value(v).unwrap()).collect());
+    let condition = question.condition.map(|c| serde_json::to_string(&c).unwrap());
+
+    let id = save_question(content, question.r#type, values, condition, question.required, None).await;
     id.to_string()
 }
 
 #[derive(serde::Deserialize, Serialize)]
 pub struct NewQuestionRequest {
-    pub content: JsonValue,
+    pub content: ValueWithTitle,
     pub r#type: QuestionType,
-    pub values: Option<Vec<JsonValue>>,
-    pub condition: Option<String>,
+    pub values: Option<Vec<ValueWithTitle>>,
+    pub condition: Option<Vec<Condition>>,
     pub required: bool,
 }

src/model/generated/admin.rs

@@ -6,7 +6,7 @@ use sea_orm::entity::prelude::*;
 #[sea_orm(table_name = "admin")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
-    pub id: i32,
+    pub id: i64,
     pub username: String,
     pub disabled: bool,
 }

src/model/generated/mod.rs

@@ -6,4 +6,5 @@ pub mod admin;
 pub mod answer;
 pub mod page;
 pub mod question;
+pub mod score;
 pub mod survey;

src/model/generated/prelude.rs

@@ -4,4 +4,5 @@ pub use super::admin::Entity as Admin;
 pub use super::answer::Entity as Answer;
 pub use super::page::Entity as Page;
 pub use super::question::Entity as Question;
+pub use super::score::Entity as Score;
 pub use super::survey::Entity as Survey;

src/model/generated/score.rs

@@ -0,0 +1,20 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "score")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub user: i64,
+    pub judge: i64,
+    pub survey: i32,
+    pub answer: i32,
+    pub scores: Vec<Json>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}

src/model/question.rs

@@ -30,8 +30,11 @@ pub struct ConditionInner {
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub enum ConditionType {
+    #[serde(rename = "and")]
     And,
+    #[serde(rename = "or")]
     Or,
+    #[serde(rename = "not")]
     Not,
 }