Skip to content
This repository was archived by the owner on Sep 8, 2019. It is now read-only.

Commit 0f73389

Browse files
kluzynickkluzynick
authored andcommitted
Cleaned csv_import and renamed it.
Changed to csv_user_import.rsx
1 parent e036a94 commit 0f73389

File tree

2 files changed

+17
-113
lines changed

2 files changed

+17
-113
lines changed

backend/src/bin/csv_import.rs

Lines changed: 0 additions & 104 deletions
This file was deleted.

backend/src/bin/csv_user_import.rs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use serde::Deserialize;
1313
use serde::Serialize;
1414

1515
#[derive(Serialize, Deserialize, Debug)]
16+
//Struct to take the data from the csv
1617
struct Csv_User {
1718
#[serde(rename = "Banner ID")]
1819
banner_id: i32,
@@ -27,8 +28,8 @@ struct Csv_User {
2728
#[serde(rename = "Department")]
2829
department: String,
2930
}
30-
3131
fn main(){
32+
//Diesel things
3233
dotenv().ok();
3334

3435
simplelog::TermLogger::init(simplelog::LevelFilter::Trace, simplelog::Config::default())
@@ -55,42 +56,49 @@ fn main(){
5556
};
5657

5758
debug!("Connected to database");
58-
59+
//Get file name and path from args
5960
use std::env;
6061
let arg = env::args().nth(1);
6162
let filename = match arg {
6263
Some(name) => name,
6364
None => {
64-
println!("Needs a filename");
65+
error!("Needs a filename");
6566
return;
6667
}
6768
};
68-
println!("{}", filename);
69-
69+
debug!("{}", filename);
70+
//Import the csv into an iterator
71+
let mut user_count = 0;
7072
let all_users_result = csv::Reader::from_path(filename);
7173
let mut all_users = match all_users_result{
7274
Ok(data) => data,
7375
Err(e) => {
74-
println!("Bad file. Error {}",e);
76+
error!("Bad file. Error {}",e);
7577
return;
7678
}
7779
};
80+
//Go through each item in the iterator
7881
for result in all_users.deserialize(){
82+
//Check to see if it's valid
7983
let csv_user: Csv_User = match result{
8084
Ok(data) => data,
8185
Err(e) => {
82-
println!("Bad data, {:?}", e);
86+
error!("Bad data, {:?}", e);
8387
return;
8488
}
8589
};
90+
//Convert the user data from the csv and create a New User from it
8691
let new_user:NewUser = NewUser{
8792
first_name: csv_user.first_name,
8893
last_name: csv_user.last_name,
8994
email: Some(csv_user.email),
9095
banner_id: csv_user.banner_id as u32,
9196
};
92-
93-
requests::create_user(new_user, &connection);
97+
//Import new user into database
98+
let import_user = UserRequest::CreateUser(new_user);
99+
requests::handle_user(import_user, &connection);
100+
user_count = user_count+1;
94101
}
102+
info!("Imported {} user(s)",user_count);
95103
}
96104

0 commit comments

Comments
 (0)