Add an accommodations reservations module (#188)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Add a new module to enable accommodations reservation  Reviewed-on: #188
This commit is contained in:
103
geneit_backend/src/services/accommodations_list_service.rs
Normal file
103
geneit_backend/src/services/accommodations_list_service.rs
Normal file
@ -0,0 +1,103 @@
|
||||
use crate::connections::db_connection;
|
||||
use crate::models::{Accommodation, AccommodationID, FamilyID, NewAccommodation};
|
||||
use crate::schema::accommodations_list;
|
||||
use crate::utils::time_utils::time;
|
||||
use diesel::prelude::*;
|
||||
|
||||
/// Create a new accommodation
|
||||
pub async fn create(family_id: FamilyID) -> anyhow::Result<Accommodation> {
|
||||
db_connection::execute(|conn| {
|
||||
let res: Accommodation = diesel::insert_into(accommodations_list::table)
|
||||
.values(&NewAccommodation {
|
||||
family_id: family_id.0,
|
||||
name: "".to_string(),
|
||||
time_create: time() as i64,
|
||||
time_update: time() as i64,
|
||||
})
|
||||
.get_result(conn)?;
|
||||
|
||||
Ok(res)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get the information of an accommodation
|
||||
pub async fn get_by_id(id: AccommodationID) -> anyhow::Result<Accommodation> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_list::table
|
||||
.filter(accommodations_list::dsl::id.eq(id.0))
|
||||
.first(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get all the accommodations of a family
|
||||
pub async fn get_all_of_family(id: FamilyID) -> anyhow::Result<Vec<Accommodation>> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_list::table
|
||||
.filter(accommodations_list::dsl::family_id.eq(id.0))
|
||||
.get_results(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Check whether accommodation with a given id exists or not
|
||||
pub async fn exists(
|
||||
family_id: FamilyID,
|
||||
accommodation_id: AccommodationID,
|
||||
) -> anyhow::Result<bool> {
|
||||
db_connection::execute(|conn| {
|
||||
let count: i64 = accommodations_list::table
|
||||
.filter(
|
||||
accommodations_list::id
|
||||
.eq(accommodation_id.0)
|
||||
.and(accommodations_list::family_id.eq(family_id.0)),
|
||||
)
|
||||
.count()
|
||||
.get_result(conn)?;
|
||||
|
||||
Ok(count != 0)
|
||||
})
|
||||
}
|
||||
|
||||
/// Update the information of an accommodation
|
||||
pub async fn update(accommodation: &mut Accommodation) -> anyhow::Result<()> {
|
||||
accommodation.time_update = time() as i64;
|
||||
|
||||
db_connection::execute(|conn| {
|
||||
diesel::update(
|
||||
accommodations_list::dsl::accommodations_list
|
||||
.filter(accommodations_list::dsl::id.eq(accommodation.id().0)),
|
||||
)
|
||||
.set((
|
||||
accommodations_list::dsl::time_update.eq(accommodation.time_update),
|
||||
accommodations_list::dsl::name.eq(accommodation.name.to_string()),
|
||||
accommodations_list::dsl::need_validation.eq(accommodation.need_validation),
|
||||
accommodations_list::dsl::description.eq(accommodation.description.clone()),
|
||||
accommodations_list::dsl::color.eq(accommodation.color.clone()),
|
||||
accommodations_list::dsl::open_to_reservations.eq(accommodation.open_to_reservations),
|
||||
))
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Delete an accommodation
|
||||
pub async fn delete(accommodation: &mut Accommodation) -> anyhow::Result<()> {
|
||||
// Remove the accommodation
|
||||
db_connection::execute(|conn| {
|
||||
diesel::delete(
|
||||
accommodations_list::dsl::accommodations_list
|
||||
.filter(accommodations_list::dsl::id.eq(accommodation.id().0)),
|
||||
)
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Delete all the accommodations of a family
|
||||
pub async fn delete_all_family(family_id: FamilyID) -> anyhow::Result<()> {
|
||||
for mut m in get_all_of_family(family_id).await? {
|
||||
delete(&mut m).await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
use crate::connections::db_connection;
|
||||
use crate::constants;
|
||||
use crate::models::{
|
||||
AccommodationID, AccommodationReservationCalendar, AccommodationReservationCalendarID,
|
||||
FamilyID, NewAccommodationReservationCalendar, UserID,
|
||||
};
|
||||
use crate::schema::accommodations_reservations_cals_urls;
|
||||
use crate::utils::string_utils::rand_str;
|
||||
use crate::utils::time_utils::time;
|
||||
use diesel::prelude::*;
|
||||
|
||||
/// Create a new reservation calendar entry
|
||||
pub async fn create(
|
||||
user_id: UserID,
|
||||
family_id: FamilyID,
|
||||
accommodation_id: Option<AccommodationID>,
|
||||
name: &str,
|
||||
) -> anyhow::Result<AccommodationReservationCalendar> {
|
||||
db_connection::execute(|conn| {
|
||||
let res: AccommodationReservationCalendar =
|
||||
diesel::insert_into(accommodations_reservations_cals_urls::table)
|
||||
.values(&NewAccommodationReservationCalendar {
|
||||
family_id: family_id.0,
|
||||
accommodation_id: accommodation_id.map(|i| i.0),
|
||||
user_id: user_id.0,
|
||||
name: name.to_string(),
|
||||
token: rand_str(constants::ACCOMMODATIONS_RESERVATIONS_CALENDARS_TOKENS_LEN),
|
||||
time_create: time() as i64,
|
||||
time_used: time() as i64,
|
||||
})
|
||||
.get_result(conn)?;
|
||||
|
||||
Ok(res)
|
||||
})
|
||||
}
|
||||
|
||||
/// Update the information of a reservations calendar
|
||||
pub async fn update(cal: &AccommodationReservationCalendar) -> anyhow::Result<()> {
|
||||
db_connection::execute(|conn| {
|
||||
diesel::update(
|
||||
accommodations_reservations_cals_urls::dsl::accommodations_reservations_cals_urls
|
||||
.filter(accommodations_reservations_cals_urls::dsl::id.eq(cal.id().0)),
|
||||
)
|
||||
.set((accommodations_reservations_cals_urls::dsl::time_used.eq(cal.time_used),))
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Get all the calendars of a user
|
||||
pub async fn get_all_of_user(
|
||||
user: UserID,
|
||||
family: FamilyID,
|
||||
) -> anyhow::Result<Vec<AccommodationReservationCalendar>> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations_cals_urls::table
|
||||
.filter(
|
||||
accommodations_reservations_cals_urls::dsl::family_id
|
||||
.eq(family.0)
|
||||
.and(accommodations_reservations_cals_urls::dsl::user_id.eq(user.0)),
|
||||
)
|
||||
.get_results(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get a single calendar by its id
|
||||
pub async fn get_by_id(
|
||||
id: AccommodationReservationCalendarID,
|
||||
) -> anyhow::Result<AccommodationReservationCalendar> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations_cals_urls::table
|
||||
.filter(accommodations_reservations_cals_urls::dsl::id.eq(id.0))
|
||||
.get_result(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get a single calendar by its token
|
||||
pub async fn get_by_token(token: &str) -> anyhow::Result<AccommodationReservationCalendar> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations_cals_urls::table
|
||||
.filter(accommodations_reservations_cals_urls::dsl::token.eq(token))
|
||||
.get_result(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Delete a calendar
|
||||
pub async fn delete(r: AccommodationReservationCalendar) -> anyhow::Result<()> {
|
||||
db_connection::execute(|conn| {
|
||||
diesel::delete(
|
||||
accommodations_reservations_cals_urls::dsl::accommodations_reservations_cals_urls
|
||||
.filter(accommodations_reservations_cals_urls::dsl::id.eq(r.id().0)),
|
||||
)
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
@ -0,0 +1,101 @@
|
||||
use crate::connections::db_connection;
|
||||
use crate::models::{
|
||||
AccommodationID, AccommodationReservation, AccommodationReservationID, FamilyID,
|
||||
NewAccommodationReservation,
|
||||
};
|
||||
use crate::schema::accommodations_reservations;
|
||||
use crate::utils::time_utils::time;
|
||||
use diesel::prelude::*;
|
||||
|
||||
/// Create a new reservation
|
||||
pub async fn create(new: &NewAccommodationReservation) -> anyhow::Result<AccommodationReservation> {
|
||||
db_connection::execute(|conn| {
|
||||
let res: AccommodationReservation = diesel::insert_into(accommodations_reservations::table)
|
||||
.values(new)
|
||||
.get_result(conn)?;
|
||||
|
||||
Ok(res)
|
||||
})
|
||||
}
|
||||
|
||||
/// Update a reservation
|
||||
pub async fn update(r: &mut AccommodationReservation) -> anyhow::Result<()> {
|
||||
r.time_update = time() as i64;
|
||||
|
||||
db_connection::execute(|conn| {
|
||||
diesel::update(
|
||||
accommodations_reservations::dsl::accommodations_reservations
|
||||
.filter(accommodations_reservations::dsl::id.eq(r.id().0)),
|
||||
)
|
||||
.set((
|
||||
accommodations_reservations::dsl::time_update.eq(r.time_update),
|
||||
accommodations_reservations::dsl::validated.eq(r.validated),
|
||||
accommodations_reservations::dsl::reservation_start.eq(r.reservation_start),
|
||||
accommodations_reservations::dsl::reservation_end.eq(r.reservation_end),
|
||||
))
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Delete a reservation
|
||||
pub async fn delete(r: AccommodationReservation) -> anyhow::Result<()> {
|
||||
// Remove the reservation
|
||||
db_connection::execute(|conn| {
|
||||
diesel::delete(
|
||||
accommodations_reservations::dsl::accommodations_reservations
|
||||
.filter(accommodations_reservations::dsl::id.eq(r.id().0)),
|
||||
)
|
||||
.execute(conn)
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Get all the reservations of an accommodation
|
||||
pub async fn get_all_of_accommodation(
|
||||
id: AccommodationID,
|
||||
) -> anyhow::Result<Vec<AccommodationReservation>> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations::table
|
||||
.filter(accommodations_reservations::dsl::accommodation_id.eq(id.0))
|
||||
.get_results(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get all the reservations of a family
|
||||
pub async fn get_all_of_family(id: FamilyID) -> anyhow::Result<Vec<AccommodationReservation>> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations::table
|
||||
.filter(accommodations_reservations::dsl::family_id.eq(id.0))
|
||||
.get_results(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get a single accommodation reservation by its id
|
||||
pub async fn get_by_id(id: AccommodationReservationID) -> anyhow::Result<AccommodationReservation> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations::table
|
||||
.filter(accommodations_reservations::dsl::id.eq(id.0))
|
||||
.get_result(conn)
|
||||
})
|
||||
}
|
||||
|
||||
/// Get the reservations that are between a given interval of time for a given accommodation
|
||||
pub async fn get_reservations_for_time_interval(
|
||||
id: AccommodationID,
|
||||
start: usize,
|
||||
end: usize,
|
||||
) -> anyhow::Result<Vec<AccommodationReservation>> {
|
||||
db_connection::execute(|conn| {
|
||||
accommodations_reservations::table
|
||||
.filter(
|
||||
accommodations_reservations::dsl::accommodation_id
|
||||
.eq(id.0)
|
||||
.and(accommodations_reservations::dsl::reservation_start.lt((end) as i64))
|
||||
.and(accommodations_reservations::dsl::reservation_end.gt((start) as i64)),
|
||||
)
|
||||
.get_results(conn)
|
||||
})
|
||||
}
|
@ -5,7 +5,9 @@ use crate::models::{
|
||||
Family, FamilyID, FamilyMembership, Membership, NewFamily, NewMembership, UserID,
|
||||
};
|
||||
use crate::schema::{families, memberships};
|
||||
use crate::services::{couples_service, members_service, users_service};
|
||||
use crate::services::{
|
||||
accommodations_list_service, couples_service, members_service, users_service,
|
||||
};
|
||||
use crate::utils::string_utils::rand_str;
|
||||
use crate::utils::time_utils::time;
|
||||
use diesel::prelude::*;
|
||||
@ -127,9 +129,9 @@ pub async fn update_membership(membership: &Membership) -> anyhow::Result<()> {
|
||||
#[derive(serde::Serialize)]
|
||||
pub struct FamilyMember {
|
||||
#[serde(flatten)]
|
||||
membership: Membership,
|
||||
user_name: String,
|
||||
user_mail: String,
|
||||
pub membership: Membership,
|
||||
pub user_name: String,
|
||||
pub user_mail: String,
|
||||
}
|
||||
|
||||
/// Get information about the users of a family
|
||||
@ -175,6 +177,7 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> {
|
||||
families::dsl::name.eq(family.name.clone()),
|
||||
families::dsl::invitation_code.eq(family.invitation_code.clone()),
|
||||
families::dsl::enable_genealogy.eq(family.enable_genealogy),
|
||||
families::dsl::enable_accommodations.eq(family.enable_accommodations),
|
||||
families::dsl::disable_couple_photos.eq(family.disable_couple_photos),
|
||||
))
|
||||
.execute(conn)
|
||||
@ -185,6 +188,9 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> {
|
||||
|
||||
/// Delete a family
|
||||
pub async fn delete_family(family_id: FamilyID) -> anyhow::Result<()> {
|
||||
// Delete all family accommodations
|
||||
accommodations_list_service::delete_all_family(family_id).await?;
|
||||
|
||||
// Delete all family couples
|
||||
couples_service::delete_all_family(family_id).await?;
|
||||
|
||||
|
@ -1,5 +1,8 @@
|
||||
//! # Backend services
|
||||
|
||||
pub mod accommodations_list_service;
|
||||
pub mod accommodations_reservations_calendars_service;
|
||||
pub mod accommodations_reservations_service;
|
||||
pub mod couples_service;
|
||||
pub mod families_service;
|
||||
pub mod login_token_service;
|
||||
|
Reference in New Issue
Block a user