update

Author: Glubus

Cargo.lock

@@ -117,9 +117,7 @@ The crate depends on `tracing` and `tracing-subscriber`, but does not initialize
 
 ```rust 
 fn main(){
-    tracing_subscriber::fmt()
-        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
-        .init();
+    tracing_subscriber::fmt().with_env_filter(tracing_subscriber::EnvFilter::from_default_env()).init();
 }
 ```
 

README.md

@@ -1,4 +1,5 @@
-use super::validators::{validate_ar, validate_od_hp_cs, validate_status};
+use super::validators::{validate_ar, validate_od_hp_cs};
+use crate::utils::BEATMAP_STATUS_REGEX;
 use bigdecimal::BigDecimal;
 use chrono::NaiveDateTime;
 use serde_json::Value;
@@ -80,7 +81,7 @@ pub struct BeatmapRow {
 
     /// Status of the beatmap.
     /// Must be one of: 'pending', 'ranked', 'qualified', 'loved', 'graveyard'.
-    #[validate(custom(function = "validate_status"))]
+    #[validate(regex(path = *BEATMAP_STATUS_REGEX))]
     pub status: String,
 
     /// Timestamp when the beatmap was created.

src/models/beatmaps/beatmap/types.rs

@@ -1,13 +1,6 @@
 use bigdecimal::{BigDecimal, FromPrimitive};
 use validator::ValidationError;
 
-pub fn validate_status(status: &str) -> Result<(), ValidationError> {
-    match status {
-        "pending" | "ranked" | "qualified" | "loved" | "graveyard" => Ok(()),
-        _ => Err(validator::ValidationError::new("invalid_status")),
-    }
-}
-
 pub fn validate_od_hp_cs(value: &BigDecimal) -> Result<(), ValidationError> {
     if value < &BigDecimal::from_f64(0.0).unwrap() || value > &BigDecimal::from_f64(10.0).unwrap() {
         return Err(validator::ValidationError::new("invalid_od_hp_cs"));

src/models/beatmaps/beatmap/validators.rs

@@ -1,4 +1 @@
 pub mod failed_query;
-
-// Re-exports for easy access
-pub use failed_query::*;

src/models/other/mod.rs

@@ -3,10 +3,3 @@ pub mod weekly_maps;
 pub mod weekly_participants;
 pub mod weekly_pool;
 pub mod weekly_scores;
-
-// Re-exports for easy access
-pub use weekly::WeeklyRow;
-pub use weekly_maps::WeeklyMapsRow;
-pub use weekly_participants::WeeklyParticipantsRow;
-pub use weekly_pool::WeeklyPoolRow;
-pub use weekly_scores::WeeklyScoresRow;

src/models/weeklys/mod.rs

@@ -1,21 +1,21 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
 
-/// Regex pour valider les hash alphanumériques
+/// Regex for Hash alphanumerical
 pub static HASH_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[a-zA-Z0-9]+$").unwrap());
-/// Regex pour valider les emails
+/// Regex for Email
 pub static EMAIL_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$").unwrap());
 
-/// Regex pour valider les noms d'utilisateur (alphanumériques + underscore)
+/// Regex for Username (alphanumerical + underscore)
 pub static USERNAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[a-zA-Z0-9_]+$").unwrap());
 
-/// Regex pour valider les UUIDs
+/// Regex for UUIDs
 pub static UUID_REGEX: Lazy<Regex> = Lazy::new(|| {
     Regex::new(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$").unwrap()
 });
 
-/// Regex pour valider les types de rating (etterna, osu, quaver, malody)
+/// Regex for Rating types (etterna, osu, quaver, malody)
 pub static RATING_TYPE_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^(etterna|osu|quaver|malody)$").unwrap());
 
@@ -24,3 +24,7 @@ pub static RANK_REGEX: Lazy<Regex> =
 
 pub static SCORE_STATUS_REGEX: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^(pending|processing|validated|cheated|unsubmitted)$").unwrap());
+
+/// Regex for Beatmap status (pending, ranked, qualified, loved, graveyard)
+pub static BEATMAP_STATUS_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"^(pending|ranked|qualified|loved|graveyard)$").unwrap());