Handle canceled and expired assignments in submit_result

client/src/client.rs

@@ -11,8 +11,9 @@ use std::{
     time::Duration,
 };
 
-use clusterizer_api::client::ApiClient;
+use clusterizer_api::{client::ApiClient, result::ApiError};
 use clusterizer_common::{
+    errors::SubmitResultError,
     records::{
         Platform, PlatformFilter, Project, ProjectFilter, ProjectVersion, ProjectVersionFilter,
         Task,
@@ -223,7 +224,10 @@ impl ClusterizerClient {
             exit_code: output.status.code(),
         };
 
-        self.client.submit_result(task_id, &request).await?;
+        match self.client.submit_result(task_id, &request).await {
+            Err(ApiError::Specific(SubmitResultError::AssignmentExpired)) => {}
+            result => result?,
+        };
 
         Ok(Return::SubmitResult)
     }

common/src/errors/submit_result_error.rs

@@ -7,4 +7,8 @@ pub enum SubmitResultError {
     InvalidTask,
     #[error("already exists")]
     AlreadyExists,
+    #[error("assignment canceled")]
+    AssignmentCanceled,
+    #[error("assignment expired")]
+    AssignmentExpired,
 }

common/src/types/assignment_state.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Hash, Debug, Serialize, Deserialize)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::Type))]
 #[cfg_attr(
     feature = "sqlx",

server/src/routes/submit_result.rs

@@ -11,7 +11,7 @@ use clusterizer_common::{
 
 use crate::{
     auth::Auth,
-    result::{AppResult, ResultExt},
+    result::{AppError, AppResult, ResultExt},
     state::AppState,
     util,
 };
@@ -24,16 +24,16 @@ pub async fn submit_result(
 ) -> AppResult<(), SubmitResultError> {
     let mut tx = state.pool.begin().await?;
 
-    let assignment_id = sqlx::query_scalar_unchecked!(
+    let assignment = sqlx::query_as_unchecked!(
+        Assignment,
         r#"
         SELECT
-            id "id: Id<Assignment>"
+            *
         FROM
             assignments
         WHERE
             task_id = $1
             AND user_id = $2
-            AND state != 'canceled'
         FOR UPDATE
         "#,
         task_id,
@@ -43,6 +43,14 @@ pub async fn submit_result(
     .await
     .map_not_found(SubmitResultError::InvalidTask)?;
 
+    if assignment.state == AssignmentState::Canceled {
+        Err(AppError::Specific(SubmitResultError::AssignmentCanceled))?;
+    }
+
+    if assignment.state == AssignmentState::Expired {
+        Err(AppError::Specific(SubmitResultError::AssignmentExpired))?;
+    }
+
     sqlx::query_unchecked!(
         r#"
         INSERT INTO results (
@@ -57,7 +65,7 @@ pub async fn submit_result(
             $4
         )
         "#,
-        assignment_id,
+        assignment.id,
         request.stdout,
         request.stderr,
         request.exit_code,
@@ -66,7 +74,7 @@ pub async fn submit_result(
     .await
     .map_unique_violation(SubmitResultError::AlreadyExists)?;
 
-    util::set_assignment_state(&[assignment_id], AssignmentState::Submitted)
+    util::set_assignment_state(&[assignment.id], AssignmentState::Submitted)
         .execute(&mut *tx)
         .await?;