refactor: Rename services to routes

Author: hampfh

apps/server/src/api/mod.rs

@@ -1,6 +1,6 @@
 pub mod db;
 pub mod models;
+pub mod routes;
 #[allow(non_snake_case)]
 pub mod schema;
 pub mod server;
-pub mod services;

apps/server/src/api/services/core.rs renamed to apps/server/src/api/routes/challenge.rs

@@ -115,3 +115,32 @@ pub async fn submit_challenge(
 fn valid_request(action: &String, labels: &Vec<Label>) -> bool {
     return action == "opened" && labels.iter().any(|current| current.name == "challenger");
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use actix_web::{test, App};
+
+    #[actix_web::test]
+    async fn test_valid_request() {
+        let action = "opened".to_string();
+        let labels = vec![Label {
+            name: "challenger".to_string(),
+            node_id: todo!(),
+            url: todo!(),
+            color: todo!(),
+            default: todo!(),
+            description: todo!(),
+        }];
+        assert_eq!(valid_request(&action, &labels), true);
+    }
+
+    /*     #[actix_web::test]
+    async fn test_invalid_request() {
+        let action = "closed".to_string();
+        let labels = vec![Label {
+            name: "challenger".to_string(),
+        }];
+        assert_eq!(valid_request(&action, &labels), false);
+    } */
+}

apps/server/src/api/services/match_data.rs renamed to apps/server/src/api/routes/match_data.rs

@@ -31,7 +31,7 @@ pub(crate) struct HttpResponseStruct {
 }
 
 #[get("/api/matches/{id}")]
-pub(super) async fn get_match_route(
+pub(routes) async fn get_match_route(
     path: web::Path<String>,
 ) -> actix_web::Result<Json<HttpResponseStruct>> {
     let conn = api::db::establish_connection().get().unwrap();

apps/server/src/api/services/matches.rs renamed to apps/server/src/api/routes/matches.rs

@@ -9,7 +9,7 @@ pub(crate) struct HttpResponseStruct {
 }
 
 #[get("/api/matches")]
-pub(super) async fn get_matches_route() -> actix_web::Result<Json<HttpResponseStruct>> {
+pub(routes) async fn get_matches_route() -> actix_web::Result<Json<HttpResponseStruct>> {
     let conn = api::db::establish_connection().get().unwrap();
 
     let matches = Match::list_ids(&conn);

apps/server/src/api/services/mod.rs renamed to apps/server/src/api/routes/mod.rs

@@ -1,4 +1,4 @@
-pub(crate) mod core;
+pub(crate) mod challenge;
 pub(crate) mod match_data;
 pub(crate) mod matches;
 pub(crate) mod ping;

apps/server/src/api/routes/ping.rs

@@ -0,0 +1,22 @@
+use actix_web::get;
+
+#[get("/api/ping")]
+pub(routes) async fn get_api_ping() -> actix_web::Result<String> {
+    return Ok("pong".to_string());
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use actix_web::{test, App};
+
+    #[actix_web::test]
+    async fn test_ping_route() {
+        let app = test::init_service(App::new().service(get_api_ping)).await;
+        let req = test::TestRequest::get().uri("/api/ping").to_request();
+        let resp = test::call_service(&app, req).await;
+        assert!(resp.status().is_success());
+        let body = test::read_body(resp).await;
+        assert_eq!(body, "pong");
+    }
+}

apps/server/src/api/services/routes.rs renamed to apps/server/src/api/routes/routes.rs

@@ -1,7 +1,7 @@
 use actix_web::web;
 
 use super::{
-    core::submit_challenge, match_data::get_match_route, matches::get_matches_route,
+    challenge::submit_challenge, match_data::get_match_route, matches::get_matches_route,
     ping::get_api_ping,
 };
 

apps/server/src/api/server.rs

@@ -1,6 +1,6 @@
 use actix_web::{web::Data, App, HttpServer};
 
-use crate::api::{self, db::run_migrations, services::routes::routes};
+use crate::api::{self, db::run_migrations, routes::routes::routes};
 
 pub(crate) async fn start_server(port: u16, host: String) -> Result<(), std::io::Error> {
     migrations();