This repository has been archived by the owner on Aug 16, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate missing from closed room erros (#166)
- Loading branch information
1 parent
0c6946e
commit cb6c9ae
Showing
15 changed files
with
311 additions
and
364 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| use std::ops::Bound; | ||
|
|
||
| use anyhow::anyhow; | ||
| use chrono::{DateTime, Duration, Utc}; | ||
| use serde::Serialize; | ||
| use svc_agent::mqtt::{ | ||
| IncomingRequestProperties, IntoPublishableMessage, OutgoingEvent, OutgoingEventProperties, | ||
| OutgoingResponse, ResponseStatus, ShortTermTimingProperties, | ||
| }; | ||
| use uuid::Uuid; | ||
|
|
||
| use crate::app::context::Context; | ||
| use crate::app::error::{Error as AppError, ErrorExt, ErrorKind as AppErrorKind}; | ||
| use crate::app::API_VERSION; | ||
| use crate::db; | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| pub(crate) fn build_response( | ||
| status: ResponseStatus, | ||
| payload: impl Serialize + Send + 'static, | ||
| reqp: &IncomingRequestProperties, | ||
| start_timestamp: DateTime<Utc>, | ||
| maybe_authz_time: Option<Duration>, | ||
| ) -> Box<dyn IntoPublishableMessage + Send> { | ||
| let mut timing = ShortTermTimingProperties::until_now(start_timestamp); | ||
|
|
||
| if let Some(authz_time) = maybe_authz_time { | ||
| timing.set_authorization_time(authz_time); | ||
| } | ||
|
|
||
| let props = reqp.to_response(status, timing); | ||
| Box::new(OutgoingResponse::unicast(payload, props, reqp, API_VERSION)) | ||
| } | ||
|
|
||
| pub(crate) fn build_notification( | ||
| label: &'static str, | ||
| path: &str, | ||
| payload: impl Serialize + Send + 'static, | ||
| reqp: &IncomingRequestProperties, | ||
| start_timestamp: DateTime<Utc>, | ||
| ) -> Box<dyn IntoPublishableMessage + Send> { | ||
| let timing = ShortTermTimingProperties::until_now(start_timestamp); | ||
| let mut props = OutgoingEventProperties::new(label, timing); | ||
| props.set_tracking(reqp.tracking().to_owned()); | ||
| Box::new(OutgoingEvent::broadcast(payload, props, path)) | ||
| } | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| pub(crate) enum RoomTimeRequirement { | ||
| Any, | ||
| NotClosed, | ||
| Open, | ||
| } | ||
|
|
||
| pub(crate) fn find_room_by_id<C: Context>( | ||
| context: &mut C, | ||
| id: Uuid, | ||
| opening_requirement: RoomTimeRequirement, | ||
| ) -> Result<db::room::Object, AppError> { | ||
| context.add_logger_tags(o!("room_id" => id.to_string())); | ||
| let query = db::room::FindQuery::new(id); | ||
| find_room(context, query, opening_requirement) | ||
| } | ||
|
|
||
| pub(crate) fn find_room_by_rtc_id<C: Context>( | ||
| context: &mut C, | ||
| rtc_id: Uuid, | ||
| opening_requirement: RoomTimeRequirement, | ||
| ) -> Result<db::room::Object, AppError> { | ||
| context.add_logger_tags(o!("rtc_id" => rtc_id.to_string())); | ||
| let query = db::room::FindByRtcIdQuery::new(rtc_id); | ||
| find_room(context, query, opening_requirement) | ||
| } | ||
|
|
||
| fn find_room<C, Q>( | ||
| context: &mut C, | ||
| query: Q, | ||
| opening_requirement: RoomTimeRequirement, | ||
| ) -> Result<db::room::Object, AppError> | ||
| where | ||
| C: Context, | ||
| Q: db::room::FindQueryable, | ||
| { | ||
| let conn = context.get_conn()?; | ||
|
|
||
| let room = query | ||
| .execute(&conn)? | ||
| .ok_or_else(|| anyhow!("Room not found")) | ||
| .error(AppErrorKind::RoomNotFound)?; | ||
|
|
||
| add_room_logger_tags(context, &room); | ||
|
|
||
| match opening_requirement { | ||
| // Room time doesn't matter. | ||
| RoomTimeRequirement::Any => Ok(room), | ||
| // Current time must be before room closing, including not yet opened rooms. | ||
| RoomTimeRequirement::NotClosed => { | ||
| let now = Utc::now(); | ||
| let (_opened_at, closed_at) = room.time(); | ||
|
|
||
| match closed_at { | ||
| Bound::Included(dt) | Bound::Excluded(dt) if *dt < now => { | ||
| Err(anyhow!("Room closed")).error(AppErrorKind::RoomClosed) | ||
| } | ||
| _ => Ok(room), | ||
| } | ||
| } | ||
| // Current time must be exactly in the room's time range. | ||
| RoomTimeRequirement::Open => { | ||
| let now = Utc::now(); | ||
| let (opened_at, closed_at) = room.time(); | ||
|
|
||
| match opened_at { | ||
| Bound::Included(dt) | Bound::Excluded(dt) if *dt >= now => { | ||
| Err(anyhow!("Room not opened")).error(AppErrorKind::RoomClosed) | ||
| } | ||
| _ => Ok(()), | ||
| }?; | ||
|
|
||
| match closed_at { | ||
| Bound::Included(dt) | Bound::Excluded(dt) if *dt < now => { | ||
| Err(anyhow!("Room closed")).error(AppErrorKind::RoomClosed) | ||
| } | ||
| _ => Ok(()), | ||
| }?; | ||
|
|
||
| Ok(room) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn add_room_logger_tags<C: Context>(context: &mut C, room: &db::room::Object) { | ||
| context.add_logger_tags(o!("room_id" => room.id().to_string())); | ||
|
|
||
| if let Some(scope) = room.tags().get("scope") { | ||
| context.add_logger_tags(o!("scope" => scope.to_string())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.