refactor: [#801] refactor names

Author: mario-nt

src/databases/database.rs

@@ -90,10 +90,10 @@ impl FromStr for UsersSorting {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "date_registered_newest" => Ok(UsersSorting::DateRegisteredNewest),
-            "date_registered_oldest" => Ok(UsersSorting::DateRegisteredOldest),
-            "username_az" => Ok(UsersSorting::UsernameAZ),
-            "username_za" => Ok(UsersSorting::UsernameZA),
+            "DateRegisteredNewest" => Ok(UsersSorting::DateRegisteredNewest),
+            "DateRegisteredOldest" => Ok(UsersSorting::DateRegisteredOldest),
+            "UsernameAZ" => Ok(UsersSorting::UsernameAZ),
+            "UsernameZA" => Ok(UsersSorting::UsernameZA),
             _ => Err(UsersSortingParseError),
         }
     }
@@ -124,9 +124,9 @@ impl FromStr for UsersFilters {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "email_verified" => Ok(UsersFilters::EmailVerified),
-            "email_not_verified" => Ok(UsersFilters::EmailNotVerified),
-            "torrent_uploader" => Ok(UsersFilters::TorrentUploader),
+            "EmailVerified" => Ok(UsersFilters::EmailVerified),
+            "EmailNotVerified" => Ok(UsersFilters::EmailNotVerified),
+            "TorrentUploader" => Ok(UsersFilters::TorrentUploader),
             _ => Err(UsersFiltersParseError),
         }
     }

src/services/user.rs

@@ -411,12 +411,12 @@ impl ListingService {
             let mut sanitized_filters: Vec<UsersFilters> = Vec::new();
             for filter in filter_values {
                 match filter.as_str() {
-                    "torrent_uploader" => sanitized_filters
-                        .push(UsersFilters::from_str("torrent_uploader").map_err(|_| ServiceError::InvalidUserListing)?),
-                    "email_not_verified" => sanitized_filters
-                        .push(UsersFilters::from_str("email_not_verified").map_err(|_| ServiceError::InvalidUserListing)?),
-                    "email_verified" => sanitized_filters
-                        .push(UsersFilters::from_str("email_verified").map_err(|_| ServiceError::InvalidUserListing)?),
+                    "TorrentUploader" => sanitized_filters
+                        .push(UsersFilters::from_str("TorrentUploader").map_err(|_| ServiceError::InvalidUserListing)?),
+                    "EmailNotVerified" => sanitized_filters
+                        .push(UsersFilters::from_str("EmailNotVerified").map_err(|_| ServiceError::InvalidUserListing)?),
+                    "EmailVerified" => sanitized_filters
+                        .push(UsersFilters::from_str("EmailVerified").map_err(|_| ServiceError::InvalidUserListing)?),
                     _ => return Err(ServiceError::InvalidUserListing),
                 }
             }