refactor: sqlite repositories per aggregate

crates/adapters/sqlite/src/lib.rs

@@ -1,54 +1,23 @@
 use sqlx::SqlitePool;
 
-mod diary;
 mod event_queue;
-mod goals;
-mod image_ref;
-mod import_profile;
-mod import_session;
-mod insights;
 mod migrations;
-mod models;
-mod movie;
-mod movie_dedup;
-mod persons;
-mod profile;
-mod profile_fields;
-mod refresh_sessions;
-mod review;
-mod search;
+mod repositories;
 mod shared;
-mod social;
-mod stats;
-mod user_settings;
-mod users;
-mod watch_event;
-mod watchlist;
-mod wrapup;
 
-pub use diary::SqliteDiaryRepository;
 pub use event_queue::{DbEventQueueConfig, SqliteEventQueue};
-pub use image_ref::{SqliteImageRefAdapter, create_image_ref};
-pub use import_profile::SqliteImportProfileRepository;
-pub use import_session::SqliteImportSessionRepository;
-pub use insights::SqliteInsightsQuery;
-pub use movie::SqliteMovieRepository;
-pub use movie_dedup::SqliteMovieDeduplicator;
-pub use persons::{SqlitePersonAdapter, create_person_adapter};
-pub use profile::SqliteMovieProfileRepository;
-pub use profile_fields::SqliteProfileFieldsRepository;
-pub use refresh_sessions::SqliteRefreshSessionAdapter;
-pub use review::SqliteReviewRepository;
-pub use search::create_search_adapter;
-pub use social::{
-    SqliteApContentQuery, SqliteRemoteGoalRepository, SqliteSocialRepository,
-    create_federated_profile_query,
+pub use repositories::{
+    SqliteApContentQuery, SqliteDiaryRepository, SqliteImageRefAdapter,
+    SqliteImportProfileRepository, SqliteImportSessionRepository, SqliteInsightsQuery,
+    SqliteMovieDeduplicator, SqliteMovieProfileRepository, SqliteMovieRepository,
+    SqlitePersonAdapter, SqliteProfileFieldsRepository, SqliteRefreshSessionAdapter,
+    SqliteRemoteGoalRepository, SqliteReviewRepository, SqliteSocialRepository,
+    SqliteStatsRepository, SqliteUserRepository, SqliteWatchEventRepository,
+    SqliteWatchlistRepository, SqliteWebhookTokenRepository, SqliteWrapUpRepository,
+    SqliteWrapUpStatsQuery, create_federated_profile_query, create_image_ref,
+    create_person_adapter, create_search_adapter,
 };
-pub use stats::SqliteStatsRepository;
-pub use users::SqliteUserRepository;
-pub use watch_event::{SqliteWatchEventRepository, SqliteWebhookTokenRepository};
-pub use watchlist::SqliteWatchlistRepository;
-pub use wrapup::{SqliteWrapUpRepository, SqliteWrapUpStatsQuery};
+use repositories::{SqliteGoalRepository, SqliteUserSettingsRepository};
 
 /// Row helpers shared with the `sqlite-federation` crate (which cannot live
 /// here because it depends on `activitypub`/`k-ap`).
@@ -111,9 +80,7 @@ pub async fn wire(database_url: &str) -> anyhow::Result<SqliteWireOutput> {
         .map_err(|e| anyhow::anyhow!("{e}"))
         .context("Database migration failed")?;
 
-    let user_settings_repo = std::sync::Arc::new(user_settings::SqliteUserSettingsRepository::new(
-        pool.clone(),
-    ));
+    let user_settings_repo = std::sync::Arc::new(SqliteUserSettingsRepository::new(pool.clone()));
 
     let movie_repo = std::sync::Arc::new(SqliteMovieRepository::new(pool.clone()));
 
@@ -133,8 +100,8 @@ pub async fn wire(database_url: &str) -> anyhow::Result<SqliteWireOutput> {
         wrapup_repo: std::sync::Arc::new(SqliteWrapUpRepository::new(pool.clone())) as _,
         wrapup_stats: std::sync::Arc::new(SqliteWrapUpStatsQuery::new(pool.clone())) as _,
         insights: std::sync::Arc::new(SqliteInsightsQuery::new(pool.clone())) as _,
-        goal_command: std::sync::Arc::new(goals::SqliteGoalRepository::new(pool.clone())) as _,
-        goal_query: std::sync::Arc::new(goals::SqliteGoalRepository::new(pool.clone())) as _,
+        goal_command: std::sync::Arc::new(SqliteGoalRepository::new(pool.clone())) as _,
+        goal_query: std::sync::Arc::new(SqliteGoalRepository::new(pool.clone())) as _,
         user_settings: std::sync::Arc::clone(&user_settings_repo) as _,
         federation_settings: user_settings_repo as _,
         remote_goal: std::sync::Arc::new(SqliteRemoteGoalRepository::new(pool.clone())) as _,