Small refactor

backend/src/online_classroom/json_result.rs

@@ -13,11 +13,11 @@ pub struct JsonError {
 }
 
 impl<A> JsonResult<A> {
-    pub fn error(reason: String) -> Json<JsonResult<A>> {
-        Json(JsonResult::Error(JsonError { reason }))
-    }
-
     pub fn ok(data: A) -> Json<JsonResult<A>> {
         Json(JsonResult::Ok(data))
     }
+
+    pub fn err(reason: String) -> Json<JsonResult<A>> {
+        Json(JsonResult::Error(JsonError { reason }))
+    }
 }

backend/src/online_classroom/mod.rs

@@ -4,34 +4,17 @@ use reqwest::Client;
 use rocket::{http::Status, serde::json::Json};
 use serde::{Deserialize, Serialize};
 
-use self::session::ensure_session;
+use self::{json_result::JsonResult, session::ensure_session};
 
 pub mod json_result;
 mod session;
 pub mod users;
 
-
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum ConnectionResult {
-    Ok(),
-    Error(ConnectionError),
-}
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ConnectionError {
-    reason: String,
-}
-fn new_error(reason: String) -> ConnectionResult {
-    ConnectionResult::Error(ConnectionError { reason })
-}
-
 /// Tries to connect to the online classroom, and get a session cookie
 #[get("/classroom/connect")]
-pub async fn connection() -> (Status, Json<ConnectionResult>) {
+pub async fn connection() -> (Status, Json<JsonResult<()>>) {
     match ensure_session().await {
-        Ok(_) => (Status::Ok, Json(ConnectionResult::Ok())),
-        Err(err) => (Status::Ok, Json(new_error(err))),
+        Ok(_) => (Status::Ok, JsonResult::ok(())),
+        Err(err) => (Status::Ok, JsonResult::err(err)),
     }
 }
-
-

backend/src/online_classroom/session.rs

@@ -7,11 +7,10 @@ static SESSION_COOKIE: OnceCell<String> = OnceCell::new();
 static SESSION_TIME: OnceCell<u64> = OnceCell::new();
 
 /// Makes a request to the online classroom, and returns the html string
-pub async fn request(url: String) -> Result<String, String> {
-    todo!()
+pub async fn _request(url: String) -> Result<String, String> {
+    Ok(url)
 }
 
-
 /// Makes sure that the session cookie is set, and that it is valid
 pub async fn ensure_session() -> Result<(), String> {
     let last_usage_time = match SESSION_TIME.get() {

backend/src/online_classroom/users.rs

@@ -1,6 +1,6 @@
 use rocket::{http::Status, serde::json::Json};
 
-use super::{ json_result::JsonResult};
+use super::json_result::JsonResult;
 
 // Instead of requesting pages and managing session & cookies manually,
 // create a wrapper that: