From b9b211723ec36e8917abc2db403d0c7850374c5c Mon Sep 17 00:00:00 2001 From: Joshua Coles Date: Sat, 2 Mar 2024 09:22:47 +0000 Subject: [PATCH] Fix a bunch of warnings --- src/db.rs | 2 +- src/entity/prelude.rs | 1 + src/main.rs | 18 +----------------- src/poll.rs | 2 +- src/routes.rs | 8 ++++---- src/toggl_api/api_client.rs | 1 - src/toggl_api/types.rs | 15 ++++++++------- 7 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/db.rs b/src/db.rs index 733e803..d8ab685 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,5 +1,5 @@ use crate::entity::{client, project, time_entry}; -use crate::toggl_api::types::{Project, ProjectClient, ReportEntry, TimeEntry}; +use crate::toggl_api::types::{Project, ProjectClient, ReportEntry}; use sea_orm::sea_query::OnConflict; use sea_orm::{NotSet, Set}; diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs index 1f3b7ee..b083a04 100644 --- a/src/entity/prelude.rs +++ b/src/entity/prelude.rs @@ -1,4 +1,5 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2 +#![allow(unused_imports)] pub use super::client::Entity as Client; pub use super::project::Entity as Project; diff --git a/src/main.rs b/src/main.rs index d919d11..ad229eb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,27 +1,11 @@ use crate::toggl_api::TogglApiClient; -use crate::entity::prelude::TimeEntry; -use crate::entity::time_entry; -use crate::entity::time_entry::ActiveModel; -use crate::toggl_api::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery}; -use anyhow::anyhow; -use axum::extract::multipart::Field; -use axum::extract::{Multipart, Query}; -use axum::http::StatusCode; -use axum::response::IntoResponse; use axum::routing::{get, post}; -use axum::{Extension, Json, Router}; +use axum::{Extension, Router}; use utils::{Result, shutdown_signal}; -use chrono::{NaiveDate, NaiveTime}; use clap::Parser; use migration::{Migrator, MigratorTrait}; -use sea_orm::sea_query::IntoCondition; -use sea_orm::{ColumnTrait, Condition, DatabaseConnection, EntityTrait, QueryFilter}; -use serde::Deserialize; -use serde_json::Value; -use std::collections::HashMap; use std::net::SocketAddr; use tower_http::trace::TraceLayer; -use tracing::{debug, instrument}; mod db; mod entity; diff --git a/src/poll.rs b/src/poll.rs index 8e778ae..ecdd430 100644 --- a/src/poll.rs +++ b/src/poll.rs @@ -1,5 +1,5 @@ use crate::toggl_api::TogglApiClient; -use crate::entity::{client, project, time_entry}; +use crate::entity::{client, project}; use crate::toggl_api::types::{Project, ProjectClient, TogglQuery}; use sea_orm::{DatabaseConnection, EntityTrait, QuerySelect}; use tracing::instrument; diff --git a/src/routes.rs b/src/routes.rs index 30988c1..821a8d2 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -7,10 +7,10 @@ use axum::http::StatusCode; use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter}; use anyhow::anyhow; use axum::extract::{Multipart, Query}; -use migration::{Condition, IntoCondition}; -use chrono::{NaiveDate, NaiveTime}; +use migration::{Condition}; +use chrono::{NaiveDate}; use serde::Deserialize; -use crate::entity::time_entry::{ActiveModel, Entity as TimeEntry}; +use crate::entity::time_entry::{Entity as TimeEntry}; use crate::toggl_api::TogglApiClient; use crate::toggl_api::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery}; use crate::{entity, utils}; @@ -146,7 +146,7 @@ pub async fn import_csv( } #[derive(Debug, Clone, Deserialize)] -struct RefreshQuery { +pub struct RefreshQuery { start_date: Option, } diff --git a/src/toggl_api/api_client.rs b/src/toggl_api/api_client.rs index 309557f..649dafe 100644 --- a/src/toggl_api/api_client.rs +++ b/src/toggl_api/api_client.rs @@ -5,7 +5,6 @@ use std::time::Duration; use base64::Engine; use base64::engine::general_purpose::STANDARD; use hyper::HeaderMap; -use migration::cli::Cli; use tracing::instrument; use tracing::log::debug; use crate::toggl_api::types::{Current, Project, ProjectClient, ReportEntry, TogglQuery}; diff --git a/src/toggl_api/types.rs b/src/toggl_api/types.rs index 5418a20..6b8898d 100644 --- a/src/toggl_api/types.rs +++ b/src/toggl_api/types.rs @@ -79,7 +79,6 @@ pub struct ProjectClient { pub wid: i32, } -#[allow(non_snake_case)] #[skip_serializing_none] #[derive(Serialize, Deserialize, Clone, Default)] pub struct TogglQuery { @@ -97,11 +96,13 @@ pub struct TogglQuery { pub min_duration_seconds: Option, pub order_by: Option, pub order_dir: Option, - pub postedFields: Option>, + #[serde(rename = "postedFields")] + pub posted_fields: Option>, pub project_ids: Option>, pub rounding: Option, pub rounding_minutes: Option, - pub startTime: Option, + #[serde(rename = "startTime")] + pub start_time: Option, pub start_date: Option, pub tag_ids: Option>, pub task_ids: Option>, @@ -160,8 +161,8 @@ impl fmt::Debug for TogglQuery { if let Some(order_dir) = &self.order_dir { ds.field("order_dir", order_dir); } - if let Some(postedFields) = &self.postedFields { - ds.field("postedFields", postedFields); + if let Some(posted_fields) = &self.posted_fields { + ds.field("postedFields", posted_fields); } if let Some(project_ids) = &self.project_ids { ds.field("project_ids", project_ids); @@ -172,8 +173,8 @@ impl fmt::Debug for TogglQuery { if let Some(rounding_minutes) = &self.rounding_minutes { ds.field("rounding_minutes", rounding_minutes); } - if let Some(startTime) = &self.startTime { - ds.field("startTime", startTime); + if let Some(start_time) = &self.start_time { + ds.field("startTime", start_time); } if let Some(start_date) = &self.start_date { ds.field("start_date", start_date);