From 6366fb3c96e4ed281e233279c85bbfd90ab3ecbc Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 4 Sep 2024 23:38:21 -0400 Subject: Support joining channels. --- src/channel/repo.rs | 28 +++++++++++++++++++++++++++- src/channel/routes.rs | 18 ++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) (limited to 'src/channel') diff --git a/src/channel/repo.rs b/src/channel/repo.rs index bb39d6e..a255305 100644 --- a/src/channel/repo.rs +++ b/src/channel/repo.rs @@ -62,7 +62,7 @@ impl<'c> Channels<'c> { Ok(()) } - pub async fn for_login(&mut self, login: &LoginId) -> Result, BoxedError> { + pub async fn joined(&mut self, login: &LoginId) -> Result, BoxedError> { let channels = sqlx::query_as!( Channel, r#" @@ -83,6 +83,32 @@ impl<'c> Channels<'c> { Ok(channels) } + pub async fn unjoined(&mut self, login: &LoginId) -> Result, BoxedError> { + let channels = sqlx::query_as!( + Channel, + r#" + select + channel.id as "id: Id", + channel.name + from channel + except + select + channel.id as "id: Id", + channel.name + from channel + join channel_member + on (channel.id = channel_member.channel) + where channel_member.login = $1 + order by channel.name + "#, + login, + ) + .fetch_all(&mut *self.0) + .await?; + + Ok(channels) + } + /// Unenrol a login from a channel. pub async fn leave(&mut self, channel: &Id, login: &LoginId) -> Result<(), BoxedError> { sqlx::query_scalar!( diff --git a/src/channel/routes.rs b/src/channel/routes.rs index 4453a1e..3dc2b1a 100644 --- a/src/channel/routes.rs +++ b/src/channel/routes.rs @@ -12,6 +12,7 @@ use crate::{error::InternalError, login::repo::logins::Login}; pub fn router() -> Router { Router::new() .route("/create", post(on_create)) + .route("/join", post(on_join)) .route("/:channel/leave", post(on_leave)) } @@ -33,6 +34,23 @@ async fn on_create( Ok(Redirect::to("/")) } +#[derive(serde::Deserialize)] +struct JoinRequest { + channel: ChannelId, +} + +async fn on_join( + State(db): State, + login: Login, + Form(req): Form, +) -> Result { + let mut tx = db.begin().await?; + tx.channels().join(&req.channel, &login.id).await?; + tx.commit().await?; + + Ok(Redirect::to("/")) +} + async fn on_leave( State(db): State, login: Login, -- cgit v1.2.3