From ee21753411425b78b8a2128cc8d1929b6983c390 Mon Sep 17 00:00:00 2001
From: Joshua Coles <josh@coles.to>
Date: Fri, 1 Mar 2024 21:21:33 +0000
Subject: [PATCH] Centralise files related to talking to the Toggl apis to the
 toggl_api module

---
 src/db.rs                         | 2 +-
 src/main.rs                       | 7 +++----
 src/poll.rs                       | 4 ++--
 src/{ => toggl_api}/api_client.rs | 2 +-
 src/toggl_api/mod.rs              | 4 ++++
 src/{ => toggl_api}/types.rs      | 0
 6 files changed, 11 insertions(+), 8 deletions(-)
 rename src/{ => toggl_api}/api_client.rs (98%)
 create mode 100644 src/toggl_api/mod.rs
 rename src/{ => toggl_api}/types.rs (100%)

diff --git a/src/db.rs b/src/db.rs
index 2e0d396..733e803 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1,5 +1,5 @@
 use crate::entity::{client, project, time_entry};
-use crate::types::{Project, ProjectClient, ReportEntry, TimeEntry};
+use crate::toggl_api::types::{Project, ProjectClient, ReportEntry, TimeEntry};
 use sea_orm::sea_query::OnConflict;
 use sea_orm::{NotSet, Set};
 
diff --git a/src/main.rs b/src/main.rs
index bc0e77c..c468dcd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,8 @@
-use crate::api_client::TogglApiClient;
+use crate::toggl_api::TogglApiClient;
 use crate::entity::prelude::TimeEntry;
 use crate::entity::time_entry;
 use crate::entity::time_entry::ActiveModel;
-use crate::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery};
+use crate::toggl_api::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery};
 use anyhow::anyhow;
 use axum::extract::multipart::Field;
 use axum::extract::{Multipart, Query};
@@ -25,13 +25,12 @@ use std::net::SocketAddr;
 use tower_http::trace::TraceLayer;
 use tracing::{debug, instrument};
 
-mod api_client;
 mod db;
 mod entity;
 mod poll;
-mod types;
 mod utils;
 mod csv_parser;
+mod toggl_api;
 
 #[derive(Debug, Clone, Parser)]
 struct Config {
diff --git a/src/poll.rs b/src/poll.rs
index 22ea65b..1267ab1 100644
--- a/src/poll.rs
+++ b/src/poll.rs
@@ -1,6 +1,6 @@
-use crate::api_client::TogglApiClient;
+use crate::toggl_api::TogglApiClient;
 use crate::entity::{client, project, time_entry};
-use crate::types::{Project, ProjectClient, TogglQuery};
+use crate::toggl_api::types::{Project, ProjectClient, TogglQuery};
 use sea_orm::{DatabaseConnection, EntityTrait, QuerySelect};
 use tracing::instrument;
 use crate::{day_exclusivity_condition, utils};
diff --git a/src/api_client.rs b/src/toggl_api/api_client.rs
similarity index 98%
rename from src/api_client.rs
rename to src/toggl_api/api_client.rs
index 6749517..07b8b75 100644
--- a/src/api_client.rs
+++ b/src/toggl_api/api_client.rs
@@ -5,7 +5,7 @@ use std::time::Duration;
 use hyper::HeaderMap;
 use tracing::instrument;
 use tracing::log::debug;
-use crate::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery};
+use crate::toggl_api::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery};
 
 #[derive(Debug, Clone)]
 pub struct TogglApiClient {
diff --git a/src/toggl_api/mod.rs b/src/toggl_api/mod.rs
new file mode 100644
index 0000000..c35e771
--- /dev/null
+++ b/src/toggl_api/mod.rs
@@ -0,0 +1,4 @@
+pub mod api_client;
+pub mod types;
+
+pub use api_client::TogglApiClient;
diff --git a/src/types.rs b/src/toggl_api/types.rs
similarity index 100%
rename from src/types.rs
rename to src/toggl_api/types.rs