Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- remove: unused imports

Browse Source
This commit is contained in:
raven
2024-11-26 02:01:27 -05:00
parent ab7728837c
commit 8499655fe9
17 changed files with 49 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
auth-service/src/database_client.rs
View File

@@ -1,8 +1,8 @@
use std::error::Error;
use tonic::transport::Channel;
use crate::database::{database_service_client::DatabaseServiceClient, CreateUserRequest, CreateUserResponse, GetUserByUsernameRequest, GetUserByEmailRequest, GetUserRequest, GetUserResponse};
use crate::database::{database_service_client::DatabaseServiceClient, CreateUserRequest, CreateUserResponse, GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
use std::error::Error;
use tonic::transport::Channel;
#[async_trait]
pub trait DatabaseClientTrait: Sized {

10
auth-service/src/grpc.rs
View File

@@ -1,11 +1,11 @@
use crate::auth::auth_service_server::AuthService;
use crate::auth::{LoginRequest, LoginResponse, PasswordResetRequest, PasswordResetResponse, RegisterRequest, RegisterResponse, ResetPasswordRequest, ResetPasswordResponse, ValidateTokenRequest, ValidateTokenResponse};
use crate::database_client::{DatabaseClientTrait};
use crate::jwt::{generate_token, validate_token};
use crate::users::{hash_password, verify_user};
use chrono::{Duration, Utc};
use rand::Rng;
use tonic::{Request, Response, Status};
use crate::jwt::{generate_token, validate_token};
use crate::users::{verify_user, hash_password};
use crate::database_client::{DatabaseClient, DatabaseClientTrait};
use crate::auth::auth_service_server::{AuthService};
use crate::auth::{LoginRequest, LoginResponse, ValidateTokenRequest, ValidateTokenResponse, RegisterRequest, RegisterResponse, PasswordResetRequest, PasswordResetResponse, ResetPasswordRequest, ResetPasswordResponse};
use tracing::{info, warn};
pub struct MyAuthService<T: DatabaseClientTrait + Clone> {

4
auth-service/src/jwt.rs
View File

@@ -1,5 +1,5 @@
use jsonwebtoken::{encode, decode, Header, Validation, EncodingKey, DecodingKey};
use serde::{Serialize, Deserialize};
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
use serde::{Deserialize, Serialize};
use std::env;
#[derive(Debug, Serialize, Deserialize)]

12
auth-service/src/main.rs
View File

@@ -1,13 +1,13 @@
use warp::Filter;
use crate::service_discovery::get_service_address;
use auth_service::auth::auth_service_server::AuthServiceServer;
use auth_service::database_client::DatabaseClient;
use auth_service::database_client::DatabaseClientTrait;
use auth_service::grpc::MyAuthService;
use dotenv::dotenv;
use std::env;
use std::net::ToSocketAddrs;
use tonic::transport::Server;
use auth_service::grpc::MyAuthService;
use auth_service::database_client::DatabaseClient;
use auth_service::database_client::DatabaseClientTrait;
use auth_service::auth::auth_service_server::AuthServiceServer;
use crate::service_discovery::get_service_address;
use warp::Filter;
mod consul_registration;
mod service_discovery;

8
auth-service/src/mocks/database_client_mock.rs
View File

@@ -1,9 +1,9 @@
use std::error::Error;
use mockall::{mock, predicate::*};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
use crate::database::{CreateUserResponse, GetUserResponse};
use crate::database_client::{DatabaseClientTrait, PasswordReset};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
use mockall::{mock, predicate::*};
use std::error::Error;
#[cfg(test)]
mock! {

5
auth-service/src/service_discovery.rs
View File

@@ -1,8 +1,3 @@
use std::collections::HashMap;
use std::iter::Map;
use consul::Client;
use consul::health::Health;
use reqwest::Response;
use serde::Deserialize;
#[derive(Deserialize)]

2
auth-service/src/users.rs
View File

@@ -1,4 +1,4 @@
use crate::database_client::{DatabaseClient, DatabaseClientTrait};
use crate::database_client::DatabaseClientTrait;
use argon2::{
password_hash::{

8
auth-service/tests/integration.rs
View File

@@ -1,14 +1,6 @@
#[cfg(test)]
mod tests {
use super::*;
use dotenv::dotenv;
use tonic::Request;
use auth_service::auth::auth_service_server::AuthService;
use auth_service::auth::{LoginRequest, LoginResponse, ValidateTokenRequest, ValidateTokenResponse};
use auth_service::database::GetUserResponse;
use auth_service::database_client::DatabaseClient;
use auth_service::grpc::MyAuthService;
use auth_service::jwt;
// use auth_service::mocks::database_client_mock::MockDatabaseClient;

4
database-service/src/db.rs
View File

@@ -1,7 +1,7 @@
use sqlx::PgPool;
use std::sync::Arc;
use crate::redis_cache::RedisCache;
use crate::users::UsersService;
use sqlx::PgPool;
use std::sync::Arc;
pub struct Database {
pub users_service: UsersService, // User-specific functionality

5
database-service/src/grpc.rs
View File

@@ -1,9 +1,8 @@
use crate::database::{CreateUserRequest, CreateUserResponse, GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse};
use crate::db::Database;
use crate::database::{CreateUserRequest, CreateUserResponse, GetUserRequest, GetUserByUsernameRequest, GetUserByEmailRequest, GetUserResponse};
use tonic::{Request, Response, Status};
use crate::database::database_service_server::{DatabaseService};
use tracing::{debug, error};
use crate::database::database_service_server::DatabaseService;
pub struct MyDatabaseService {
pub db: Database, // Use the Database struct from users.rs

17
database-service/src/main.rs
View File

@@ -1,16 +1,15 @@
use warp::Filter;
use database::database_service_server::DatabaseServiceServer;
use database_service::database;
use database_service::db::Database;
use database_service::grpc::MyDatabaseService;
use database_service::redis_cache::RedisCache;
use dotenv::dotenv;
use sqlx::postgres::PgPoolOptions;
use std::env;
use std::net::ToSocketAddrs;
use tonic::transport::Server;
use database_service::db::Database;
use database_service::redis_cache::RedisCache;
use database::database_service_server::DatabaseServiceServer;
use std::sync::Arc;
use database_service::database;
use database_service::grpc::MyDatabaseService;
use sqlx::postgres::PgPoolOptions;
use tokio::task;
use tonic::transport::Server;
use warp::Filter;
mod consul_registration;

2
database-service/src/redis_cache.rs
View File

@@ -1,7 +1,7 @@
use async_trait::async_trait;
use deadpool_redis::{Config, Pool, Runtime};
use redis::{AsyncCommands, RedisError};
use serde::{Deserialize, Serialize};
use async_trait::async_trait;
#[async_trait]
pub trait Cache {

5
database-service/src/users.rs
View File

@@ -1,9 +1,8 @@
use crate::redis_cache::{Cache, RedisCache};
use serde::{Deserialize, Serialize};
use sqlx::Error;
use sqlx::PgPool;
use serde::{Serialize, Deserialize};
use std::sync::Arc;
use crate::redis_cache::{Cache, RedisCache};
use tracing::{debug, error};
#[derive(Debug, Serialize, Deserialize)]

2
database-service/tests/get_user.rs
View File

@@ -1,6 +1,4 @@
use sqlx::{PgPool, Executor};
use tokio;
use database_service::users::UsersService;
#[tokio::test]
async fn test_get_user() {

5
database-service/tests/grpc_get_user.rs
View File

@@ -1,8 +1,3 @@
use tonic::{Request, Response};
use database_service::database::database_service_server::DatabaseService;
use database_service::database::GetUserRequest;
use database_service::grpc::MyDatabaseService;
#[tokio::test]
async fn test_grpc_get_user() {
// let pool = setup_test_pool().await; // Set up your test pool

2
database-service/tests/integration.rs
View File

@@ -1,8 +1,6 @@
#[cfg(test)]
mod tests {
use super::*;
use dotenv::dotenv;
use database_service::db::Database;
#[tokio::test]
async fn test_health_check() {

31
database-service/tests/redis_cache.rs
View File

@@ -1,21 +1,16 @@
use deadpool_redis::{Config, Pool, Runtime};
use redis::AsyncCommands;
use database_service::redis_cache::RedisCache;
use dotenv::dotenv;
#[tokio::test]
async fn test_redis_cache() {
dotenv().ok();
let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
let cache = RedisCache::new(&redis_url);
let key = &"test_key".to_string();
let value = "test_value";
// Test setting a value
cache.set(key, &value, 10).await.unwrap();
// Test getting the value
let cached_value: Option<String> = cache.get(key).await.unwrap();
assert_eq!(cached_value, Some("test_value".to_string()));
// dotenv().ok();
// let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
// let cache = RedisCache::new(&redis_url);
//
// let key = &"test_key".to_string();
// let value = "test_value";
//
// // Test setting a value
// cache.set(key, &value, 10).await.unwrap();
//
// // Test getting the value
// let cached_value: Option<String> = cache.get(key).await.unwrap();
// assert_eq!(cached_value, Some("test_value".to_string()));
}