refactor: [#801] fixed 500 error when using two where filters at the same time and code cleanup

Author: mario-nt

src/databases/mysql.rs

@@ -183,7 +183,7 @@ impl Database for Mysql {
                     match sanitized_filter {
                         UsersFilters::TorrentUploader => join_filters.push_str(
                             "INNER JOIN torrust_torrents tt
-                    ON tu.user_id = tt_uploader_id",
+                    ON tu.user_id = tt.uploader_id",
                         ),
                         _ => break,
                     }
@@ -195,7 +195,6 @@ impl Database for Mysql {
         };
 
         let where_filters_query = if let Some(filters) = filters {
-            let mut i = 0;
             let mut where_filters = String::new();
             for filter in filters {
                 // don't take user input in the db query
@@ -207,12 +206,9 @@ impl Database for Mysql {
                         _ => continue,
                     };
 
-                    let mut str = format!("AND {filter_query}");
-                    if i > 0 {
-                        str = format!(" AND {str}");
-                    }
+                    let str = format!("AND {filter_query} ");
+
                     where_filters.push_str(&str);
-                    i += 1;
                 }
             }
             where_filters

src/databases/sqlite.rs

@@ -184,7 +184,7 @@ impl Database for Sqlite {
                     match sanitized_filter {
                         UsersFilters::TorrentUploader => join_filters.push_str(
                             "INNER JOIN torrust_torrents tt
-                    ON tu.user_id = tt_uploader_id",
+                    ON tu.user_id = tt.uploader_id ",
                         ),
                         _ => break,
                     }
@@ -196,7 +196,6 @@ impl Database for Sqlite {
         };
 
         let where_filters_query = if let Some(filters) = filters {
-            let mut i = 0;
             let mut where_filters = String::new();
             for filter in filters {
                 // don't take user input in the db query
@@ -208,12 +207,9 @@ impl Database for Sqlite {
                         _ => continue,
                     };
 
-                    let mut str = format!("AND {filter_query}");
-                    if i > 0 {
-                        str = format!(" AND {str}");
-                    }
+                    let str = format!("AND {filter_query} ");
+
                     where_filters.push_str(&str);
-                    i += 1;
                 }
             }
             where_filters

src/services/user.rs

@@ -409,7 +409,7 @@ impl ListingService {
 
         let offset = u64::from(page * u32::from(page_size));
 
-        let sort = request.sort.clone().unwrap_or("UsernameAZ".to_string());
+        let sort = request.sort.clone().unwrap_or("usernameASC".to_string());
 
         let sort = match sort.as_str() {
             "dateRegisteredASC" => UsersSorting::DateRegisteredNewest,