Shifty/shifty-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cargo clippy and cargo fmt

Browse source
This commit is contained in:
Simon Goller 2024-05-09 15:00:50 +02:00
parent b0000c0117
commit ed609cf06c
22 changed files with 286 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dao_impl/src/booking.rs
View file

@ -81,7 +81,13 @@ impl BookingDao for BookingDaoImpl {
.transpose()?)
}
async fn find_by_booking_data(&self, sales_person_id: Uuid, slot_id: Uuid, calendar_week: i32, year: u32) -> Result<Option<BookingEntity>, DaoError> {
async fn find_by_booking_data(
&self,
sales_person_id: Uuid,
slot_id: Uuid,
calendar_week: i32,
year: u32,
) -> Result<Option<BookingEntity>, DaoError> {
let sales_person_id_vec = sales_person_id.as_bytes().to_vec();
let slot_id_vec = slot_id.as_bytes().to_vec();
Ok(query_as!(
@ -100,13 +106,17 @@ impl BookingDao for BookingDaoImpl {
.transpose()?)
}
async fn create(&self, entity: &BookingEntity, process: &str) -> Result<(), DaoError> {
let id_vec = entity.id.as_bytes().to_vec();
let sales_person_id_vec = entity.sales_person_id.as_bytes().to_vec();
let slot_id_vec = entity.slot_id.as_bytes().to_vec();
let created = entity.created.format(&Iso8601::DATE_TIME).map_db_error()?;
let deleted = entity.deleted.as_ref().map(|deleted| deleted.format(&Iso8601::DATE_TIME)).transpose().map_db_error()?;
let deleted = entity
.deleted
.as_ref()
.map(|deleted| deleted.format(&Iso8601::DATE_TIME))
.transpose()
.map_db_error()?;
let version_vec = entity.version.as_bytes().to_vec();
query!("INSERT INTO booking (id, sales_person_id, slot_id, calendar_week, year, created, deleted, update_version, update_process) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
id_vec, sales_person_id_vec, slot_id_vec, entity.calendar_week, entity.year, created, deleted, version_vec, process
@ -116,7 +126,12 @@ impl BookingDao for BookingDaoImpl {
async fn update(&self, entity: &BookingEntity, process: &str) -> Result<(), DaoError> {
let id_vec = entity.id.as_bytes().to_vec();
let version_vec = entity.version.as_bytes().to_vec();
let deleted = entity.deleted.as_ref().map(|deleted| deleted.format(&Iso8601::DATE_TIME)).transpose().map_db_error()?;
let deleted = entity
.deleted
.as_ref()
.map(|deleted| deleted.format(&Iso8601::DATE_TIME))
.transpose()
.map_db_error()?;
query!(
"UPDATE booking SET deleted = ?, update_version = ?, update_process = ? WHERE id = ?",
deleted,

11
dao_impl/src/lib.rs
View file

@ -92,13 +92,10 @@ impl dao::PermissionDao for PermissionDaoImpl {
Ok(())
}
async fn find_user(&self, username: &str) -> Result<Option<dao::UserEntity>, DaoError> {
let result = query!(
r"SELECT name FROM user WHERE name = ?",
username
)
.fetch_optional(self.pool.as_ref())
.await
.map_db_error()?;
let result = query!(r"SELECT name FROM user WHERE name = ?", username)
.fetch_optional(self.pool.as_ref())
.await
.map_db_error()?;
Ok(result.map(|row| dao::UserEntity {
name: row.name.clone().into(),
}))

18
dao_impl/src/sales_person.rs
View file

@ -112,7 +112,12 @@ impl SalesPersonDao for SalesPersonDaoImpl {
Ok(())
}
async fn assign_to_user(&self, sales_person_id: Uuid, user_id: &str, process: &str) -> Result<(), DaoError> {
async fn assign_to_user(
&self,
sales_person_id: Uuid,
user_id: &str,
process: &str,
) -> Result<(), DaoError> {
let sales_person_id = sales_person_id.as_bytes().to_vec();
query!("INSERT INTO sales_person_user (user_id, sales_person_id, update_process) VALUES (?, ?, ?)", user_id, sales_person_id, process)
.execute(self.pool.as_ref())
@ -123,10 +128,13 @@ impl SalesPersonDao for SalesPersonDaoImpl {
async fn discard_assigned_user(&self, sales_person_id: Uuid) -> Result<(), DaoError> {
let sales_person_id = sales_person_id.as_bytes().to_vec();
query!("DELETE FROM sales_person_user WHERE sales_person_id = ?", sales_person_id)
.execute(self.pool.as_ref())
.await
.map_db_error()?;
query!(
"DELETE FROM sales_person_user WHERE sales_person_id = ?",
sales_person_id
)
.execute(self.pool.as_ref())
.await
.map_db_error()?;
Ok(())
}