twiq: Remove EventStream::generate

bouzuya · Nov 10, 2022 · 8321144 · 8321144
1 parent 33bab6c
commit 8321144
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/twiq/crates/domain/src/aggregate/user.rs b/twiq/crates/domain/src/aggregate/user.rs
@@ -34,7 +34,7 @@ impl User {
         let user_created = UserCreated::new(At::now(), twitter_user_id.clone(), UserId::generate());
         let user_id = user_created.user_id();
         let event_stream =
-            EventStream::generate2(UserCreated::r#type(), EventPayload::from(user_created));
+            EventStream::generate(UserCreated::r#type(), EventPayload::from(user_created));
         Ok(Self {
             event_stream,
             fetch_requested_at: None,
@@ -158,7 +158,7 @@ mod tests {
     fn event_stream_conversion_test() -> anyhow::Result<()> {
         let twitter_user_id = TwitterUserId::from_str("123")?;
         let user_id = UserId::generate();
-        let mut event_stream = EventStream::generate2(
+        let mut event_stream = EventStream::generate(
             UserCreated::r#type(),
             UserCreated::new(At::now(), twitter_user_id.clone(), user_id),
         );

diff --git a/twiq/crates/domain/src/aggregate/user_request.rs b/twiq/crates/domain/src/aggregate/user_request.rs
@@ -34,7 +34,7 @@ impl UserRequest {
     ) -> Result<Self> {
         let user_request_created = UserRequestCreated::new(At::now(), twitter_user_id, user_id, id);
         let event_stream =
-            EventStream::generate2(UserRequestCreated::r#type(), user_request_created);
+            EventStream::generate(UserRequestCreated::r#type(), user_request_created);
         Ok(Self {
             event_stream,
             id,

diff --git a/twiq/crates/event_store_core/src/event_stream.rs b/twiq/crates/event_store_core/src/event_stream.rs
@@ -22,7 +22,7 @@ pub struct EventStream {
 }
 
 impl EventStream {
-    pub fn generate2<T, U>(event_type: T, event_payload: U) -> Self
+    pub fn generate<T, U>(event_type: T, event_payload: U) -> Self
     where
         T: Into<EventType>,
         U: Into<EventPayload>,
@@ -39,23 +39,6 @@ impl EventStream {
         }
     }
 
-    pub fn generate<T, U>(event_type: T, event_payload: U) -> Self
-    where
-        T: Into<EventType>,
-        U: serde::Serialize,
-    {
-        Self {
-            events: vec![Event::new(
-                EventId::generate(),
-                event_type.into(),
-                EventStreamId::generate(),
-                EventStreamSeq::from(1_u32),
-                EventAt::now(),
-                EventPayload::from_structured(&event_payload).expect("FIXME"),
-            )],
-        }
-    }
-
     pub fn new(events: Vec<Event>) -> Result<Self> {
         if events.is_empty() {
             return Err(Error::Empty);
@@ -147,7 +130,10 @@ mod tests {
 
     #[test]
     fn generate_test() -> anyhow::Result<()> {
-        let stream = EventStream::generate(EventType::from_str("created")?, "{}");
+        let stream = EventStream::generate(
+            EventType::from_str("created")?,
+            EventPayload::from_str("{}")?,
+        );
         assert_eq!(stream.seq(), EventStreamSeq::from(1_u32));
         Ok(())
     }
@@ -248,7 +234,10 @@ mod tests {
 
     #[test]
     fn push_test() -> anyhow::Result<()> {
-        let mut stream = EventStream::generate(EventType::from_str("created")?, "{}");
+        let mut stream = EventStream::generate(
+            EventType::from_str("created")?,
+            EventPayload::from_str("{}")?,
+        );
         stream.push(
             EventType::from_str("updated")?,
             EventPayload::from_str(r#"{"key":123}"#)?,
@@ -259,7 +248,10 @@ mod tests {
 
     #[test]
     fn push_event_test() -> anyhow::Result<()> {
-        let mut stream = EventStream::generate(EventType::from_str("created")?, "{}");
+        let mut stream = EventStream::generate(
+            EventType::from_str("created")?,
+            EventPayload::from_str("{}")?,
+        );
         stream.push_event(Event::new(
             EventId::generate(),
             EventType::from_str("updated")?,
@@ -274,7 +266,10 @@ mod tests {
 
     #[test]
     fn push_event_test_invalid_event_stream_id() -> anyhow::Result<()> {
-        let mut stream = EventStream::generate(EventType::from_str("created")?, "{}");
+        let mut stream = EventStream::generate(
+            EventType::from_str("created")?,
+            EventPayload::from_str("{}")?,
+        );
         assert!(stream
             .push_event(Event::new(
                 EventId::generate(),
@@ -290,7 +285,10 @@ mod tests {
 
     #[test]
     fn push_event_test_invalid_event_stream_seq() -> anyhow::Result<()> {
-        let mut stream = EventStream::generate(EventType::from_str("created")?, "{}");
+        let mut stream = EventStream::generate(
+            EventType::from_str("created")?,
+            EventPayload::from_str("{}")?,
+        );
         assert!(stream
             .push_event(Event::new(
                 EventId::generate(),