Skip to content

Commit 4cca931

Browse files
jabbate19jabbate19
committed
Clippy
1 parent a788302 commit 4cca931

File tree

8 files changed

+44
-31
lines changed

8 files changed

+44
-31
lines changed

‎src/api/v1/event/car/mod.rs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ async fn create_car(
5959
}));
6060
}
6161

62-
let record = Car::insert_new(event_id, user_id, &car, &mut *tx).await
63-
.unwrap();
62+
let record = Car::insert_new(event_id, user_id, &car, &mut *tx)
63+
.await
64+
.unwrap();
6465

6566
let _ = query!(
6667
r#"
@@ -78,7 +79,7 @@ async fn create_car(
7879
event_id,
7980
car_id: record.id,
8081
old_riders: Vec::new(),
81-
new_riders: car.riders.clone()
82+
new_riders: car.riders.clone(),
8283
}))
8384
.unwrap();
8485
let mut redis = data.redis.lock().unwrap().clone();
@@ -105,7 +106,7 @@ async fn get_car(data: web::Data<AppState>, path: web::Path<(i32, i32)>) -> impl
105106
match result {
106107
Ok(Some(car)) => HttpResponse::Ok().json(car),
107108
Ok(None) => HttpResponse::NotFound().body("Car not found"),
108-
Err(_) => HttpResponse::InternalServerError().body("Failed to get Car")
109+
Err(_) => HttpResponse::InternalServerError().body("Failed to get Car"),
109110
}
110111
}
111112

@@ -149,7 +150,12 @@ async fn update_car(
149150
let (event_id, car_id) = path.into_inner();
150151
let user_id = session.get::<UserInfo>("userinfo").unwrap().unwrap().id;
151152
let mut tx = data.db.begin().await.unwrap();
152-
let other_cars = Car::select_all(event_id, &mut *tx).await.unwrap().into_iter().filter(|car| car.id != car_id).collect();
153+
let other_cars = Car::select_all(event_id, &mut *tx)
154+
.await
155+
.unwrap()
156+
.into_iter()
157+
.filter(|car| car.id != car_id)
158+
.collect();
153159
if let Err(errs) = car.validate(&user_id, other_cars) {
154160
tx.rollback().await.unwrap();
155161
return HttpResponse::BadRequest().json(json!({
@@ -200,7 +206,7 @@ async fn update_car(
200206
event_id,
201207
car_id,
202208
old_riders: current_riders,
203-
new_riders: car.riders.clone()
209+
new_riders: car.riders.clone(),
204210
}))
205211
.unwrap();
206212
let mut redis = data.redis.lock().unwrap().clone();
@@ -236,7 +242,7 @@ async fn delete_car(
236242
Err(err) => {
237243
error!("{}", err);
238244
HttpResponse::InternalServerError().body("Failed to delete car")
239-
},
245+
}
240246
}
241247
}
242248

‎src/api/v1/event/car/rider/mod.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use log::error;
1212
use redis_work_queue::{Item, WorkQueue};
1313
use serde_json::json;
1414
use sqlx::query;
15-
use utoipa::openapi::security::Http;
1615
use utoipa::OpenApi;
1716

1817
#[derive(OpenApi)]
@@ -42,14 +41,14 @@ async fn create_rider(
4241
if car.max_capacity <= car.riders.unwrap().len() as i32 {
4342
return HttpResponse::BadRequest().json(json!({
4443
"error": "Car is full."
45-
}))
44+
}));
4645
}
47-
},
46+
}
4847
Ok(None) => {
4948
return HttpResponse::BadRequest().json(json!({
5049
"error": "Car does not exist."
5150
}))
52-
},
51+
}
5352
Err(err) => {
5453
error!("{}", err);
5554
return HttpResponse::InternalServerError().body("Unable to Join Car");
@@ -157,7 +156,7 @@ async fn delete_rider(
157156
Err(err) => {
158157
error!("{}", err);
159158
HttpResponse::InternalServerError().body("Failed to delete rider")
160-
},
159+
}
161160
}
162161
}
163162

‎src/api/v1/event/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ async fn create_event(
6767
Err(err) => {
6868
error!("{}", err);
6969
HttpResponse::InternalServerError().body("Failed to create event")
70-
},
70+
}
7171
}
7272
}
7373

@@ -151,7 +151,7 @@ async fn update_event(
151151
Err(err) => {
152152
error!("{}", err);
153153
HttpResponse::InternalServerError().body("Failed to update event")
154-
},
154+
}
155155
}
156156
}
157157

