summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-10-30 01:25:04 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-10-30 01:25:04 -0400
commit70591c5ac10069a4ae649bd6f79d769da9e32a98 (patch)
treef9a4d155275975e4f37e063f331b7697f5c3cb07 /src/login
parentffba911ba5240f67cc616b2cc2eaf7c730ebbde8 (diff)
Remove `hi-recanonicalize`.
This utility was needed to support a database migration with existing data. I have it on good authority that no further databases exist that are in the state that made this tool necessary.
Diffstat (limited to 'src/login')
-rw-r--r--src/login/app.rs21
-rw-r--r--src/login/mod.rs1
-rw-r--r--src/login/repo.rs32
3 files changed, 1 insertions, 53 deletions
diff --git a/src/login/app.rs b/src/login/app.rs
index 6da26e9..f458561 100644
--- a/src/login/app.rs
+++ b/src/login/app.rs
@@ -1,33 +1,21 @@
use sqlx::sqlite::SqlitePool;
-use super::repo::Provider as _;
-
-#[cfg(test)]
use super::{
create::{self, Create},
Login, Password,
};
-#[cfg(test)]
use crate::{clock::DateTime, event::Broadcaster, name::Name};
pub struct Logins<'a> {
db: &'a SqlitePool,
- #[cfg(test)]
events: &'a Broadcaster,
}
impl<'a> Logins<'a> {
- #[cfg(not(test))]
- pub const fn new(db: &'a SqlitePool) -> Self {
- Self { db }
- }
-
- #[cfg(test)]
pub const fn new(db: &'a SqlitePool, events: &'a Broadcaster) -> Self {
Self { db, events }
}
- #[cfg(test)]
pub async fn create(
&self,
name: &Name,
@@ -45,17 +33,8 @@ impl<'a> Logins<'a> {
Ok(login.as_created())
}
-
- pub async fn recanonicalize(&self) -> Result<(), sqlx::Error> {
- let mut tx = self.db.begin().await?;
- tx.logins().recanonicalize().await?;
- tx.commit().await?;
-
- Ok(())
- }
}
-#[cfg(test)]
#[derive(Debug, thiserror::Error)]
pub enum CreateError {
#[error("invalid login name: {0}")]
diff --git a/src/login/mod.rs b/src/login/mod.rs
index 5a6d715..006fa0c 100644
--- a/src/login/mod.rs
+++ b/src/login/mod.rs
@@ -1,3 +1,4 @@
+#[cfg(test)]
pub mod app;
pub mod create;
pub mod event;
diff --git a/src/login/repo.rs b/src/login/repo.rs
index a972304..9439a25 100644
--- a/src/login/repo.rs
+++ b/src/login/repo.rs
@@ -143,38 +143,6 @@ impl<'c> Logins<'c> {
Ok(logins)
}
-
- pub async fn recanonicalize(&mut self) -> Result<(), sqlx::Error> {
- let logins = sqlx::query!(
- r#"
- select
- id as "id: Id",
- display_name as "display_name: String"
- from login
- "#,
- )
- .fetch_all(&mut *self.0)
- .await?;
-
- for login in logins {
- let name = Name::from(login.display_name);
- let canonical_name = name.canonical();
-
- sqlx::query!(
- r#"
- update login
- set canonical_name = $1
- where id = $2
- "#,
- canonical_name,
- login.id,
- )
- .execute(&mut *self.0)
- .await?;
- }
-
- Ok(())
- }
}
#[derive(Debug, thiserror::Error)]