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)
258 lines
7.4 KiB
Rust
258 lines
7.4 KiB
Rust
use std::sync::Arc;
|
|
|
|
use chrono::{FixedOffset, TimeZone};
|
|
|
|
use domain::dimension::DimensionKind;
|
|
use domain::entry::Mood;
|
|
use domain::ports::EntryDimensionPort;
|
|
use domain::ports::MoodEntryCommandPort;
|
|
use domain::testing::{
|
|
InMemoryActivityDimension, InMemoryDimensionStore, InMemoryStore, test_entry, test_logged_at,
|
|
test_user,
|
|
};
|
|
use domain::user::UserId;
|
|
|
|
use application::entry::commands::UpdateEntryCommand;
|
|
use application::entry::use_cases::update_entry;
|
|
|
|
async fn setup() -> (
|
|
Arc<InMemoryStore>,
|
|
update_entry::Deps,
|
|
domain::entry::MoodEntry,
|
|
UserId,
|
|
) {
|
|
let store = Arc::new(InMemoryStore::new());
|
|
let user = test_user("alice");
|
|
let entry = test_entry(user.id().clone(), Mood::Meh);
|
|
store.save(&entry).await.unwrap();
|
|
|
|
let deps = update_entry::Deps {
|
|
activities: store.clone(),
|
|
command: store.clone(),
|
|
dimensions: vec![
|
|
Arc::new(InMemoryDimensionStore::new(DimensionKind::Content))
|
|
as Arc<dyn EntryDimensionPort>,
|
|
],
|
|
query: store.clone(),
|
|
media_storage: store.clone(),
|
|
events: store.clone(),
|
|
};
|
|
|
|
(store, deps, entry, user.id().clone())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn updates_mood() {
|
|
let (store, deps, entry, user_id) = setup().await;
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: Some(test_logged_at()),
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
let updated = update_entry::execute(cmd, user_id, &deps).await.unwrap();
|
|
|
|
assert_eq!(updated.mood(), Mood::Rad);
|
|
assert_eq!(store.published_events().len(), 1);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn updating_nonexistent_entry_fails() {
|
|
let store = Arc::new(InMemoryStore::new());
|
|
let deps = update_entry::Deps {
|
|
activities: store.clone(),
|
|
command: store.clone(),
|
|
dimensions: vec![
|
|
Arc::new(InMemoryDimensionStore::new(DimensionKind::Content))
|
|
as Arc<dyn EntryDimensionPort>,
|
|
],
|
|
query: store.clone(),
|
|
media_storage: store.clone(),
|
|
events: store.clone(),
|
|
};
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: domain::entry::MoodEntryId::generate(),
|
|
mood: Some(Mood::Good),
|
|
logged_at: Some(test_logged_at()),
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
let result = update_entry::execute(cmd, UserId::generate(), &deps).await;
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn rejects_update_by_different_user() {
|
|
let (_store, deps, entry, _user_id) = setup().await;
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: Some(test_logged_at()),
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
let other_user = UserId::generate();
|
|
let result = update_entry::execute(cmd, other_user, &deps).await;
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn an_update_carrying_no_date_leaves_the_entry_where_it_was() {
|
|
let (_store, deps, entry, user_id) = setup().await;
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: None,
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
let updated = update_entry::execute(cmd, user_id, &deps).await.unwrap();
|
|
|
|
assert_eq!(updated.logged_at(), &test_logged_at());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn an_update_carrying_a_date_moves_the_entry_to_it() {
|
|
let (_store, deps, entry, user_id) = setup().await;
|
|
|
|
let moved_to = FixedOffset::east_opt(3600)
|
|
.unwrap()
|
|
.with_ymd_and_hms(2024, 1, 2, 9, 30, 0)
|
|
.unwrap();
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: Some(moved_to),
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
let updated = update_entry::execute(cmd, user_id, &deps).await.unwrap();
|
|
|
|
assert_eq!(updated.logged_at(), &moved_to);
|
|
}
|
|
|
|
async fn an_entry_already_wearing(
|
|
user: &domain::user::User,
|
|
activity: &domain::activity::Activity,
|
|
) -> (
|
|
Arc<InMemoryStore>,
|
|
update_entry::Deps,
|
|
domain::entry::MoodEntry,
|
|
) {
|
|
let store = Arc::new(InMemoryStore::new());
|
|
let entry = test_entry(user.id().clone(), Mood::Meh);
|
|
MoodEntryCommandPort::save(store.as_ref(), &entry)
|
|
.await
|
|
.unwrap();
|
|
|
|
domain::ports::ActivityCommandPort::save(store.as_ref(), activity)
|
|
.await
|
|
.unwrap();
|
|
|
|
let tags: Arc<InMemoryActivityDimension> =
|
|
Arc::new(InMemoryActivityDimension::sharing(store.clone()));
|
|
tags.save(
|
|
entry.id(),
|
|
&[domain::dimension::DimensionValue::activities(vec![
|
|
activity.id().clone(),
|
|
])],
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let deps = update_entry::Deps {
|
|
activities: store.clone(),
|
|
command: store.clone(),
|
|
dimensions: vec![tags as Arc<dyn EntryDimensionPort>],
|
|
query: store.clone(),
|
|
media_storage: store.clone(),
|
|
events: store.clone(),
|
|
};
|
|
|
|
(store, deps, entry)
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn an_entry_that_already_wears_an_archived_activity_can_still_be_edited() {
|
|
let user = test_user("alice");
|
|
let mut retired = domain::testing::test_activity(user.id().clone(), "fencing");
|
|
retired.archive().unwrap();
|
|
|
|
let (_store, deps, entry) = an_entry_already_wearing(&user, &retired).await;
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: None,
|
|
dimensions: Some(vec![domain::dimension::DimensionValue::activities(vec![
|
|
retired.id().clone(),
|
|
])]),
|
|
};
|
|
|
|
let updated = update_entry::execute(cmd, entry.user_id().clone(), &deps)
|
|
.await
|
|
.expect("archived activities remain on the entries that already wear them");
|
|
|
|
assert_eq!(updated.mood(), Mood::Rad);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn an_archived_activity_cannot_be_added_to_an_entry_that_lacks_it() {
|
|
let user = test_user("alice");
|
|
let mut retired = domain::testing::test_activity(user.id().clone(), "fencing");
|
|
retired.archive().unwrap();
|
|
|
|
let worn = domain::testing::test_activity(user.id().clone(), "reading");
|
|
let (store, deps, entry) = an_entry_already_wearing(&user, &worn).await;
|
|
|
|
domain::ports::ActivityCommandPort::save(store.as_ref(), &retired)
|
|
.await
|
|
.unwrap();
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: None,
|
|
dimensions: Some(vec![domain::dimension::DimensionValue::activities(vec![
|
|
worn.id().clone(),
|
|
retired.id().clone(),
|
|
])]),
|
|
};
|
|
|
|
let refused = update_entry::execute(cmd, entry.user_id().clone(), &deps).await;
|
|
|
|
assert!(
|
|
matches!(
|
|
refused,
|
|
Err(application::errors::ApplicationError::Validation(_))
|
|
),
|
|
"editing an entry is not a way past the archive, got {refused:?}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn an_archived_activity_can_be_taken_off_an_entry() {
|
|
let user = test_user("alice");
|
|
let mut retired = domain::testing::test_activity(user.id().clone(), "fencing");
|
|
retired.archive().unwrap();
|
|
|
|
let (_store, deps, entry) = an_entry_already_wearing(&user, &retired).await;
|
|
|
|
let cmd = UpdateEntryCommand {
|
|
entry_id: entry.id().clone(),
|
|
mood: Some(Mood::Rad),
|
|
logged_at: None,
|
|
dimensions: Some(vec![]),
|
|
};
|
|
|
|
update_entry::execute(cmd, entry.user_id().clone(), &deps)
|
|
.await
|
|
.expect("dropping a retired tag is always allowed");
|
|
}
|