First pass on reorganizing the backend.

This is primarily renames and repackagings.

5 files changed, 21 insertions, 12 deletions

diff --git a/src/channel/app.rs b/src/channel/app.rs
index d89e733..1422651 100644
--- a/src/channel/app.rs
+++ b/src/channel/app.rs
@@ -2,12 +2,11 @@ use chrono::TimeDelta;
 use sqlx::sqlite::SqlitePool;
 
 use crate::{
+    channel::Channel,
     clock::DateTime,
-    events::{broadcaster::Broadcaster, types::ChannelEvent},
-    repo::{
-        channel::{Channel, Provider as _},
-        sequence::{Provider as _, Sequence},
-    },
+    event::Sequence,
+    event::{broadcaster::Broadcaster, types::ChannelEvent},
+    repo::{channel::Provider as _, sequence::Provider as _},
 };
 
 pub struct Channels<'a> {
diff --git a/src/channel/mod.rs b/src/channel/mod.rs
index 3115e98..02d0ed4 100644
--- a/src/channel/mod.rs
+++ b/src/channel/mod.rs
@@ -1,7 +1,17 @@
+use crate::{clock::DateTime, event::Sequence};
+
 pub mod app;
 mod id;
 mod routes;
 
-pub use self::routes::router;
+pub use self::{id::Id, routes::router};
 
-pub use self::id::Id;
+#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
+pub struct Channel {
+    pub id: Id,
+    pub name: String,
+    #[serde(skip)]
+    pub created_at: DateTime,
+    #[serde(skip)]
+    pub created_sequence: Sequence,
+}
diff --git a/src/channel/routes.rs b/src/channel/routes.rs
index 72d6195..5d8b61e 100644
--- a/src/channel/routes.rs
+++ b/src/channel/routes.rs
@@ -10,11 +10,11 @@ use axum_extra::extract::Query;
 use super::app;
 use crate::{
     app::App,
-    channel,
+    channel::{self, Channel},
     clock::RequestedAt,
     error::Internal,
-    events::app::EventsError,
-    repo::{channel::Channel, login::Login, sequence::Sequence},
+    event::{app::EventsError, Sequence},
+    login::Login,
 };
 
 #[cfg(test)]
diff --git a/src/channel/routes/test/on_create.rs b/src/channel/routes/test/on_create.rs
index 72980ac..9988932 100644
--- a/src/channel/routes/test/on_create.rs
+++ b/src/channel/routes/test/on_create.rs
@@ -3,7 +3,7 @@ use futures::stream::StreamExt as _;
 
 use crate::{
     channel::{app, routes},
-    events::types,
+    event::types,
     test::fixtures::{self, future::Immediately as _},
 };
 
diff --git a/src/channel/routes/test/on_send.rs b/src/channel/routes/test/on_send.rs
index 987784d..6f844cd 100644
--- a/src/channel/routes/test/on_send.rs
+++ b/src/channel/routes/test/on_send.rs
@@ -4,7 +4,7 @@ use futures::stream::StreamExt;
 use crate::{
     channel,
     channel::routes,
-    events::{app, types},
+    event::{app, types},
     test::fixtures::{self, future::Immediately as _},
 };