refactor: [#801] more code cleanup

Author: mario-nt

src/services/authorization.rs

@@ -249,7 +249,7 @@ impl Default for CasbinConfiguration {
                 admin, GetCanonicalInfoHash
                 admin, ChangePassword
                 admin, BanUser
-                admin, GenerateUserProfilesListing
+                admin, GenerateUserProfileSpecification
                 registered, GetAboutPage
                 registered, GetLicensePage
                 registered, GetCategories

src/services/user.rs

@@ -366,34 +366,20 @@ impl ListingService {
         }
     }
 
-    /// Returns a list of all the user profiles matching the search criteria.
-    ///
-    /// # Errors
-    ///
-    /// Returns a `ServiceError::DatabaseError` if the database query fails.
-    pub async fn generate_user_profile_listing(
-        &self,
-        listing: &ListingSpecification,
-        maybe_user_id: Option<UserId>,
-    ) -> Result<UserProfilesResponse, ServiceError> {
-        self.authorization_service
-            .authorize(ACTION::GenerateUserProfilesListing, maybe_user_id)
-            .await?;
-
-        let user_profiles_response = self.user_profile_repository.generate_listing(listing).await?;
-
-        Ok(user_profiles_response)
-    }
-
     /// It converts the user listing request into an internal listing specification.
     ///    
     /// # Errors
     ///
     /// Returns a `ServiceError::InvalidUserListing` if there is an incorrect value in the url params for the listing request.
     pub async fn listing_specification_from_user_request(
         &self,
+        maybe_user_id: Option<UserId>,
         request: &ListingRequest,
     ) -> Result<ListingSpecification, ServiceError> {
+        self.authorization_service
+            .authorize(ACTION::GenerateUserProfilesListing, maybe_user_id)
+            .await?;
+
         let settings = self.configuration.settings.read().await;
         let default_user_profile_page_size = settings.api.default_user_profile_page_size;
         let max_user_profile_page_size = settings.api.max_user_profile_page_size;
@@ -447,6 +433,20 @@ impl ListingService {
             search: request.search.clone(),
         })
     }
+
+    /// Returns a list of all the user profiles matching the search criteria.
+    ///
+    /// # Errors
+    ///
+    /// Returns a `ServiceError::DatabaseError` if the database query fails.
+    pub async fn generate_user_profile_listing(
+        &self,
+        listing: &ListingSpecification,
+    ) -> Result<UserProfilesResponse, ServiceError> {
+        let user_profiles_response = self.user_profile_repository.generate_listing(listing).await?;
+
+        Ok(user_profiles_response)
+    }
 }
 
 #[cfg_attr(test, automock)]

src/web/api/server/v1/contexts/user/handlers.rs

@@ -201,18 +201,14 @@ pub async fn get_user_profiles_handler(
 ) -> Response {
     let listing = match app_data
         .listing_service
-        .listing_specification_from_user_request(&criteria)
+        .listing_specification_from_user_request(maybe_user_id, &criteria)
         .await
     {
         Ok(listing_value) => listing_value,
         Err(err) => return err.into_response(),
     };
 
-    match app_data
-        .listing_service
-        .generate_user_profile_listing(&listing, maybe_user_id)
-        .await
-    {
+    match app_data.listing_service.generate_user_profile_listing(&listing).await {
         Ok(users) => Json(crate::web::api::server::v1::responses::OkResponseData { data: users }).into_response(),
         Err(error) => error.into_response(),
     }