Merge pull request #19 from mdcpp/18-issue

mdcpp · Jan 14, 2024 · 9674c86 · 9674c86
2 parents 772f59e + cfb37d2
commit 9674c86
Show file tree

Hide file tree

Showing 22 changed files with 824 additions and 313 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,5 +4,8 @@
         "Backend",
         "Judger",
         "Testsuit"
-    ]
+    ],
+    "files.watcherExclude": {
+        "**/plugins/**": true
+    }
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "frontend",
+   "frontend",
     "backend",
     "judger",
     "testsuit",

diff --git a/backend/build.rs b/backend/build.rs
@@ -5,6 +5,30 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "oj.backend.SortBy",
             "#[derive(serde::Serialize, serde::Deserialize)]",
         )
+        .type_attribute(
+            "oj.backend.SubmitSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            "oj.backend.ProblemSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            "oj.backend.TestcaseSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            "oj.backend.ContestSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            "oj.backend.UserSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            "oj.backend.AnnouncementSortBy",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
         .compile(&["../proto/backend.proto"], &["../proto"])?;
     // tonic_build::compile_protos("../proto/backend.proto")?;
     // tonic_build::compile_protos("../proto/judger.proto")?;

diff --git a/backend/migration/src/m20231207_000001_create_table.rs b/backend/migration/src/m20231207_000001_create_table.rs
@@ -33,6 +33,7 @@ macro_rules! index {
 enum Announcement {
     Table,
     Id,
+    ContestId,
     Title,
     Content,
     CreateAt,
@@ -177,6 +178,13 @@ impl MigrationTrait for Migration {
                             .not_null()
                             .default(""),
                     )
+                    .col(ColumnDef::new(Announcement::ContestId).integer().not_null())
+                    .foreign_key(
+                        ForeignKey::create()
+                            .name("fk-announcement-contest")
+                            .from(Education::Table, Announcement::ContestId)
+                            .to(Contest::Table, Contest::Id),
+                    )
                     .col(
                         ColumnDef::new(Announcement::CreateAt)
                             .date_time()