346 backend use proper locale

resources/locales/en.json

@@ -20,5 +20,6 @@
     "validation_required": "%{attribute} is a required field.",
     "validation_count": "The given %{attribute} has to be unique.",
     "email_password_not_matched": "Email and Password did not match.",
+    "validation_invalid_local": "The given %{provided_locale} is not valid locale. System is not supported for this locale.",
     "admin_user_forbidden": "You are not allowed to perform this request. Please check with your administrator."
 }

resources/locales/fr.json

@@ -1,3 +1,5 @@
 {
-    "name": "french"
+    "name": "french",
+    "email_address_not_valid": "french Email address is not valid",
+    "validation_required": "french %{attribute} is a required field."
 }

src/api/admin_user_api.rs

@@ -94,8 +94,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let request_data = request.into_inner();
-        request_data.validate(&self.state).await?;
+        request_data.validate(&self.state, user_locale).await?;
 
 
         match self
@@ -178,8 +179,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate().await?;
+        req.validate(user_locale).await?;
 
         match self
             .state
@@ -282,8 +284,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate(&self.state).await?;
+        req.validate(&self.state, user_locale).await?;
 
         let created_role_request = CreatableRole {
             name: req.name,
@@ -355,8 +358,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state
@@ -394,8 +398,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate(&self.state).await?;
+        req.validate(&self.state, user_locale).await?;
 
         match self
             .state
@@ -430,8 +435,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state
@@ -469,8 +475,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state
@@ -508,8 +515,9 @@ impl AdminUser for AdminUserApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state

src/api/content_api.rs

@@ -104,8 +104,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate(&self.state).await?;
+        req.validate(&self.state, user_locale).await?;
 
         match self
             .state
@@ -174,8 +175,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate().await?;
+        req.validate(user_locale).await?;
 
         match self
             .state
@@ -213,8 +215,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate(&self.state).await?;
+        req.validate(&self.state, user_locale).await?;
 
         match self
             .state
@@ -282,8 +285,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate(&self.state).await?;
+        req.validate(&self.state, user_locale).await?;
 
         match self
             .state
@@ -318,8 +322,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state
@@ -354,8 +359,9 @@ impl Content for ContentApi {
             )
             .await?;
 
+        let user_locale = logged_in_user.locale.clone();
         let req = request.into_inner();
-        req.validate()?;
+        req.validate(user_locale)?;
 
         match self
             .state

src/repositories/security_alert_repository.rs

@@ -32,6 +32,7 @@ impl SecurityAlertRepository {
         createable_security_alert_model: CreateSecurityAlertModel,
     ) -> Result<SecurityAlertModel> {
         // Validate the input
+
         createable_security_alert_model.validate()?;
 
         let sql = r"

src/requests/admin_user_request/change_admin_user_password_request.rs

@@ -6,14 +6,14 @@
 
 impl ChangeAdminUserPasswordRequest {
     /// validate
-    pub fn validate(&self) -> crate::error::Result<()> {
+    pub fn validate(&self, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if !self.password.required()? {
             let error_message = ErrorMessage {
                 key: String::from("password"),
-                message: t!("validation_required", attribute = t!("password")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("password", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);
@@ -22,7 +22,7 @@
         if !self.new_password.required()? {
             let error_message = ErrorMessage {
                 key: String::from("new_password"),
-                message: t!("validation_required", attribute = t!("new_password")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("new_password", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);
@@ -31,7 +31,7 @@
         if !self.confirm_password.required()? {
             let error_message = ErrorMessage {
                 key: String::from("confirm_password"),
-                message: t!("validation_required", attribute = t!("confirm_password")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("confirm_password", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);
@@ -40,7 +40,7 @@
         if self.new_password != self.confirm_password {
             let error_message = ErrorMessage {
                 key: String::from("confirm_password"),
-                message: t!("validation_confirmed", attribute = t!("confirm_password")).to_string(),
+                message: t!("validation_confirmed", locale = locale, attribute = t!("confirm_password", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);

src/requests/admin_user_request/delete_admin_user_request.rs

@@ -6,14 +6,14 @@
 
 impl DeleteAdminUserRequest {
     /// validate
-    pub fn validate(&self) -> crate::error::Result<()> {
+    pub fn validate(&self, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if !self.admin_user_id.required()? {
             let error_message = ErrorMessage {
                 key: String::from("admin_user"),
-                message: t!("validation_required", attribute = t!("admin_user")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("admin_user", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);

src/requests/auth_request/delete_role_request.rs → src/requests/admin_user_request/delete_role_request.rs

@@ -6,14 +6,14 @@
 
 impl DeleteRoleRequest {
     /// validate
-    pub fn validate(&self) -> crate::error::Result<()> {
+    pub fn validate(&self, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if !self.role_id.required()? {
             let error_message = ErrorMessage {
                 key: String::from("role_id"),
-                message: t!("validation_required", attribute = t!("role_id")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("role_id", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);

src/requests/admin_user_request/mod.rs

@@ -12,3 +12,6 @@ pub mod update_admin_user_request;
 pub mod update_role_request;
 /// change admin user password request
 pub mod change_admin_user_password_request;
+
+/// delete role request
+pub mod delete_role_request;

src/requests/admin_user_request/put_role_identifier_request.rs

@@ -5,14 +5,14 @@
 
 impl PutRoleIdentifierRequest {
     /// validate
-    pub async fn validate(&self, state: &AvoRedState) -> crate::error::Result<()> {
+    pub async fn validate(&self, state: &AvoRedState, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if self.identifier.is_empty() {
             let error_message = ErrorMessage {
                 key: String::from("identifier"),
-                message: t!("validation_required", attribute = t!("identifier")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("identifier", locale = locale)).to_string(),
             };
 
             valid = false;
@@ -27,7 +27,7 @@
         if role_identifier_count.total > 0 {
             let error_message = ErrorMessage {
                 key: String::from("email"),
-                message: t!("validation_count", attribute = t!("email")).to_string(),
+                message: t!("validation_count", locale = locale, attribute = t!("email", locale = locale)).to_string(),
             };
 
             valid = false;

src/requests/admin_user_request/store_admin_user_request.rs

@@ -6,14 +6,14 @@
 
 impl StoreAdminUserRequest {
     /// validate
-    pub async fn validate(&self, state: &AvoRedState) -> crate::error::Result<()> {
+    pub async fn validate(&self, state: &AvoRedState, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if !self.email.required()? {
             let error_message = ErrorMessage {
                 key: String::from("email"),
-                message: t!("validation_required", attribute = t!("email")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("email", locale = locale)).to_string(),
             };
             valid = false;
             errors.push(error_message);
@@ -22,7 +22,7 @@
         if !self.email.validate_email()? {
             let error_message = ErrorMessage {
                 key: String::from("email"),
-                message: t!("email_address_not_valid").to_string(),
+                message: t!("email_address_not_valid", locale = locale).to_string(),
             };
 
             valid = false;
@@ -37,7 +37,7 @@
         if admin_user_model.total > 0 {
             let error_message = ErrorMessage {
                 key: String::from("email"),
-                message: t!("validation_count", attribute = t!("email")).to_string(),
+                message: t!("validation_count", locale = locale, attribute = t!("email", locale = locale)).to_string(),
             };
 
             errors.push(error_message);
@@ -47,7 +47,7 @@
         if !self.password.required()? {
             let error_message = ErrorMessage {
                 key: String::from("password"),
-                message: t!("validation_required", attribute = t!("password")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("password", locale = locale)).to_string(),
             };
 
             valid = false;
@@ -57,7 +57,7 @@
         if self.password != self.confirm_password {
             let error_message = ErrorMessage {
                 key: String::from("password"),
-                message: t!("password_match_error").to_string(),
+                message: t!("password_match_error", locale = locale).to_string(),
             };
 
             valid = false;
@@ -70,7 +70,7 @@
             if !locale_path.exists() {
                 let error_message = ErrorMessage {
                     key: String::from("locale"),
-                    message: t!("validation_invalid", attribute = t!("locale")).to_string(),
+                    message: t!("validation_invalid", locale = locale , attribute = t!("locale", locale = locale)).to_string(),
                 };
 
                 valid = false;

src/requests/admin_user_request/store_role_request.rs

@@ -5,14 +5,14 @@
 
 impl StoreRoleRequest {
     /// validate
-    pub async fn validate(&self, state: &AvoRedState) -> crate::error::Result<()> {
+    pub async fn validate(&self, state: &AvoRedState, locale: String) -> crate::error::Result<()> {
         let mut errors: Vec<ErrorMessage> = vec![];
         let mut valid = true;
 
         if self.name.is_empty() {
             let error_message = ErrorMessage {
                 key: String::from("name"),
-                message: t!("validation_required", attribute = t!("name")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("name", locale = locale)).to_string(),
             };
 
             valid = false;
@@ -22,7 +22,7 @@
         if self.identifier.is_empty() {
             let error_message = ErrorMessage {
                 key: String::from("identifier"),
-                message: t!("validation_required", attribute = t!("identifier")).to_string(),
+                message: t!("validation_required", locale = locale, attribute = t!("identifier", locale = locale)).to_string(),
             };
 
             valid = false;
@@ -37,7 +37,7 @@
         if role_identifier_count.total > 0 {
             let error_message = ErrorMessage {
                 key: String::from("email"),
-                message: t!("validation_count", attribute = t!("email")).to_string(),
+                message: t!("validation_count", locale = locale, attribute = t!("email", locale = locale)).to_string(),
             };
 
             valid = false;