separation of database (#1)

Reviewed-on: #1

libertas_infra/src/repositories/user_repository.rs

@@ -1,11 +1,13 @@
 use async_trait::async_trait;
 use libertas_core::{
     error::{CoreError, CoreResult},
-    models::{Role, User},
+    models::User,
     repositories::UserRepository,
 };
 use sqlx::{PgPool, SqlitePool, types::Uuid};
 
+use crate::db_models::PostgresUser;
+
 #[derive(Clone)]
 pub struct PostgresUserRepository {
     pool: PgPool,
@@ -54,12 +56,12 @@ impl UserRepository for PostgresUserRepository {
     }
 
     async fn find_by_email(&self, email: &str) -> CoreResult<Option<User>> {
-        sqlx::query_as!(
-            User,
+        let pg_user = sqlx::query_as!(
+            PostgresUser,
             r#"
             SELECT 
                 id, username, email, hashed_password, created_at, updated_at,
-                role as "role: Role", 
+                role, 
                 storage_quota, storage_used
             FROM users 
             WHERE email = $1
@@ -68,17 +70,18 @@ impl UserRepository for PostgresUserRepository {
         )
         .fetch_optional(&self.pool)
         .await
-        .map_err(|e| CoreError::Database(e.to_string()))
+        .map_err(|e| CoreError::Database(e.to_string()))?;
+
+        Ok(pg_user.map(|u| u.into()))
     }
 
     async fn find_by_username(&self, username: &str) -> CoreResult<Option<User>> {
-        sqlx::query_as!(
-            User,
+        let pg_user = sqlx::query_as!(
+            PostgresUser,
             r#"
             SELECT 
                 id, username, email, hashed_password, created_at, updated_at,
-                role as "role: Role",
-                storage_quota, storage_used
+                role, storage_quota, storage_used
             FROM users 
             WHERE username = $1
             "#,
@@ -86,16 +89,18 @@ impl UserRepository for PostgresUserRepository {
         )
         .fetch_optional(&self.pool)
         .await
-        .map_err(|e| CoreError::Database(e.to_string()))
+        .map_err(|e| CoreError::Database(e.to_string()))?;
+
+        Ok(pg_user.map(|u| u.into()))
     }
 
     async fn find_by_id(&self, id: Uuid) -> CoreResult<Option<User>> {
-        sqlx::query_as!(
-            User,
+        let pg_user = sqlx::query_as!(
+            PostgresUser,
             r#"
             SELECT 
                 id, username, email, hashed_password, created_at, updated_at,
-                role as "role: Role",
+                role,
                 storage_quota, storage_used
             FROM users 
             WHERE id = $1
@@ -104,7 +109,8 @@ impl UserRepository for PostgresUserRepository {
         )
         .fetch_optional(&self.pool)
         .await
-        .map_err(|e| CoreError::Database(e.to_string()))
+        .map_err(|e| CoreError::Database(e.to_string()))?;
+        Ok(pg_user.map(|u| u.into()))
     }
 
     async fn update_storage_used(&self, user_id: Uuid, bytes: i64) -> CoreResult<()> {