Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/controllers/auth_controller.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::sync::Arc;

#[allow(unused_imports)]
use crate::models::{
auth_request::AuthRequestDto, error_response::ErrorResponse, token_model::TokenResponseDto,
};
Expand Down
5 changes: 3 additions & 2 deletions src/controllers/base_controller.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use warp::reply::with_status;

use crate::models::messageModel::{CreateMessageModelDto, MessageResponseDto};
use crate::models::message_model::{CreateMessageModelDto, MessageResponseDto};
use crate::services::base_service::BaseService;
use std::sync::Arc;
use crate::models::error_response::ErrorResponse;
#[allow(unused_imports)]
use crate::models::error_response::ErrorResponse;

#[utoipa::path(
get,
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use warp::{Filter, Rejection};

use crate::config::Config;
use crate::errors::ApiError;
use crate::repositories::base_Repository::InMemoryBaseRepository;
use crate::repositories::base_repository::InMemoryBaseRepository;
use crate::repositories::credentials_repository::InMemoryCredentialRepository;
use crate::repositories::token_repository::InMemoryTokenRepository;
use crate::router::Router;
use crate::services::auth_service::{AuthService, AuthServiceImpl};
use crate::services::base_service::{BaseService, BaseServiceImpl};
use crate::services::base_service::BaseServiceImpl;

pub fn routes(
config: Arc<Config>,
Expand Down
1 change: 1 addition & 0 deletions src/controllers/protected_controller.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use warp::{http::StatusCode, reply::with_status};

#[allow(unused_imports)]
use crate::models::error_response::ErrorResponse;

#[utoipa::path(
Expand Down
2 changes: 1 addition & 1 deletion src/errors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use crate::errors::error_codes::ErrorCodes;
use crate::errors::error_codes::ERROR_CODES;
use crate::models::error_response::ErrorResponse;
use crate::models::error_response::ValidationProblem;
use serde::Serialize;
use std::convert::Infallible;
use thiserror::Error;
use warp::{http::StatusCode, reject::Reject, Rejection, Reply};

#[derive(Error, Debug)]
#[allow(dead_code)]
pub enum ApiError {
#[error("Message not found")]
NotFound,
Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

use std::sync::Arc;
use crate::server::run_server;
use crate::server::run_server;

mod config;
mod swagger;
Expand Down
8 changes: 5 additions & 3 deletions src/middleware/validator.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use crate::errors::ApiError;
use crate::errors::error_codes::ErrorCodes;
use warp::Rejection;
#![allow(dead_code, unused_variables)]

use crate::errors::ApiError;
use crate::errors::error_codes::ErrorCodes;
use warp::Rejection;

enum ValidationRule<T> {
NotNull,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/models/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub mod error_response;
pub mod messageModel;
pub mod message_model;
pub mod token_model;
pub mod auth_request;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use async_trait::async_trait;
use crate::models::messageModel::MessageModel;
use crate::models::message_model::MessageModel;
use std::sync::{Arc, Mutex};

#[async_trait]
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pub mod base_Repository;
pub mod base_repository;
pub mod token_repository;
pub mod credentials_repository;
13 changes: 2 additions & 11 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,9 @@ use dotenv::dotenv;
use std::sync::Arc;
use tokio::sync::oneshot;

use utoipa::{
openapi::security::{ApiKey, ApiKeyValue, SecurityScheme},
openapi::Server,
Modify, OpenApi,
};
use utoipa::OpenApi;
use utoipa_swagger_ui::Config;
use warp::{
http::Uri,
hyper::{Response, StatusCode},
path::{FullPath, Tail},
Filter, Rejection, Reply,
};
use warp::{Filter, Rejection};

pub async fn run_server() -> (oneshot::Sender<()>, String) {
dotenv().ok();
Expand Down
4 changes: 2 additions & 2 deletions src/services/base_service.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use async_trait::async_trait;
use crate::models::messageModel::{MessageModel, CreateMessageModelDto};
use crate::repositories::base_Repository::BaseRepository;
use crate::models::message_model::{MessageModel, CreateMessageModelDto};
use crate::repositories::base_repository::BaseRepository;

#[async_trait]
pub trait BaseService: Send + Sync {
Expand Down
2 changes: 1 addition & 1 deletion src/swagger.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::models::error_response::{ErrorResponse, ValidationProblem};
use crate::models::messageModel::{CreateMessageModelDto, MessageResponseDto};
use crate::models::message_model::{CreateMessageModelDto, MessageResponseDto};
use crate::models::{auth_request::AuthRequestDto, token_model::TokenResponseDto};
use utoipa::{
openapi::{
Expand Down
1 change: 1 addition & 0 deletions src/test/auth_controller_test.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(dead_code, unused_imports, unused_variables)]
use std::sync::Arc;
use warp::Reply;

Expand Down
2 changes: 2 additions & 0 deletions src/test/auth_repository_tests.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(dead_code, unused_imports, unused_variables)]

use crate::repositories::credentials_repository::{
CredentialRepository, InMemoryCredentialRepository,
};
Expand Down
2 changes: 2 additions & 0 deletions src/test/auth_service_test.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(dead_code, unused_imports, unused_variables)]

use crate::models::auth_request::AuthRequestDto;
use crate::repositories::credentials_repository::InMemoryCredentialRepository;
use crate::repositories::token_repository::InMemoryTokenRepository;
Expand Down
6 changes: 4 additions & 2 deletions src/test/base_controller_test.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use mockall::automock;
use crate::models::messageModel::{CreateMessageModelDto, MessageModel, MessageResponseDto};
#![allow(dead_code, unused_imports, unused_variables)]
use mockall::automock;

use crate::models::message_model::{CreateMessageModelDto, MessageModel, MessageResponseDto};

#[automock]
pub trait BaseService: Send + Sync {
Expand Down
9 changes: 5 additions & 4 deletions src/test/base_repository_tests.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#[cfg(test)]
mod tests {
use crate::repositories::base_Repository::InMemoryBaseRepository;
use crate::repositories::base_Repository::BaseRepository;
#![allow(dead_code, unused_imports, unused_variables)]
#[cfg(test)]
mod tests {
use crate::repositories::base_repository::InMemoryBaseRepository;
use crate::repositories::base_repository::BaseRepository;

#[tokio::test]
async fn test_add_message() {
Expand Down
5 changes: 3 additions & 2 deletions src/test/base_service_test.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use mockall::automock;
use crate::models::messageModel::MessageModel;
#![allow(dead_code, unused_imports, unused_variables)]
use mockall::automock;
use crate::models::message_model::MessageModel;



Expand Down
2 changes: 2 additions & 0 deletions src/test/integration_test.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(dead_code, unused_imports, unused_variables)]
use crate::config;

use crate::errors::error_codes::ErrorCodes;
use crate::server::run_server;
use dotenv::dotenv;
Expand Down
1 change: 1 addition & 0 deletions src/test/protected_controller_test.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(dead_code, unused_imports, unused_variables)]
use warp::Reply;

use crate::controllers::protected_controller::protected_endpoint;
Expand Down
1 change: 1 addition & 0 deletions src/test/static_files_test.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(dead_code, unused_imports, unused_variables)]
use std::sync::Arc;
use crate::config;

Expand Down
2 changes: 1 addition & 1 deletion src/validators/base_validator.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use warp::{Filter, Rejection};
use crate::models::messageModel::CreateMessageModelDto;
use crate::models::message_model::CreateMessageModelDto;
use crate::errors::error_codes::ErrorCodes;
use crate::middleware::validator::Rule;

Expand Down