From 1c780ac3fe6aef08862ba3079e72b493455990b3 Mon Sep 17 00:00:00 2001
From: Robert Czechowski <czechowski@bwinf.de>
Date: Tue, 14 Jul 2020 20:29:34 +0200
Subject: [PATCH] Cleanup old routes no longer needed in webfw_iron

---
 src/core.rs       |  2 +-
 src/webfw_iron.rs | 67 +++--------------------------------------------
 2 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/src/core.rs b/src/core.rs
index df53107..cce29dc 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -125,7 +125,7 @@ pub fn index<T: MedalConnection>(conn: &T, session_token: Option<String>,
     ("index".to_owned(), data)
 }
 
-pub fn status<T: MedalConnection>(conn: &T) -> String { conn.get_debug_information() }
+pub fn status<T: MedalConnection>(conn: &T, _: ()) -> String { conn.get_debug_information() }
 
 pub fn debug<T: MedalConnection>(conn: &T, session_token: Option<String>)
                                  -> (String, json_val::Map<String, json_val::Value>) {
diff --git a/src/webfw_iron.rs b/src/webfw_iron.rs
index 6c77e3f..98a3c99 100644
--- a/src/webfw_iron.rs
+++ b/src/webfw_iron.rs
@@ -299,14 +299,7 @@ fn greet_personal<C>(req: &mut Request) -> IronResult<Response>
     let config = req.get::<Read<SharedConfiguration>>().unwrap();
     let oauth_infos = (config.self_url.clone(), config.oauth_providers.clone());
 
-    let (template, mut data) = {
-        // hier ggf. Daten aus dem Request holen
-        let mutex = req.get::<Write<SharedDatabaseConnection<C>>>().unwrap();
-        let conn = mutex.lock().unwrap_or_else(|e| e.into_inner());
-
-        // Antwort erstellen und zurücksenden
-        core::index(&*conn, session_token, oauth_infos)
-    };
+    let (template, mut data) = with_conn![core::index, C, req, session_token, oauth_infos];
 
     /*if let Some(server_message) = &config.server_message {
         data.insert("server_message".to_string(), to_json(&server_message));
@@ -321,12 +314,7 @@ fn greet_personal<C>(req: &mut Request) -> IronResult<Response>
 
 fn dbstatus<C>(req: &mut Request) -> IronResult<Response>
     where C: MedalConnection + std::marker::Send + 'static {
-    let status = {
-        let mutex = req.get::<Write<SharedDatabaseConnection<C>>>().unwrap();
-        let conn = mutex.lock().unwrap_or_else(|e| e.into_inner());
-
-        core::status(&*conn)
-    };
+    let status = with_conn![core::status, C, req, ()];
 
     let mut resp = Response::new();
     resp.set_mut(status).set_mut(status::Ok);
@@ -337,12 +325,7 @@ fn debug<C>(req: &mut Request) -> IronResult<Response>
     where C: MedalConnection + std::marker::Send + 'static {
     let session_token = req.get_session_token();
 
-    let (template, data) = {
-        let mutex = req.get::<Write<SharedDatabaseConnection<C>>>().unwrap();
-        let conn = mutex.lock().unwrap_or_else(|e| e.into_inner());
-
-        core::debug(&*conn, session_token)
-    };
+    let (template, data) = with_conn![core::debug, C, req, session_token];
 
     let mut resp = Response::new();
     resp.set_mut(Template::new(&template, data)).set_mut(status::Ok);
@@ -415,48 +398,6 @@ fn contests<C>(req: &mut Request) -> IronResult<Response>
     Ok(resp)
 }
 
-fn opencontests<C>(req: &mut Request) -> IronResult<Response>
-    where C: MedalConnection + std::marker::Send + 'static {
-    let session_token = req.require_session_token()?;
-
-    let config = req.get::<Read<SharedConfiguration>>().unwrap();
-    let (self_url, oauth_providers) = (config.self_url.clone(), config.oauth_providers.clone());
-
-    let (template, mut data) = with_conn![core::show_contests,
-                                          C,
-                                          req,
-                                          &session_token,
-                                          (self_url, oauth_providers),
-                                          core::ContestVisibility::Open];
-
-    config.server_message.as_ref().map(|sm| data.insert("server_message".to_string(), to_json(&sm)));
-
-    let mut resp = Response::new();
-    resp.set_mut(Template::new(&template, data)).set_mut(status::Ok);
-    Ok(resp)
-}
-
-fn currentcontests<C>(req: &mut Request) -> IronResult<Response>
-    where C: MedalConnection + std::marker::Send + 'static {
-    let session_token = req.require_session_token()?;
-
-    let config = req.get::<Read<SharedConfiguration>>().unwrap();
-    let (self_url, oauth_providers) = (config.self_url.clone(), config.oauth_providers.clone());
-
-    let (template, mut data) = with_conn![core::show_contests,
-                                          C,
-                                          req,
-                                          &session_token,
-                                          (self_url, oauth_providers),
-                                          core::ContestVisibility::Current];
-
-    config.server_message.as_ref().map(|sm| data.insert("server_message".to_string(), to_json(&sm)));
-
-    let mut resp = Response::new();
-    resp.set_mut(Template::new(&template, data)).set_mut(status::Ok);
-    Ok(resp)
-}
-
 fn contest<C>(req: &mut Request) -> IronResult<Response>
     where C: MedalConnection + std::marker::Send + 'static {
     let contest_id = req.expect_int::<i32>("contestid")?;
@@ -1240,8 +1181,6 @@ pub fn start_server<C>(conn: C, config: Config) -> iron::error::HttpResult<iron:
     let router = router!(
         greet: get "/" => greet_personal::<C>,
         contests: get "/contest/" => contests::<C>,
-        contestsopen: get "/contest/open/" => opencontests::<C>,
-        contestscurrent: get "/contest/current/" => currentcontests::<C>,
         contest: get "/contest/:contestid" => contest::<C>,
         contestresults: get "/contest/:contestid/result/" => contestresults::<C>,
         contestresults_download: get "/contest/:contestid/result/download" => contestresults_download::<C>,
-- 
GitLab