final clippy and formatting fixes

Author: intelliDean

crates/api/src/handlers/audit_logs.rs

@@ -24,7 +24,7 @@ pub async fn get_user_audit_logs(
     let mut conn = state
         .db
         .get()
-        .map_err(|e| ApiError::Database(e.to_string()))?;
+        .map_err(|e| ApiError::DatabaseConnection(e.to_string()))?;
 
     let logs = AuditLogRepository::find_by_user_paginated(&mut conn, user_id, limit, offset)?;
 

crates/api/src/handlers/verify_email.rs

@@ -2,7 +2,7 @@ use axum::{extract::Query, extract::State, Extension, Json};
 use payego_core::app_state::AppState;
 use payego_core::security::Claims;
 use payego_core::services::auth_service::verification::VerificationService;
-use payego_primitives::error::ApiError;
+use payego_primitives::error::{ApiError, AuthError};
 use serde::Deserialize;
 use std::sync::Arc;
 
@@ -32,10 +32,10 @@ pub async fn resend_verification(
     let mut conn = state
         .db
         .get()
-        .map_err(|e| ApiError::Database(e.to_string()))?;
+        .map_err(|e| ApiError::DatabaseConnection(e.to_string()))?;
     let user =
         payego_core::repositories::user_repository::UserRepository::find_by_id(&mut conn, user_id)?
-            .ok_or_else(|| ApiError::Auth("User not found".into()))?;
+            .ok_or_else(|| ApiError::Auth(AuthError::InternalError("User not found".into())))?;
 
     VerificationService::send_verification_email(&state, user_id, &user.email).await?;
 

crates/core/src/repositories/mod.rs

@@ -4,4 +4,5 @@ pub mod bank_repository;
 pub mod token_repository;
 pub mod transaction_repository;
 pub mod user_repository;
+pub mod verification_repository;
 pub mod wallet_repository;

crates/core/src/repositories/user_repository.rs

@@ -61,6 +61,6 @@ impl UserRepository {
             .set(users::email_verified_at.eq(chrono::Utc::now()))
             .execute(conn)
             .map(|_| ())
-            .map_err(|e| ApiError::Database(e.to_string()))
+            .map_err(ApiError::Database)
     }
 }

crates/core/src/repositories/verification_repository.rs

@@ -1,7 +1,9 @@
-use crate::repositories::UserRepository;
+use crate::repositories::user_repository::UserRepository;
 use diesel::prelude::*;
-use payego_primitives::error::ApiError;
-use payego_primitives::models::entities::verification_token::{NewVerificationToken, VerificationToken};
+use payego_primitives::error::{ApiError, AuthError};
+use payego_primitives::models::entities::verification_token::{
+    NewVerificationToken, VerificationToken,
+};
 use payego_primitives::schema::verification_tokens;
 use uuid::Uuid;
 
@@ -15,7 +17,7 @@ impl VerificationRepository {
         diesel::insert_into(verification_tokens::table)
             .values(&new_token)
             .get_result(conn)
-            .map_err(|e| ApiError::Database(e.to_string()))
+            .map_err(ApiError::Database)
     }
 
     pub fn find_by_token(
@@ -26,25 +28,30 @@ impl VerificationRepository {
             .filter(verification_tokens::token_hash.eq(token_hash))
             .first::<VerificationToken>(conn)
             .optional()
-            .map_err(|e| ApiError::Database(e.to_string()))
+            .map_err(ApiError::Database)
     }
 
     pub fn delete_for_user(conn: &mut PgConnection, user_id: Uuid) -> Result<(), ApiError> {
         diesel::delete(verification_tokens::table.filter(verification_tokens::user_id.eq(user_id)))
             .execute(conn)
             .map(|_| ())
-            .map_err(|e| ApiError::Database(e.to_string()))
+            .map_err(ApiError::Database)
     }
 
     pub fn consume_token(
         conn: &mut PgConnection,
         token_hash: &str,
     ) -> Result<VerificationToken, ApiError> {
-        let token = Self::find_by_token(conn, token_hash)?
-            .ok_or_else(|| ApiError::Auth("Invalid or expired verification token".into()))?;
+        let token = Self::find_by_token(conn, token_hash)?.ok_or_else(|| {
+            ApiError::Auth(AuthError::VerificationError(
+                "Invalid or expired verification token".into(),
+            ))
+        })?;
 
         if token.expires_at < chrono::Utc::now().naive_utc() {
-            return Err(ApiError::Auth("Verification token has expired".into()));
+            return Err(ApiError::Auth(AuthError::VerificationError(
+                "Verification token has expired".into(),
+            )));
         }
 
         // Verify user and delete token

crates/core/src/services/auth_service/verification.rs

@@ -19,7 +19,7 @@ impl VerificationService {
         let mut conn = state
             .db
             .get()
-            .map_err(|e| ApiError::Database(e.to_string()))?;
+            .map_err(|e| ApiError::DatabaseConnection(e.to_string()))?;
 
         // 24 hour expiry
         let expires_at = chrono::Utc::now().naive_utc() + chrono::Duration::hours(24);
@@ -50,7 +50,7 @@ impl VerificationService {
         let mut conn = state
             .db
             .get()
-            .map_err(|e| ApiError::Database(e.to_string()))?;
+            .map_err(|e| ApiError::DatabaseConnection(e.to_string()))?;
 
         VerificationRepository::consume_token(&mut conn, &token_hash)?;
 

crates/primitives/src/error.rs

@@ -155,6 +155,7 @@ impl From<ApiError> for (StatusCode, String) {
                 AuthError::DuplicateEmail => {
                     (StatusCode::BAD_REQUEST, "Email already exist".to_string())
                 }
+                AuthError::VerificationError(msg) => (StatusCode::BAD_REQUEST, msg),
             },
             ApiError::Payment(msg) => (
                 StatusCode::INTERNAL_SERVER_ERROR,
@@ -258,6 +259,15 @@ impl IntoResponse for ApiError {
                 },
             ),
 
+            ApiError::Auth(AuthError::VerificationError(msg)) => (
+                StatusCode::BAD_REQUEST,
+                ApiErrorResponse {
+                    code: "VERIFICATION_ERROR".to_string(),
+                    message: msg,
+                    details: None,
+                },
+            ),
+
             // ── Validation & input errors ──
             ApiError::Validation(errors) => (
                 StatusCode::BAD_REQUEST,
@@ -401,6 +411,7 @@ pub enum AuthError {
     BlacklistedToken,
     InternalError(String),
     DuplicateEmail,
+    VerificationError(String),
 }
 
 impl fmt::Display for AuthError {
@@ -413,6 +424,7 @@ impl fmt::Display for AuthError {
             AuthError::BlacklistedToken => write!(f, "Token has been invalidated"),
             AuthError::InternalError(msg) => write!(f, "Internal error: {}", msg),
             AuthError::DuplicateEmail => write!(f, "Email already exist"),
+            AuthError::VerificationError(msg) => write!(f, "Verification error: {}", msg),
         }
     }
 }

crates/primitives/src/models/entities/user.rs

@@ -10,9 +10,9 @@ pub struct User {
     pub email: String,
     pub password_hash: String,
     pub username: Option<String>,
-    pub email_verified_at: Option<DateTime<Utc>>,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
+    pub email_verified_at: Option<DateTime<Utc>>,
 }
 
 #[derive(Insertable, Deserialize)]

crates/primitives/src/schema.rs

@@ -1,19 +1,19 @@
 // @generated automatically by Diesel CLI.
 
 pub mod sql_types {
-    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "currency_code"))]
     pub struct CurrencyCode;
 
-    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "payment_provider"))]
     pub struct PaymentProvider;
 
-    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "payment_state"))]
     pub struct PaymentState;
 
-    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "transaction_intent"))]
     pub struct TransactionIntent;
 }

diesel.toml

@@ -3,7 +3,7 @@
 
 [print_schema]
 file = "crates/primitives/src/schema.rs"
-custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
+custom_type_derives = ["diesel::query_builder::QueryId"]
 
 [migrations_directory]
 dir = "migrations"