Skip to content
Snippets Groups Projects
Commit f74d8421 authored by Michael Hauspie's avatar Michael Hauspie
Browse files

Refactor by moving operations to own module

parent ccda501f
Branches
Tags
No related merge requests found
use rocket::{get, launch, post, routes, serde::json::Json}; use rocket::{get, launch, post, routes, serde::json::Json};
use serde::{Deserialize, Serialize};
const INDEX_TEXT: &str = r#"\ const INDEX_TEXT: &str = r#"\
Cette application permet d'executer des calculs simple. Cette application permet d'executer des calculs simple.
...@@ -30,16 +29,8 @@ Pour envoyer une requête avec curl: ...@@ -30,16 +29,8 @@ Pour envoyer une requête avec curl:
curl -X POST http://monurl -H 'Content-Type: application/json' -d '{"Plus", [3, 4]}' curl -X POST http://monurl -H 'Content-Type: application/json' -d '{"Plus", [3, 4]}'
"#; "#;
#[derive(Serialize, Deserialize, Copy, Clone, Debug)] mod operations;
enum Operation { use operations::{Operation, OperationResult};
Plus(i32,i32),
}
#[derive(Deserialize, Serialize, PartialEq, Debug)]
struct OperationResult {
operation: String,
resultat: i32,
}
#[get("/")] #[get("/")]
fn index() -> &'static str { fn index() -> &'static str {
...@@ -48,12 +39,7 @@ fn index() -> &'static str { ...@@ -48,12 +39,7 @@ fn index() -> &'static str {
#[post("/", data = "<operation>")] #[post("/", data = "<operation>")]
fn do_calc(operation: Json<Operation>) -> Json<OperationResult> { fn do_calc(operation: Json<Operation>) -> Json<OperationResult> {
match operation.into_inner() { OperationResult::from(operation.into_inner()).into()
Operation::Plus(op1, op2) => OperationResult {
operation: format!("{op1} + {op2}"),
resultat: op1 + op2,
}.into()
}
} }
#[get("/test")] #[get("/test")]
...@@ -91,10 +77,7 @@ mod tests { ...@@ -91,10 +77,7 @@ mod tests {
let response = req.dispatch(); let response = req.dispatch();
assert_eq!(response.status(), Status::Ok); assert_eq!(response.status(), Status::Ok);
let expected = OperationResult { let expected = OperationResult::new("3 + 8", 11);
operation: "3 + 8".into(),
resultat: 11,
};
assert_eq!(response.into_json::<OperationResult>().unwrap(), expected); assert_eq!(response.into_json::<OperationResult>().unwrap(), expected);
} }
} }
//! This modules defines the possible operation and provide methods
//! to do the actual computation
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Copy, Clone, Debug)]
pub enum Operation {
Plus(i32,i32),
}
#[derive(Deserialize, Serialize, PartialEq, Debug)]
pub struct OperationResult {
operation: String,
resultat: i32,
}
impl OperationResult {
/// Creates a new operation result from a [`&str`] and a value.
pub fn new(s: &str, value: i32) -> Self {
Self {
operation: String::from(s),
resultat: value,
}
}
}
impl From<&Operation> for OperationResult {
fn from(value: &Operation) -> Self {
match value {
Operation::Plus(op1, op2) => OperationResult {
operation: format!("{op1} + {op2}"),
resultat: op1 + op2,
}
}
}
}
impl From<Operation> for OperationResult {
fn from(value: Operation) -> Self {
OperationResult::from(&value)
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn plus() {
let operation = Operation::Plus(4, 5);
let result = OperationResult::from(operation);
let expected = OperationResult::new("4 + 5", 9);
assert_eq!(result, expected);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment