From 493adbb9a6ec6cc970785846794680c379812246 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Wed, 26 Apr 2023 22:16:18 +0200
Subject: [PATCH] dev: fix clippy warnings for: src/tracker.rs

---
 src/app.rs    | 5 ++---
 src/common.rs | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 3bc00b58..2322d139 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -12,9 +12,8 @@ use crate::cache::image::manager::ImageCacheService;
 use crate::common::AppData;
 use crate::config::Configuration;
 use crate::databases::database;
-use crate::tracker::service::Service;
 use crate::tracker::statistics_importer::StatisticsImporter;
-use crate::{mailer, routes};
+use crate::{mailer, routes, tracker};
 
 pub struct Running {
     pub api_server: Server,
@@ -44,7 +43,7 @@ pub async fn run(configuration: Configuration) -> Running {
 
     let database = Arc::new(database::connect(&database_connect_url).await.expect("Database error."));
     let auth = Arc::new(AuthorizationService::new(cfg.clone(), database.clone()));
-    let tracker_service = Arc::new(Service::new(cfg.clone(), database.clone()).await);
+    let tracker_service = Arc::new(tracker::service::Service::new(cfg.clone(), database.clone()).await);
     let tracker_statistics_importer =
         Arc::new(StatisticsImporter::new(cfg.clone(), tracker_service.clone(), database.clone()).await);
     let mailer_service = Arc::new(mailer::Service::new(cfg.clone()).await);
diff --git a/src/common.rs b/src/common.rs
index 0cbb011b..51861fae 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -4,10 +4,8 @@ use crate::auth::AuthorizationService;
 use crate::cache::image::manager::ImageCacheService;
 use crate::config::Configuration;
 use crate::databases::database::Database;
-use crate::mailer;
-use crate::tracker::service::Service;
 use crate::tracker::statistics_importer::StatisticsImporter;
-
+use crate::{mailer, tracker};
 pub type Username = String;
 
 pub type WebAppData = actix_web::web::Data<Arc<AppData>>;
@@ -16,7 +14,7 @@ pub struct AppData {
     pub cfg: Arc<Configuration>,
     pub database: Arc<Box<dyn Database>>,
     pub auth: Arc<AuthorizationService>,
-    pub tracker_service: Arc<Service>,
+    pub tracker_service: Arc<tracker::service::Service>,
     pub tracker_statistics_importer: Arc<StatisticsImporter>,
     pub mailer: Arc<mailer::Service>,
     pub image_cache_manager: Arc<ImageCacheService>,
@@ -27,7 +25,7 @@ impl AppData {
         cfg: Arc<Configuration>,
         database: Arc<Box<dyn Database>>,
         auth: Arc<AuthorizationService>,
-        tracker_service: Arc<Service>,
+        tracker_service: Arc<tracker::service::Service>,
         tracker_statistics_importer: Arc<StatisticsImporter>,
         mailer: Arc<mailer::Service>,
         image_cache_manager: Arc<ImageCacheService>,