Merge branch 'wip/retain-deleted'

5 files changed, 41 insertions, 19 deletions

diff --git a/src/test/fixtures/channel.rs b/src/test/fixtures/channel.rs
index b678717..a1dda61 100644
--- a/src/test/fixtures/channel.rs
+++ b/src/test/fixtures/channel.rs
@@ -1,10 +1,17 @@
+use std::future;
+
 use faker_rand::{
     en_us::{addresses::CityName, names::FullName},
     faker_impl_from_templates,
 };
 use rand;
 
-use crate::{app::App, channel::Channel, clock::RequestedAt};
+use crate::{
+    app::App,
+    channel::{self, Channel},
+    clock::RequestedAt,
+    event::Event,
+};
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Channel {
     let name = propose();
@@ -22,3 +29,17 @@ struct Name(String);
 faker_impl_from_templates! {
     Name; "{} {}", CityName, FullName;
 }
+
+pub fn events(event: Event) -> future::Ready<Option<channel::Event>> {
+    future::ready(match event {
+        Event::Channel(channel) => Some(channel),
+        _ => None,
+    })
+}
+
+pub fn created(event: channel::Event) -> future::Ready<Option<channel::event::Created>> {
+    future::ready(match event {
+        channel::Event::Created(event) => Some(event),
+        channel::Event::Deleted(_) => None,
+    })
+}
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index 7fe2bf3..fa4fbc0 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -1,11 +1,8 @@
-use crate::{
-    event::Event,
-    message::{Event::Sent, Message},
-};
+use crate::message::{Event, Message};
 
 pub fn message_sent(event: &Event, message: &Message) -> bool {
     matches!(
         &event,
-        Event::Message(Sent(event)) if message == &event.into()
+        Event::Sent(event) if message == &event.into()
     )
 }
diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
deleted file mode 100644
index 84d27b0..0000000
--- a/src/test/fixtures/filter.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use futures::future;
-
-use crate::{channel::Event::Created, event::Event, message::Event::Sent};
-
-pub fn messages() -> impl FnMut(&Event) -> future::Ready<bool> {
-    |event| future::ready(matches!(event, Event::Message(Sent(_))))
-}
-
-pub fn created() -> impl FnMut(&Event) -> future::Ready<bool> {
-    |event| future::ready(matches!(event, Event::Channel(Created(_))))
-}
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index 381b10b..eb00e7c 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -1,6 +1,15 @@
+use std::future;
+
 use faker_rand::lorem::Paragraphs;
 
-use crate::{app::App, channel::Channel, clock::RequestedAt, login::Login, message::Message};
+use crate::{
+    app::App,
+    channel::Channel,
+    clock::RequestedAt,
+    event::Event,
+    login::Login,
+    message::{self, Message},
+};
 
 pub async fn send(app: &App, channel: &Channel, login: &Login, sent_at: &RequestedAt) -> Message {
     let body = propose();
@@ -14,3 +23,10 @@ pub async fn send(app: &App, channel: &Channel, login: &Login, sent_at: &Request
 pub fn propose() -> String {
     rand::random::<Paragraphs>().to_string()
 }
+
+pub fn events(event: Event) -> future::Ready<Option<message::Event>> {
+    future::ready(match event {
+        Event::Message(event) => Some(event),
+        _ => None,
+    })
+}
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index 41f7e13..9658831 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -4,7 +4,6 @@ use crate::{app::App, clock::RequestedAt, db};
 
 pub mod channel;
 pub mod event;
-pub mod filter;
 pub mod future;
 pub mod identity;
 pub mod login;