From db2b69fe538812c1f25b25df762a4e9dde115fb0 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sat, 10 Jul 2021 01:37:38 -0400
Subject: [PATCH] fixup jobs from refactor

---
 src/tts_download_job.rs  | 7 +++----
 src/tts_inference_job.rs | 5 ++---
 src/w2l_download_job.rs  | 7 +++----
 src/w2l_inference_job.rs | 5 ++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/tts_download_job.rs b/src/tts_download_job.rs
index e5bdf69be3..b3194aac7f 100644
--- a/src/tts_download_job.rs
+++ b/src/tts_download_job.rs
@@ -11,8 +11,7 @@
 #[macro_use] extern crate serde_derive;
 
 pub mod common_env;
-pub mod common_queries;
-pub mod database_helpers;
+pub mod database;
 pub mod job_queries;
 pub mod script_execution;
 pub mod shared_constants;
@@ -21,8 +20,8 @@ pub mod util;
 use anyhow::anyhow;
 use chrono::Utc;
 use crate::common_env::CommonEnv;
-use crate::common_queries::badge_granter::BadgeGranter;
-use crate::common_queries::firehose_publisher::FirehosePublisher;
+use crate::database::mediators::badge_granter::BadgeGranter;
+use crate::database::mediators::firehose_publisher::FirehosePublisher;
 use crate::job_queries::tts_download_job_queries::TtsUploadJobRecord;
 use crate::job_queries::tts_download_job_queries::grab_job_lock_and_mark_pending;
 use crate::job_queries::tts_download_job_queries::insert_tts_model;
diff --git a/src/tts_inference_job.rs b/src/tts_inference_job.rs
index a1f330fa50..6bcfd18f4d 100644
--- a/src/tts_inference_job.rs
+++ b/src/tts_inference_job.rs
@@ -12,8 +12,7 @@
 
 pub mod clients;
 pub mod common_env;
-pub mod common_queries;
-pub mod database_helpers;
+pub mod database;
 pub mod job_queries;
 pub mod script_execution;
 pub mod shared_constants;
@@ -23,7 +22,7 @@ use anyhow::{anyhow, Error};
 use chrono::{Utc, DateTime, TimeZone};
 use crate::clients::tts_inference_sidecar_client::TtsInferenceSidecarClient;
 use crate::common_env::CommonEnv;
-use crate::common_queries::firehose_publisher::FirehosePublisher;
+use crate::database::mediators::firehose_publisher::FirehosePublisher;
 use crate::job_queries::tts_inference_job_queries::get_tts_model_by_token;
 use crate::job_queries::tts_inference_job_queries::grab_job_lock_and_mark_pending;
 use crate::job_queries::tts_inference_job_queries::insert_tts_result;
diff --git a/src/w2l_download_job.rs b/src/w2l_download_job.rs
index e18dda4e37..bcc2028fb8 100644
--- a/src/w2l_download_job.rs
+++ b/src/w2l_download_job.rs
@@ -11,8 +11,7 @@
 #[macro_use] extern crate serde_derive;
 
 pub mod common_env;
-pub mod common_queries;
-pub mod database_helpers;
+pub mod database;
 pub mod job_queries;
 pub mod script_execution;
 pub mod shared_constants;
@@ -21,8 +20,8 @@ pub mod util;
 use anyhow::anyhow;
 use chrono::Utc;
 use crate::common_env::CommonEnv;
-use crate::common_queries::badge_granter::BadgeGranter;
-use crate::common_queries::firehose_publisher::FirehosePublisher;
+use crate::database::mediators::badge_granter::BadgeGranter;
+use crate::database::mediators::firehose_publisher::FirehosePublisher;
 use crate::job_queries::w2l_download_job_queries::W2lTemplateUploadJobRecord;
 use crate::job_queries::w2l_download_job_queries::grab_job_lock_and_mark_pending;
 use crate::job_queries::w2l_download_job_queries::insert_w2l_template;
diff --git a/src/w2l_inference_job.rs b/src/w2l_inference_job.rs
index c67e250471..55ed7d4a70 100644
--- a/src/w2l_inference_job.rs
+++ b/src/w2l_inference_job.rs
@@ -11,8 +11,7 @@
 #[macro_use] extern crate serde_derive;
 
 pub mod common_env;
-pub mod common_queries;
-pub mod database_helpers;
+pub mod database;
 pub mod job_queries;
 pub mod script_execution;
 pub mod shared_constants;
@@ -21,7 +20,7 @@ pub mod util;
 use anyhow::anyhow;
 use chrono::Utc;
 use crate::common_env::CommonEnv;
-use crate::common_queries::firehose_publisher::FirehosePublisher;
+use crate::database::mediators::firehose_publisher::FirehosePublisher;
 use crate::job_queries::w2l_inference_job_queries::W2lInferenceJobRecord;
 use crate::job_queries::w2l_inference_job_queries::get_w2l_template_by_token;
 use crate::job_queries::w2l_inference_job_queries::grab_job_lock_and_mark_pending;