@@ -181,7 +181,7 @@ async fn delete_event(
181181
Err(err) => {
182182
error!("{}", err);
183183
HttpResponse::InternalServerError().body("Failed to delete event")
184-
},
184+
}
185185
}
186186
}
187187

‎src/db/car.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl CarData {
4444
.map(|user| user.id)
4545
.collect();
4646
for rider in self.riders.iter() {
47-
if other_car_members.contains(&rider) {
47+
if other_car_members.contains(rider) {
4848
errs.push(format!(
4949
"{} is already in another car or is a driver.",
5050
rider

‎src/db/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pub mod event;
21
pub mod car;
2+
pub mod event;

‎src/main.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ enum Commands {
2626

2727
#[tokio::main]
2828
async fn main() -> std::io::Result<()> {
29+
env_logger::init();
30+
dotenv::dotenv().ok();
31+
2932
let cli = Cli::parse();
3033

3134
match &cli.command {

‎src/server.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ use anyhow::anyhow;
66
use base64::prelude::*;
77
use include_dir::{include_dir, Dir};
88
use log::info;
9-
use oauth2::basic::BasicClient;
10-
use redis::aio::MultiplexedConnection;
119
use redis_work_queue::KeyPrefix;
12-
use sqlx::{postgres::PgPoolOptions, PgPool};
10+
use sqlx::postgres::PgPoolOptions;
1311
use std::env;
1412
use std::sync::{Arc, Mutex};
1513

@@ -43,9 +41,6 @@ async fn serve_index() -> impl Responder {
4341
}
4442

4543
pub async fn main() -> std::io::Result<()> {
46-
env_logger::init();
47-
dotenv::dotenv().ok();
48-
4944
let host = env::var("HOST").unwrap_or("127.0.0.1".to_string());
5045
let host_inner = host.clone();
5146
let port: i32 = match &env::var("PORT").map(|port| port.parse()) {

‎src/worker.rs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ use std::{
33
env,
44
};
55

6-
use redis::{aio::MultiplexedConnection, AsyncCommands, RedisResult};
6+
use log::error;
7+
use redis::{aio::MultiplexedConnection, RedisResult};
78
use redis_work_queue::{Item, KeyPrefix, WorkQueue};
89
use sqlx::{postgres::PgPoolOptions, query, query_as, Pool, Postgres};
910
use std::time::Duration;
@@ -110,7 +111,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
110111
}
111112
pings
112113
.send_join(
113-
&driver.email.trim_end_matches("@csh.rit.edu"),
114+
driver.email.trim_end_matches("@csh.rit.edu"),
114115
&rider.name,
115116
&event_name,
116117
)
@@ -124,7 +125,7 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
124125
}
125126
pings
126127
.send_leave(
127-
&driver.email.trim_end_matches("@csh.rit.edu"),
128+
driver.email.trim_end_matches("@csh.rit.edu"),
128129
&rider.name,
129130
&event_name,
130131
)
@@ -152,11 +153,15 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
152153
}
153154
pings
154155
.send_remove(
155-
&user.email.trim_end_matches("@csh.rit.edu"),
156+
user.email.trim_end_matches("@csh.rit.edu"),
156157
&driver.name,
157158
&event_name,
158159
)
159-
.await;
160+
.await
161+
.map_err(|err| RedisError {
162+
msg: format!("Failed to send message: {}", err),
163+
should_retry: true,
164+
})?;
160165
}
161166
for added in new_set.difference(&old_set) {
162167
let user = user_map.get(added).unwrap();
@@ -165,11 +170,15 @@ async fn work(job: &Item, db_pool: &Pool<Postgres>, pings: &PingClient) -> Resul
165170
}
166171
pings
167172
.send_add(
168-
&user.email.trim_end_matches("@csh.rit.edu"),
173+
user.email.trim_end_matches("@csh.rit.edu"),
169174
&driver.name,
170175
&event_name,
171176
)
172-
.await;
177+
.await
178+
.map_err(|err| RedisError {
179+
msg: format!("Failed to send message: {}", err),
180+
should_retry: true,
181+
})?;
173182
}
174183
}
175184
}
@@ -195,10 +204,11 @@ pub async fn work_loop(
195204
}
196205
// Drop a job that should be retried - it will be returned to the work queue after
197206
// the (5 second) lease expires.
198-
Err(err) if err.should_retry => (),
207+
Err(err) if err.should_retry => error!("{}", err.msg),
199208
// Errors that shouldn't cause a retry should mark the job as complete so it isn't
200209
// tried again.
201210
Err(err) => {
211+
error!("{}", err.msg);
202212
work_queue.complete(&mut db, &job).await?;
203213
}
204214
}

0 commit comments

Comments
 (0)