spa hardening, offline logging, rate limit fixes
server: - backup exporter, auth extractors, error shapes, CONTEXT (prior work) - spa assets served outside the rate limit via route_layer - requests_per_second went to per_second(), which takes an interval not a rate: 50 meant one request per 50s once burst was spent. now converted properly. 15/s, burst 60 spa fixes: - account delete cleared snake_case token keys that were never written - refresh interceptor could retry forever - date ranges used local day boundaries stamped +00:00 - "all" period trend plotted one page; calendar days fabricated mood 3 - chart grid invisible: hsl(var(--border)) against rgba tokens - blob url leak, orphaned media on failed save, devtools in prod bundle - pt-safe/safe-area-pb classes never existed spa features: - offline outbox: entries queue to IndexedDB, replay with backoff, only server refusals count against an entry - drafts persist, quick-log sheet, diary infinite scroll + filters - route error boundary, stale-chunk recovery, no service worker in dev a11y + perf: - mood picker is a radiogroup, activity picker keyboard-operable, text alternatives for colour/emoji, locale week start - dark glass over the bright photo: worst case 1.4:1 -> 4.9-9.6:1 - initial payload 1095->769kB raw, 306->230kB gzip; 38 unused components and 5 deps dropped; fonts 218->133kB 53 tests added (43 spa, 10 server)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use sqlx::sqlite::SqlitePoolOptions;
|
||||
|
||||
use domain::api_token::{ApiToken, TokenDigest};
|
||||
use domain::api_token::{ApiToken, TokenDigest, TokenScope, TokenScopes};
|
||||
use domain::ports::{ApiTokenCommandPort, ApiTokenQueryPort, CascadeDeletePort, UserCommandPort};
|
||||
use domain::provider::ProviderName;
|
||||
use domain::testing::test_user;
|
||||
@@ -33,6 +33,7 @@ fn a_token(owner: &UserId, name: &str, digest: &str) -> ApiToken {
|
||||
owner.clone(),
|
||||
ProviderName::new(name).unwrap(),
|
||||
TokenDigest::from_persistence(digest.into()),
|
||||
TokenScopes::new([TokenScope::WriteMetrics]).unwrap(),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -152,7 +153,7 @@ async fn a_row_with_a_scope_this_build_does_not_know_authenticates_nothing() {
|
||||
let (pool, user) = a_pool_with_a_user().await;
|
||||
|
||||
sqlx::query(
|
||||
"INSERT INTO api_tokens (id, user_id, name, digest, scope, created_at, last_used_at)
|
||||
"INSERT INTO api_tokens (id, user_id, name, digest, scopes, created_at, last_used_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, NULL)",
|
||||
)
|
||||
.bind(uuid::Uuid::new_v4().to_string())
|
||||
|
||||
@@ -283,3 +283,170 @@ fn remove(path: &str) {
|
||||
let _ = std::fs::remove_file(format!("{path}-wal"));
|
||||
let _ = std::fs::remove_file(format!("{path}-shm"));
|
||||
}
|
||||
|
||||
const EVERY_TABLE_A_USER_FILLS: [&str; 7] = [
|
||||
"mood_entries",
|
||||
"activities",
|
||||
"reminders",
|
||||
"daily_metrics",
|
||||
"cycle_starts",
|
||||
"metric_rejections",
|
||||
"media_owners",
|
||||
];
|
||||
|
||||
async fn fill_every_table_for(pool: &SqlitePool, user: &User) {
|
||||
let entry = MoodEntry::new(
|
||||
user.id().clone(),
|
||||
Mood::Good,
|
||||
chrono::DateTime::parse_from_rfc3339("2026-08-20T12:00:00+02:00").unwrap(),
|
||||
);
|
||||
SqliteEntryCommandRepository::new(pool.clone())
|
||||
.save(&entry)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::ActivityCommandPort::save(
|
||||
&sqlite::repositories::SqliteActivityCommandRepository::new(pool.clone()),
|
||||
&domain::testing::test_activity(user.id().clone(), "gaming"),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::ReminderCommandPort::save(
|
||||
&sqlite::repositories::SqliteReminderCommandRepository::new(pool.clone()),
|
||||
&domain::testing::test_reminder(user.id().clone()),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::DailyMetricCommandPort::save(
|
||||
&sqlite::repositories::SqliteDailyMetricCommandRepository::new(pool.clone()),
|
||||
&[domain::metric::DailyMetric::new(
|
||||
user.id().clone(),
|
||||
a_date("2026-08-20"),
|
||||
domain::metric::MetricValue::Steps(domain::metric::Steps::new(8_412).unwrap()),
|
||||
domain::metric::Source::Manual,
|
||||
)],
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::CycleStartCommandPort::record(
|
||||
&sqlite::repositories::SqliteCycleStartRepository::new(pool.clone()),
|
||||
user.id(),
|
||||
&a_date("2026-08-01"),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::RejectionCommandPort::record(
|
||||
&sqlite::repositories::SqliteRejectionRepository::new(pool.clone(), 100),
|
||||
&[domain::rejection::RejectedMetric::new(
|
||||
user.id().clone(),
|
||||
domain::rejection::RejectionOrigin::Import,
|
||||
domain::rejection::RejectionDetail::new(
|
||||
None,
|
||||
Some(a_date("2026-08-19")),
|
||||
"steps",
|
||||
Some(-1),
|
||||
),
|
||||
String::from("steps cannot be negative"),
|
||||
)],
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
domain::ports::MediaOwnershipPort::remember(
|
||||
&sqlite::repositories::SqliteMediaOwnershipRepository::new(pool.clone()),
|
||||
user.id(),
|
||||
(&domain::attachment::PhotoId::generate()).into(),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
fn a_date(day: &str) -> domain::entry::Date {
|
||||
domain::entry::Date::from_persistence(day.parse().unwrap())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn clearing_a_users_data_empties_every_table_they_fill() {
|
||||
let path = a_file().await;
|
||||
let pool = sqlite::create_pool(&format!("sqlite://{path}"))
|
||||
.await
|
||||
.unwrap();
|
||||
sqlite::run_migrations(&pool).await.unwrap();
|
||||
|
||||
let user = test_user("alice");
|
||||
SqliteUserCommandRepository::new(pool.clone())
|
||||
.save(&user)
|
||||
.await
|
||||
.unwrap();
|
||||
fill_every_table_for(&pool, &user).await;
|
||||
|
||||
for table in EVERY_TABLE_A_USER_FILLS {
|
||||
assert_eq!(rows_in(&pool, table).await, 1, "{table} should be seeded");
|
||||
}
|
||||
|
||||
domain::ports::CascadeDeletePort::delete_all_user_data(
|
||||
&sqlite::repositories::SqliteCascadeDeleteRepository::new(pool.clone()),
|
||||
user.id(),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
for table in EVERY_TABLE_A_USER_FILLS {
|
||||
assert_eq!(
|
||||
rows_in(&pool, table).await,
|
||||
0,
|
||||
"{table} still holds data the user asked to be cleared"
|
||||
);
|
||||
}
|
||||
|
||||
let users: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(users.0, 1, "clearing data is not deleting the account");
|
||||
|
||||
remove(&path);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn deleting_an_account_empties_every_table_they_fill() {
|
||||
let path = a_file().await;
|
||||
let pool = sqlite::create_pool(&format!("sqlite://{path}"))
|
||||
.await
|
||||
.unwrap();
|
||||
sqlite::run_migrations(&pool).await.unwrap();
|
||||
|
||||
let user = test_user("alice");
|
||||
SqliteUserCommandRepository::new(pool.clone())
|
||||
.save(&user)
|
||||
.await
|
||||
.unwrap();
|
||||
fill_every_table_for(&pool, &user).await;
|
||||
|
||||
domain::ports::CascadeDeletePort::delete_user_account(
|
||||
&sqlite::repositories::SqliteCascadeDeleteRepository::new(pool.clone()),
|
||||
user.id(),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
for table in EVERY_TABLE_A_USER_FILLS {
|
||||
assert_eq!(
|
||||
rows_in(&pool, table).await,
|
||||
0,
|
||||
"{table} outlived the account it belonged to"
|
||||
);
|
||||
}
|
||||
|
||||
let users: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(users.0, 0);
|
||||
|
||||
remove(&path);
|
||||
}
|
||||
|
||||
142
crates/adapters/sqlite/tests/entry_instant_test.rs
Normal file
142
crates/adapters/sqlite/tests/entry_instant_test.rs
Normal file
@@ -0,0 +1,142 @@
|
||||
use chrono::{DateTime, FixedOffset};
|
||||
use sqlx::SqlitePool;
|
||||
|
||||
use domain::entry::{DateRange, Mood, MoodEntry};
|
||||
use domain::ports::{MoodEntryCommandPort, MoodEntryQueryPort, UserCommandPort};
|
||||
use domain::testing::test_user;
|
||||
use domain::user::User;
|
||||
|
||||
use sqlite::repositories::{
|
||||
SqliteEntryCommandRepository, SqliteEntryQueryRepository, SqliteUserCommandRepository,
|
||||
};
|
||||
|
||||
fn a_file() -> String {
|
||||
let name = format!("k-mood-instants-{}.sqlite", uuid::Uuid::new_v4());
|
||||
|
||||
std::env::temp_dir()
|
||||
.join(name)
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
async fn a_pool_with_a_user() -> (SqlitePool, User) {
|
||||
let path = a_file();
|
||||
let pool = sqlite::create_pool(&format!("sqlite://{path}"))
|
||||
.await
|
||||
.unwrap();
|
||||
sqlite::run_migrations(&pool).await.unwrap();
|
||||
|
||||
let user = test_user("alice");
|
||||
SqliteUserCommandRepository::new(pool.clone())
|
||||
.save(&user)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
(pool, user)
|
||||
}
|
||||
|
||||
fn instant(text: &str) -> DateTime<FixedOffset> {
|
||||
DateTime::parse_from_rfc3339(text).unwrap()
|
||||
}
|
||||
|
||||
async fn save(pool: &SqlitePool, user: &User, logged_at: &str) -> MoodEntry {
|
||||
let entry = MoodEntry::new(user.id().clone(), Mood::Good, instant(logged_at));
|
||||
SqliteEntryCommandRepository::new(pool.clone())
|
||||
.save(&entry)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
entry
|
||||
}
|
||||
|
||||
async fn stored_text(pool: &SqlitePool, entry: &MoodEntry) -> String {
|
||||
let (held,): (String,) = sqlx::query_as("SELECT logged_at FROM mood_entries WHERE id = ?")
|
||||
.bind(entry.id().value().to_string())
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
held
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn an_instant_is_held_in_utc_whatever_offset_it_arrived_in() {
|
||||
let (pool, user) = a_pool_with_a_user().await;
|
||||
|
||||
let entry = save(&pool, &user, "2026-08-25T20:00:00+02:00").await;
|
||||
|
||||
assert_eq!(
|
||||
stored_text(&pool, &entry).await,
|
||||
"2026-08-25T18:00:00+00:00",
|
||||
"one canonical form makes the column sortable"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn an_instant_survives_the_round_trip_unchanged() {
|
||||
let (pool, user) = a_pool_with_a_user().await;
|
||||
|
||||
let entry = save(&pool, &user, "2026-08-25T20:00:00+02:00").await;
|
||||
|
||||
let read = SqliteEntryQueryRepository::new(pool.clone())
|
||||
.find_by_id(entry.id())
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(
|
||||
read.logged_at(),
|
||||
entry.logged_at(),
|
||||
"the instant is the fact; the offset it was written in is not"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_range_finds_entries_written_in_other_offsets() {
|
||||
let (pool, user) = a_pool_with_a_user().await;
|
||||
|
||||
let eastern = save(&pool, &user, "2026-08-25T01:30:00+03:00").await;
|
||||
let western = save(&pool, &user, "2026-08-24T21:30:00-04:00").await;
|
||||
|
||||
let whole_of_the_24th_utc = DateRange::new(
|
||||
instant("2026-08-24T00:00:00+00:00"),
|
||||
instant("2026-08-24T23:59:59+00:00"),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let found = SqliteEntryQueryRepository::new(pool.clone())
|
||||
.find_by_date_range(user.id(), &whole_of_the_24th_utc)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let ids: Vec<_> = found.iter().map(|entry| entry.id().clone()).collect();
|
||||
|
||||
assert!(
|
||||
ids.contains(eastern.id()),
|
||||
"01:30+03:00 is 22:30Z on the 24th and belongs in the range"
|
||||
);
|
||||
assert!(
|
||||
!ids.contains(western.id()),
|
||||
"21:30-04:00 is 01:30Z on the 25th, so it falls outside the range"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn entries_come_back_newest_first_across_mixed_offsets() {
|
||||
let (pool, user) = a_pool_with_a_user().await;
|
||||
|
||||
let earlier = save(&pool, &user, "2026-08-25T00:30:00+02:00").await;
|
||||
let later = save(&pool, &user, "2026-08-25T00:00:00+00:00").await;
|
||||
|
||||
let found = SqliteEntryQueryRepository::new(pool.clone())
|
||||
.find_all_by_user(user.id())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(
|
||||
found[0].id(),
|
||||
later.id(),
|
||||
"22:30Z precedes 00:00Z, however the offsets sort as text"
|
||||
);
|
||||
assert_eq!(found[1].id(), earlier.id());
|
||||
}
|
||||
@@ -140,3 +140,106 @@ async fn a_process_joining_a_migrated_database_applies_nothing() {
|
||||
|
||||
forget(&path);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn legacy_instants_are_rewritten_into_one_sortable_form() {
|
||||
let pool = fresh_pool().await;
|
||||
sqlite::run_migrations(&pool).await.unwrap();
|
||||
|
||||
let user = domain::testing::test_user("alice");
|
||||
domain::ports::UserCommandPort::save(
|
||||
&sqlite::repositories::SqliteUserCommandRepository::new(pool.clone()),
|
||||
&user,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let legacy = [
|
||||
("2026-08-25T20:00:00+02:00", "2026-08-25T18:00:00+00:00"),
|
||||
("2026-08-24T21:30:00-04:00", "2026-08-25T01:30:00+00:00"),
|
||||
("2026-08-23T09:00:00+00:00", "2026-08-23T09:00:00+00:00"),
|
||||
];
|
||||
|
||||
for (index, (written, _)) in legacy.iter().enumerate() {
|
||||
sqlx::query(
|
||||
"INSERT INTO mood_entries (id, user_id, mood, logged_at, created_at, updated_at)
|
||||
VALUES (?, ?, 3, ?, ?, ?)",
|
||||
)
|
||||
.bind(format!("00000000-0000-0000-0000-00000000000{index}"))
|
||||
.bind(user.id().value().to_string())
|
||||
.bind(written)
|
||||
.bind(written)
|
||||
.bind(written)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
sqlx::raw_sql(include_str!("../src/migrations/015_logged_at_in_utc.sql"))
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
for (index, (written, expected)) in legacy.iter().enumerate() {
|
||||
let (held,): (String,) = sqlx::query_as("SELECT logged_at FROM mood_entries WHERE id = ?")
|
||||
.bind(format!("00000000-0000-0000-0000-00000000000{index}"))
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(held, *expected, "{written} should normalise to {expected}");
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_token_minted_before_scopes_existed_still_writes_metrics() {
|
||||
let pool = fresh_pool().await;
|
||||
|
||||
for (name, sql) in sqlite::migrations_before("016_api_token_scopes") {
|
||||
sqlx::raw_sql(sql)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap_or_else(|error| panic!("{name} failed: {error}"));
|
||||
}
|
||||
|
||||
let user = domain::testing::test_user("alice");
|
||||
domain::ports::UserCommandPort::save(
|
||||
&sqlite::repositories::SqliteUserCommandRepository::new(pool.clone()),
|
||||
&user,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
sqlx::query(
|
||||
"INSERT INTO api_tokens (id, user_id, name, digest, scope, created_at)
|
||||
VALUES (?, ?, 'tasker', 'abc123', 'writeMetrics', ?)",
|
||||
)
|
||||
.bind(uuid::Uuid::new_v4().to_string())
|
||||
.bind(user.id().value().to_string())
|
||||
.bind(chrono::Utc::now().to_rfc3339())
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
sqlx::raw_sql(include_str!("../src/migrations/016_api_token_scopes.sql"))
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let found = domain::ports::ApiTokenQueryPort::find_by_digest(
|
||||
&sqlite::repositories::SqliteApiTokenQueryRepository::new(pool.clone()),
|
||||
&domain::api_token::TokenDigest::from_persistence("abc123".into()),
|
||||
)
|
||||
.await
|
||||
.unwrap()
|
||||
.expect("the token should have survived the migration");
|
||||
|
||||
assert!(
|
||||
found.allows(domain::api_token::TokenScope::WriteMetrics),
|
||||
"a token minted before scopes existed keeps doing what it always did"
|
||||
);
|
||||
assert!(
|
||||
!found.allows(domain::api_token::TokenScope::ReadJournal),
|
||||
"and gains nothing it was never granted"
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user