From aa6b78866962aa63023ffc26dcbfd04aabbd7774 Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Thu, 6 May 2021 12:52:14 +0530
Subject: [PATCH] refactor routing

---
 src/lib.rs          | 17 +++++++++++++----
 src/routes/users.rs |  2 --
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 7ee9697..cda8969 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,12 +54,21 @@ pub fn configure_app(app_data: AppData) -> Box<dyn Fn(&mut ServiceConfig)> {
         cfg.data(app_data.clone())
             .service(
                 web::scope("/api")
-                    .service(routes::users::get_user)
-                    .service(routes::users::get_all_users)
-                    .service(web::scope("/get").route(
+                    .service(
+                        web::scope("/users")
+                            .route(
+                                "",
+                                web::get().to(routes::users::get_all_users),
+                            )
+                            .route(
+                                "/{user_id}",
+                                web::get().to(routes::users::get_user),
+                            ),
+                    )
+                    .route(
                         "/build-info",
                         web::get().to(routes::misc::build_info_req),
-                    )),
+                    ),
             )
             // .route("/api/users/get", web::get().to(user_controller.get_user.into()))
             .service(web::scope("/api/public")) // public endpoint - not implemented yet
diff --git a/src/routes/users.rs b/src/routes/users.rs
index 9a66fd3..71357fd 100644
--- a/src/routes/users.rs
+++ b/src/routes/users.rs
@@ -7,7 +7,6 @@ use actix_web::error::ResponseError;
 use validator::Validate;
 
 /// Finds user by UID.
-#[get("/get/users/{user_id}")]
 pub async fn get_user(
     app_data: web::Data<AppData>,
     user_id: web::Path<i32>,
@@ -50,7 +49,6 @@ pub async fn get_user2(
     }
 }
 
-#[get("/get/users")]
 pub async fn get_all_users(
     app_data: web::Data<AppData>,
 ) -> Result<HttpResponse, DomainError> {