fix: refactor states, entities and dtos to be submodules of models

src/controllers/mod.rs

@@ -1,6 +1,6 @@
 use utoipa_axum::router::OpenApiRouter;
 
-use crate::states::AppState;
+use crate::models::states::AppState;
 
 mod v1;
 

src/controllers/v1/keyframes/mod.rs

@@ -6,8 +6,9 @@ use axum::{
 use utoipa_axum::{router::OpenApiRouter, routes};
 
 use crate::{
-    docs::OPENAPI_TAG, dtos::keyframes::KeyframeDto, services::keyframes::KeyframeService,
-    states::AppState,
+    docs::OPENAPI_TAG,
+    models::{dtos::keyframes::KeyframeDto, states::AppState},
+    services::keyframes::KeyframeService,
 };
 
 pub fn router() -> OpenApiRouter<AppState> {

src/controllers/v1/mod.rs

@@ -1,6 +1,6 @@
 use utoipa_axum::router::OpenApiRouter;
 
-use crate::states::AppState;
+use crate::models::states::AppState;
 
 mod keyframes;
 mod videos;

src/controllers/v1/videos/mod.rs

@@ -6,7 +6,9 @@ use axum::{
 use utoipa_axum::{router::OpenApiRouter, routes};
 
 use crate::{
-    docs::OPENAPI_TAG, dtos::videos::VideoDto, services::videos::VideoService, states::AppState,
+    docs::OPENAPI_TAG,
+    models::{dtos::videos::VideoDto, states::AppState},
+    services::videos::VideoService,
 };
 
 pub fn router() -> OpenApiRouter<AppState> {

src/dtos/keyframes/mod.rs

@@ -1,32 +0,0 @@
-use crate::entities::{keyframes::KeyframeEntity, videos::VideoEntity};
-
-#[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
-pub struct KeyframeDto {
-    id: i64,
-    path: String,
-    timestamp: f64,
-}
-
-impl From<(KeyframeEntity, VideoEntity)> for KeyframeDto {
-    fn from((keyframe, video): (KeyframeEntity, VideoEntity)) -> Self {
-        let id = keyframe.id();
-        let timestamp = keyframe.video_related_frame_timestamp();
-        let path = format!(
-            "/static/keyframes/L{}_V{:0>3}/{:0>3}.jpg",
-            video.l(),
-            video.v(),
-            keyframe.video_related_frame_id()
-        );
-        Self {
-            id,
-            path,
-            timestamp,
-        }
-    }
-}
-
-impl From<(VideoEntity, KeyframeEntity)> for KeyframeDto {
-    fn from((video, keyframe): (VideoEntity, KeyframeEntity)) -> Self {
-        Self::from((keyframe, video))
-    }
-}

src/dtos/mod.rs

@@ -1,2 +0,0 @@
-pub mod keyframes;
-pub mod videos;

src/dtos/videos/mod.rs

@@ -1,17 +0,0 @@
-use crate::entities::videos::VideoEntity;
-
-#[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
-pub struct VideoDto {
-    id: i64,
-    path: String,
-}
-
-impl From<VideoEntity> for VideoDto {
-    fn from(value: VideoEntity) -> Self {
-        let path = format!("/static/videos/L{}_V{:0>3}.mp4", value.l(), value.v());
-        Self {
-            id: value.id(),
-            path,
-        }
-    }
-}

src/entities/keyframes/mod.rs

@@ -1,22 +0,0 @@
-#[derive(Debug, Clone, diesel::Queryable, diesel::Selectable)]
-#[diesel(table_name = crate::schema::keyframes)]
-#[diesel(check_for_backend(diesel::pg::Pg))]
-pub struct KeyframeEntity {
-    id: i64,
-    video_related_frame_id: i16,
-    video_related_frame_timestamp: f64,
-}
-
-impl KeyframeEntity {
-    pub fn id(&self) -> i64 {
-        self.id
-    }
-
-    pub fn video_related_frame_id(&self) -> i16 {
-        self.video_related_frame_id
-    }
-
-    pub fn video_related_frame_timestamp(&self) -> f64 {
-        self.video_related_frame_timestamp
-    }
-}

src/entities/mod.rs

@@ -1,2 +0,0 @@
-pub mod keyframes;
-pub mod videos;

src/entities/videos/mod.rs

@@ -1,22 +0,0 @@
-#[derive(Debug, Clone, diesel::Queryable, diesel::Selectable)]
-#[diesel(table_name = crate::schema::videos)]
-#[diesel(check_for_backend(diesel::pg::Pg))]
-pub struct VideoEntity {
-    id: i64,
-    l: i16,
-    v: i16,
-}
-
-impl VideoEntity {
-    pub fn id(&self) -> i64 {
-        self.id
-    }
-
-    pub fn l(&self) -> i16 {
-        self.l
-    }
-
-    pub fn v(&self) -> i16 {
-        self.v
-    }
-}

src/main.rs

@@ -8,16 +8,14 @@ use utoipa::OpenApi;
 use utoipa_axum::router::OpenApiRouter;
 use utoipa_swagger_ui::SwaggerUi;
 
-use crate::{docs::ApiDoc, states::AppState};
+use crate::{docs::ApiDoc, models::states::AppState};
 
 mod controllers;
 mod docs;
-mod dtos;
-mod entities;
+mod models;
 mod repositories;
 mod schema;
 mod services;
-mod states;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {

src/repositories/keyframes/mod.rs

@@ -2,7 +2,7 @@ use deadpool_diesel::postgres::Pool;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper};
 
 use crate::{
-    entities::{keyframes::KeyframeEntity, videos::VideoEntity},
+    models::entities::{keyframes::KeyframeEntity, videos::VideoEntity},
     services::keyframes::KeyframeService,
 };
 

src/repositories/videos/mod.rs

@@ -1,7 +1,7 @@
 use deadpool_diesel::postgres::Pool;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper};
 
-use crate::{entities::videos::VideoEntity, services::videos::VideoService};
+use crate::{models::entities::videos::VideoEntity, services::videos::VideoService};
 
 #[derive(Clone)]
 pub struct VideoRepository<'a> {

src/schema.rs

@@ -19,7 +19,4 @@ diesel::table! {
 
 diesel::joinable!(keyframes -> videos (video_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    keyframes,
-    videos,
-);
+diesel::allow_tables_to_appear_in_same_query!(keyframes, videos,);

src/services/keyframes/mod.rs

@@ -1,7 +1,8 @@
 use deadpool_diesel::postgres::Pool;
 
 use crate::{
-    dtos::keyframes::KeyframeDto, repositories::keyframes::KeyframeRepository, states::AppState,
+    models::{dtos::keyframes::KeyframeDto, states::AppState},
+    repositories::keyframes::KeyframeRepository,
 };
 
 #[derive(Clone, Copy)]

src/services/mod.rs

@@ -1,2 +1,2 @@
 pub mod keyframes;
-pub mod videos;
+pub mod videos;

src/services/videos/mod.rs

@@ -1,6 +1,9 @@
 use deadpool_diesel::postgres::Pool;
 
-use crate::{dtos::videos::VideoDto, repositories::videos::VideoRepository, states::AppState};
+use crate::{
+    models::{dtos::videos::VideoDto, states::AppState},
+    repositories::videos::VideoRepository,
+};
 
 #[derive(Clone, Copy)]
 pub struct VideoService<'a> {

src/states/mod.rs

@@ -1,48 +0,0 @@
-use std::sync::Arc;
-
-use deadpool_diesel::{
-    Runtime,
-    postgres::{Manager, Pool},
-};
-use qdrant_client::Qdrant;
-
-#[derive(Clone)]
-pub struct AppState {
-    diesel_pool: Pool,
-    qdrant_client: Arc<Qdrant>,
-}
-
-impl AppState {
-    pub fn new() -> anyhow::Result<Self> {
-        Ok(Self {
-            diesel_pool: Self::diesel_pool_helper()?,
-            qdrant_client: Self::qdrant_client_helper()?,
-        })
-    }
-
-    fn diesel_pool_helper() -> anyhow::Result<Pool> {
-        Pool::builder(Manager::new(
-            std::env::var("DATABASE_URL")?,
-            Runtime::Tokio1,
-        ))
-        .build()
-        .map_err(Into::into)
-    }
-
-    fn qdrant_client_helper() -> anyhow::Result<Arc<Qdrant>> {
-        Qdrant::from_url(&std::env::var("QDRANT_URL")?)
-            .build()
-            .map(Arc::new)
-            .map_err(Into::into)
-    }
-}
-
-impl AppState {
-    pub fn pool(&self) -> &Pool {
-        &self.diesel_pool
-    }
-
-    pub fn qdrant_client(&self) -> &Qdrant {
-        &self.qdrant_client
-    }
-}