refactor(indexeddb): add room id to event_cache_store::types::GenericEvent

Signed-off-by: Michael Goldenberg <[email protected]>

Author: mgoldenberg

crates/matrix-sdk-indexeddb/src/event_cache_store/mod.rs

@@ -209,6 +209,7 @@ impl_event_cache_store! {
                             .put_item(
                                 room_id,
                                 &types::Event::InBand(InBandEvent {
+                                    room_id: room_id.to_owned(),
                                     content: item,
                                     position: types::Position {
                                         chunk_identifier,
@@ -229,6 +230,7 @@ impl_event_cache_store! {
                         .put_event(
                             room_id,
                             &types::Event::InBand(InBandEvent {
+                                room_id: room_id.to_owned(),
                                 content: item,
                                 position: at.into(),
                             }),
@@ -526,7 +528,7 @@ impl_event_cache_store! {
             self.transaction(&[keys::EVENTS], IdbTransactionMode::Readwrite)?;
         let event = match transaction.get_event_by_id(room_id, &event_id).await? {
             Some(mut inner) => inner.with_content(event),
-            None => types::Event::OutOfBand(OutOfBandEvent { content: event, position: () }),
+            None => types::Event::OutOfBand(OutOfBandEvent { room_id: room_id.to_owned(), content: event, position: () }),
         };
         transaction.put_event(room_id, &event).await?;
         transaction.commit().await?;

crates/matrix-sdk-indexeddb/src/event_cache_store/types.rs

@@ -71,6 +71,14 @@ impl From<Event> for TimelineEvent {
 }
 
 impl Event {
+    /// The [`RoomId`] of the room in which the underlying event exists.
+    pub fn room_id(&self) -> &RoomId {
+        match self {
+            Event::InBand(e) => &e.room_id,
+            Event::OutOfBand(e) => &e.room_id,
+        }
+    }
+
     /// The [`OwnedEventId`] of the underlying event.
     pub fn event_id(&self) -> Option<OwnedEventId> {
         match self {
@@ -116,6 +124,8 @@ impl Event {
 /// in-band or out-of-band.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct GenericEvent<P> {
+    /// The room in which the event exists.
+    pub room_id: OwnedRoomId,
     /// The full content of the event.
     pub content: TimelineEvent,
     /// The position of the event, if it is in a chunk.