Merge branch 'main' into feat/org

swpu-acm · Dec 24, 2024 · 27fe24e · 27fe24e
2 parents a1cd4ff + 48edf26
commit 27fe24e
Show file tree

Hide file tree

Showing 9 changed files with 683 additions and 26 deletions.
diff --git a/.changes/solution.md b/.changes/solution.md
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -3,6 +3,9 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "src/"
+      - "tests/"
   pull_request:
     branches:
       - main

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## \[0.1.17]
+
+### New Features
+
+- [`5ac5d25`](https://github.com/swpu-acm/online-judge/commit/5ac5d2524eeea91ce31a0169108229c510ffd776) ([#61](https://github.com/swpu-acm/online-judge/pull/61) by [@K0nnyaku](https://github.com/swpu-acm/online-judge/../../K0nnyaku)) Support create, delete, get, list, update solutions
+
+### Chores
+
+- [`886474e`](https://github.com/swpu-acm/online-judge/commit/886474e4bca334405888c160089e9c24ee26459e) ([#67](https://github.com/swpu-acm/online-judge/pull/67) by [@K0nnyaku](https://github.com/swpu-acm/online-judge/../../K0nnyaku)) remove map_err
+
 ## \[0.1.16]
 
 ### Bug Fixes

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "algohub-server"
-version = "0.1.16"
+version = "0.1.17"
 edition = "2021"
 description = "Extremely fast async online judge backend based on Rust"
 readme = "README.md"

diff --git a/LICENSE b/LICENSE
diff --git a/src/routes/account.rs b/src/routes/account.rs
@@ -104,8 +104,7 @@ pub async fn login(
     login: Json<Login<'_>>,
 ) -> Result<OwnedCredentials> {
     let session = session::authenticate(db, login.identity, login.password)
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?
+        .await?
         .ok_or(Error::Unauthorized(Json("Invalid credentials".into())))?;
     Ok(Response {
         success: true,

diff --git a/src/routes/category.rs b/src/routes/category.rs
@@ -23,8 +23,7 @@ pub async fn create(
     }
 
     let data = category::create(db, category.into_inner().data)
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?
+        .await?
         .ok_or(Error::ServerError(Json("Failed to create category".into())))?;
 
     Ok(Json(Response {
@@ -48,9 +47,7 @@ pub async fn delete(
         )));
     }
 
-    category::delete(db, id)
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?;
+    category::delete(db, id).await?;
 
     Ok(Response {
         success: true,

diff --git a/src/routes/organization.rs b/src/routes/organization.rs
@@ -155,13 +155,8 @@ pub async fn delete(
         )));
     }
 
-    organization::delete(db, id)
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?;
-
-    remove_dir_all(Path::new("content/").join(id))
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?;
+    organization::delete(db, id).await?;
+    remove_dir_all(Path::new("content/").join(id)).await?;
 
     Ok(Response {
         success: true,

diff --git a/src/routes/problem.rs b/src/routes/problem.rs
@@ -30,8 +30,7 @@ pub async fn create(
     }
 
     let problem = problem::create(db, problem.into_inner())
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?
+        .await?
         .ok_or(Error::ServerError(Json(
             "Failed to create problem, please try again later.".into(),
         )))?;
@@ -52,8 +51,7 @@ pub async fn get(
     auth: Json<Option<Credentials<'_>>>,
 ) -> Result<UserProblem> {
     let problem = problem::get::<Problem>(db, id)
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?
+        .await?
         .ok_or(Error::NotFound(Json(
             "Problem with specified id not found".into(),
         )))?;
@@ -157,8 +155,7 @@ pub async fn update(
     }
 
     problem::update(db, id, problem.into_inner())
-        .await
-        .map_err(|e| Error::ServerError(Json(e.to_string().into())))?
+        .await?
         .ok_or(Error::ServerError(Json(
             "Failed to update problem, please try again later.".into(),
         )))?;