All 40 backend tests were pure-function tests — not one line of SQL ran under `cargo test`,
even though the riskiest code in the repo is SQL. Add 12 DB-backed `#[sqlx::test]` tests
(fresh throwaway DB per test, real migrations) pinning the invariants that code is
load-bearing for, each mutation-verified to fail on broken code:
export_epoch.rs (8): epoch is post-increment on release (a worker born pre-increment is
inert); epoch strictly monotonic across reopen; a retired-epoch worker's writes are
no-ops; export_current is EXACTLY the invariant (8-case table); the ViewerOnly
carry-forward carries a done ZIP forward AND matches nothing when the ZIP is unfinished
(the af997a8 strand bug); boot recovery doesn't clobber a live ZIP.
upload_concurrency.rs (4): the atomic quota UPDATE stops two stale-snapshot uploads from
both committing (sequential AND concurrent-tx via EPQ); the FOR SHARE upload lock
serializes against release, blocking a photo from committing after the export snapshot.
Deleting FOR SHARE, or the carry-forward's `status='done'`, each makes a test fail.
Test isolation: TRUNCATE now also resets disk_cache and sse_tickets. The stale disk
reading was harmless only while quotas were globally off in e2e (they no longer are — see
the new quota spec), i.e. two holes were masking each other.
clippy: `cargo clippy --all-targets -- -D warnings` now passes (it did not). Deleted the
dead jobs.rs (an unused BackgroundJob sketch) and unused model methods; `#[allow(dead_code)]`
+ comment on the sqlx FromRow field-sets that ARE populated by the DB. No SQL or logic
changed. `cargo test` requires DATABASE_URL by design.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
133 lines
3.7 KiB
Rust
133 lines
3.7 KiB
Rust
use chrono::{DateTime, Utc};
|
|
use serde::{Deserialize, Serialize};
|
|
use sqlx::PgPool;
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, sqlx::Type)]
|
|
#[serde(rename_all = "lowercase")]
|
|
#[sqlx(type_name = "user_role", rename_all = "lowercase")]
|
|
pub enum UserRole {
|
|
Guest,
|
|
Host,
|
|
Admin,
|
|
}
|
|
|
|
impl UserRole {
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
UserRole::Guest => "guest",
|
|
UserRole::Host => "host",
|
|
UserRole::Admin => "admin",
|
|
}
|
|
}
|
|
}
|
|
|
|
// Row shape for `user`: every field is populated by sqlx from `SELECT *` / `RETURNING *`.
|
|
// `uploads_hidden`, `failed_pin_attempts` and `created_at` are enforced/updated in SQL rather than
|
|
// read in Rust, but they are part of the row and stay here so the struct keeps mirroring the table.
|
|
#[allow(dead_code)]
|
|
#[derive(Debug, sqlx::FromRow)]
|
|
pub struct User {
|
|
pub id: Uuid,
|
|
pub event_id: Uuid,
|
|
pub display_name: String,
|
|
pub role: UserRole,
|
|
pub is_banned: bool,
|
|
pub uploads_hidden: bool,
|
|
pub recovery_pin_hash: String,
|
|
pub total_upload_bytes: i64,
|
|
pub failed_pin_attempts: i16,
|
|
pub pin_locked_until: Option<DateTime<Utc>>,
|
|
pub created_at: DateTime<Utc>,
|
|
}
|
|
|
|
impl User {
|
|
pub async fn create(
|
|
pool: &PgPool,
|
|
event_id: Uuid,
|
|
display_name: &str,
|
|
pin_hash: &str,
|
|
) -> Result<Self, sqlx::Error> {
|
|
sqlx::query_as::<_, Self>(
|
|
"INSERT INTO \"user\" (event_id, display_name, recovery_pin_hash)
|
|
VALUES ($1, $2, $3)
|
|
RETURNING *",
|
|
)
|
|
.bind(event_id)
|
|
.bind(display_name)
|
|
.bind(pin_hash)
|
|
.fetch_one(pool)
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_id(pool: &PgPool, id: Uuid) -> Result<Option<Self>, sqlx::Error> {
|
|
sqlx::query_as::<_, Self>("SELECT * FROM \"user\" WHERE id = $1")
|
|
.bind(id)
|
|
.fetch_optional(pool)
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_event_and_name(
|
|
pool: &PgPool,
|
|
event_id: Uuid,
|
|
display_name: &str,
|
|
) -> Result<Vec<Self>, sqlx::Error> {
|
|
sqlx::query_as::<_, Self>(
|
|
"SELECT * FROM \"user\" WHERE event_id = $1 AND LOWER(display_name) = LOWER($2)",
|
|
)
|
|
.bind(event_id)
|
|
.bind(display_name)
|
|
.fetch_all(pool)
|
|
.await
|
|
}
|
|
|
|
pub async fn name_taken(
|
|
pool: &PgPool,
|
|
event_id: Uuid,
|
|
display_name: &str,
|
|
) -> Result<bool, sqlx::Error> {
|
|
let row: (bool,) = sqlx::query_as(
|
|
"SELECT EXISTS(SELECT 1 FROM \"user\" WHERE event_id = $1 AND LOWER(display_name) = LOWER($2))",
|
|
)
|
|
.bind(event_id)
|
|
.bind(display_name)
|
|
.fetch_one(pool)
|
|
.await?;
|
|
Ok(row.0)
|
|
}
|
|
|
|
pub async fn increment_failed_pin(pool: &PgPool, id: Uuid) -> Result<i16, sqlx::Error> {
|
|
let row: (i16,) = sqlx::query_as(
|
|
"UPDATE \"user\"
|
|
SET failed_pin_attempts = failed_pin_attempts + 1
|
|
WHERE id = $1
|
|
RETURNING failed_pin_attempts",
|
|
)
|
|
.bind(id)
|
|
.fetch_one(pool)
|
|
.await?;
|
|
Ok(row.0)
|
|
}
|
|
|
|
pub async fn lock_pin(pool: &PgPool, id: Uuid, until: DateTime<Utc>) -> Result<(), sqlx::Error> {
|
|
sqlx::query(
|
|
"UPDATE \"user\" SET pin_locked_until = $2 WHERE id = $1",
|
|
)
|
|
.bind(id)
|
|
.bind(until)
|
|
.execute(pool)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn reset_pin_attempts(pool: &PgPool, id: Uuid) -> Result<(), sqlx::Error> {
|
|
sqlx::query(
|
|
"UPDATE \"user\" SET failed_pin_attempts = 0, pin_locked_until = NULL WHERE id = $1",
|
|
)
|
|
.bind(id)
|
|
.execute(pool)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
}
|