Skip to content

Commit

Permalink
Merge pull request #41 from Learn-Quickly/dev
Browse files Browse the repository at this point in the history
small fix
  • Loading branch information
advanced-user committed Jun 12, 2024
2 parents 78b29b6 + 7c4a7df commit 7c8d98d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion crates/libs/lib-core/src/interactors/exercise_checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,18 @@ impl ExerciseChecker {
});
}

if ex_comp.body.is_none() {
return Ok(ExerciseEstimate {
points: 0.0,
max_points: 0.0,
difficulty: exercise.difficult.clone(),
state: ExerciseCompletionState::Failed,
});
}

let conspect_estimate = match exercise.exercise_type {
crate::models::exercise::ExerciseType::Conspect |
crate::models::exercise::ExerciseType::InteractiveConspect => Self::evaluate_conspects_bodies(exercise.answer_body.clone(), ex_comp.body.clone())?,
crate::models::exercise::ExerciseType::InteractiveConspect => Self::evaluate_conspects_bodies(exercise.answer_body.clone(), ex_comp.body.clone().unwrap())?,
};

let max_points: f32 = f32::from(exercise.difficult.clone()) * 100.0;
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/lib-core/src/models/exercise_completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct ExerciseCompletion {
pub date_started: i64,
pub date_last_changes: Option<i64>,
pub state: ExerciseCompletionState,
pub body: Value,
pub body: Option<Value>,
}

#[derive(PartialEq, Display, Clone, Copy)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct ExerciseCompletionQuery {
pub date_started: OffsetDateTime,
pub date_last_changes: Option<OffsetDateTime>,
pub state: String,
pub body: serde_json::Value,
pub body: Option<serde_json::Value>,
}

impl TryFrom<ExerciseCompletionQuery> for ExerciseCompletion {
Expand Down

0 comments on commit 7c8d98d

Please sign in to comment.