diff options
Diffstat (limited to 'src/channel')
| -rw-r--r-- | src/channel/app.rs | 8 | ||||
| -rw-r--r-- | src/channel/handlers/send/mod.rs | 4 | ||||
| -rw-r--r-- | src/channel/handlers/send/test.rs | 5 | ||||
| -rw-r--r-- | src/channel/history.rs | 9 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/channel/app.rs b/src/channel/app.rs index dc9e584..e3b169c 100644 --- a/src/channel/app.rs +++ b/src/channel/app.rs @@ -48,14 +48,14 @@ impl<'a> Channels<'a> { // This function is careless with respect to time, and gets you the channel as // it exists in the specific moment when you call it. pub async fn get(&self, channel: &Id) -> Result<Channel, Error> { - let not_found = || Error::NotFound(channel.clone()); - let deleted = || Error::Deleted(channel.clone()); + let to_not_found = || Error::NotFound(channel.clone()); + let to_deleted = || Error::Deleted(channel.clone()); let mut tx = self.db.begin().await?; - let channel = tx.channels().by_id(channel).await.not_found(not_found)?; + let channel = tx.channels().by_id(channel).await.not_found(to_not_found)?; tx.commit().await?; - channel.as_snapshot().ok_or_else(deleted) + channel.as_snapshot().ok_or_else(to_deleted) } pub async fn delete(&self, channel: &Id, deleted_at: &DateTime) -> Result<(), DeleteError> { diff --git a/src/channel/handlers/send/mod.rs b/src/channel/handlers/send/mod.rs index aa241e2..bde39e5 100644 --- a/src/channel/handlers/send/mod.rs +++ b/src/channel/handlers/send/mod.rs @@ -54,7 +54,9 @@ impl IntoResponse for Error { fn into_response(self) -> response::Response { let Self(error) = self; match error { - SendError::ChannelNotFound(_) => NotFound(error).into_response(), + SendError::ChannelNotFound(_) | SendError::ChannelDeleted(_) => { + NotFound(error).into_response() + } SendError::Name(_) | SendError::Database(_) => Internal::from(error).into_response(), } } diff --git a/src/channel/handlers/send/test.rs b/src/channel/handlers/send/test.rs index 7204ca4..70d45eb 100644 --- a/src/channel/handlers/send/test.rs +++ b/src/channel/handlers/send/test.rs @@ -108,13 +108,12 @@ async fn deleted_channel() { // Call the endpoint let sent_at = fixtures::now(); - let channel = channel::Id::generate(); let request = super::Request { body: fixtures::message::propose(), }; let super::Error(error) = super::handler( State(app), - Path(channel.clone()), + Path(channel.id.clone()), sent_at, sender, Json(request), @@ -126,6 +125,6 @@ async fn deleted_channel() { assert!(matches!( error, - SendError::ChannelNotFound(error_channel) if channel == error_channel + SendError::ChannelDeleted(error_channel) if channel.id == error_channel )); } diff --git a/src/channel/history.rs b/src/channel/history.rs index 7f18e45..85da5a5 100644 --- a/src/channel/history.rs +++ b/src/channel/history.rs @@ -27,6 +27,15 @@ impl History { self.channel.clone() } + pub fn as_of<S>(&self, sequence: S) -> Option<Channel> + where + S: Into<Sequence>, + { + self.events() + .filter(Sequence::up_to(sequence.into())) + .collect() + } + // Snapshot of this channel as of all events recorded in this history. pub fn as_snapshot(&self) -> Option<Channel> { self.events().collect() |