refactor: make get_dashboard_entry_response function take onwership o…

…f user and user_role
juspay · Dec 4, 2023 · ed0b617 · ed0b617
1 parent 996c3dd
commit ed0b617
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/crates/router/src/core/user.rs b/crates/router/src/core/user.rs
@@ -94,7 +94,7 @@ pub async fn signup(
     let token = utils::user::generate_jwt_auth_token(state, &user_from_db, &user_role).await?;
 
     Ok(ApplicationResponse::Json(
-        utils::user::get_dashboard_entry_response(&user_from_db, &user_role, token),
+        utils::user::get_dashboard_entry_response(user_from_db, user_role, token),
     ))
 }
 
@@ -121,7 +121,7 @@ pub async fn signin(
     let token = utils::user::generate_jwt_auth_token(state, &user_from_db, &user_role).await?;
 
     Ok(ApplicationResponse::Json(
-        utils::user::get_dashboard_entry_response(&user_from_db, &user_role, token),
+        utils::user::get_dashboard_entry_response(user_from_db, user_role, token),
     ))
 }
 

diff --git a/crates/router/src/utils/user.rs b/crates/router/src/utils/user.rs
@@ -105,17 +105,17 @@ pub async fn generate_jwt_auth_token_with_custom_merchant_id(
 }
 
 pub fn get_dashboard_entry_response(
-    user: &UserFromStorage,
-    user_role: &UserRole,
+    user: UserFromStorage,
+    user_role: UserRole,
     token: Secret<String>,
 ) -> user_api::DashboardEntryResponse {
     user_api::DashboardEntryResponse {
-        merchant_id: user_role.merchant_id.clone(),
+        merchant_id: user_role.merchant_id,
         token,
         name: user.get_name(),
         email: user.get_email(),
         user_id: user.get_user_id().to_string(),
         verification_days_left: None,
-        user_role: user_role.role_id.clone(),
+        user_role: user_role.role_id,
     }
 }