feat: goals — "watch N movies in YEAR" with progress bar
Domain: Goal entity, UserSettings (federation toggle), RemoteGoalEntry.
Ports: GoalRepository, UserSettingsRepository, RemoteGoalRepository.
Adapters: sqlite + postgres repos, migrations, AP content query extensions.
Application: CRUD use cases (create/update/delete/get/list), settings use cases.
API: 7 endpoints (/goals CRUD, /users/{id}/goals, /settings) with utoipa docs.
Federation: GoalObject (Note + goal discriminator), outbound broadcast with
per-user toggle, inbound GoalObjectHandler in CompositeObjectHandler.
SPA: API client + hooks, GoalCard (shadcn Card+Progress+DropdownMenu),
GoalSheet (Drawer), profile integration (editable own, read-only others),
federation toggle in settings (Switch).
Classic HTML: glassmorphic goal card on profile, Frutiger Aero styling.
Progress computed from existing reviews — backwards compatible.
This commit is contained in:
18
crates/application/src/goals/commands.rs
Normal file
18
crates/application/src/goals/commands.rs
Normal file
@@ -0,0 +1,18 @@
|
||||
use uuid::Uuid;
|
||||
|
||||
pub struct CreateGoalCommand {
|
||||
pub user_id: Uuid,
|
||||
pub year: u16,
|
||||
pub target_count: u32,
|
||||
}
|
||||
|
||||
pub struct UpdateGoalCommand {
|
||||
pub user_id: Uuid,
|
||||
pub year: u16,
|
||||
pub target_count: u32,
|
||||
}
|
||||
|
||||
pub struct DeleteGoalCommand {
|
||||
pub user_id: Uuid,
|
||||
pub year: u16,
|
||||
}
|
||||
56
crates/application/src/goals/create.rs
Normal file
56
crates/application/src/goals/create.rs
Normal file
@@ -0,0 +1,56 @@
|
||||
use domain::{
|
||||
errors::DomainError,
|
||||
events::DomainEvent,
|
||||
models::{Goal, GoalType, GoalWithProgress},
|
||||
value_objects::UserId,
|
||||
};
|
||||
|
||||
use super::commands::CreateGoalCommand;
|
||||
use crate::context::AppContext;
|
||||
|
||||
pub async fn execute(
|
||||
ctx: &AppContext,
|
||||
cmd: CreateGoalCommand,
|
||||
) -> Result<GoalWithProgress, DomainError> {
|
||||
let user_id = UserId::from_uuid(cmd.user_id);
|
||||
|
||||
let existing = ctx
|
||||
.repos
|
||||
.goal
|
||||
.find_by_user_and_year(&user_id, cmd.year)
|
||||
.await?;
|
||||
if existing.is_some() {
|
||||
return Err(DomainError::ValidationError(
|
||||
"Goal already exists for this year".into(),
|
||||
));
|
||||
}
|
||||
|
||||
let goal = Goal::new(
|
||||
user_id.clone(),
|
||||
cmd.year,
|
||||
cmd.target_count,
|
||||
GoalType::Movies,
|
||||
)?;
|
||||
ctx.repos.goal.save(&goal).await?;
|
||||
|
||||
let current_count = ctx
|
||||
.repos
|
||||
.goal
|
||||
.count_reviews_in_year(&user_id, cmd.year)
|
||||
.await?;
|
||||
|
||||
ctx.services
|
||||
.event_publisher
|
||||
.publish(&DomainEvent::GoalCreated {
|
||||
goal_id: goal.id().clone(),
|
||||
user_id,
|
||||
year: cmd.year,
|
||||
target_count: cmd.target_count,
|
||||
})
|
||||
.await?;
|
||||
|
||||
Ok(GoalWithProgress {
|
||||
goal,
|
||||
current_count,
|
||||
})
|
||||
}
|
||||
28
crates/application/src/goals/delete.rs
Normal file
28
crates/application/src/goals/delete.rs
Normal file
@@ -0,0 +1,28 @@
|
||||
use domain::{errors::DomainError, events::DomainEvent, value_objects::UserId};
|
||||
|
||||
use super::commands::DeleteGoalCommand;
|
||||
use crate::context::AppContext;
|
||||
|
||||
pub async fn execute(ctx: &AppContext, cmd: DeleteGoalCommand) -> Result<(), DomainError> {
|
||||
let user_id = UserId::from_uuid(cmd.user_id);
|
||||
|
||||
let goal = ctx
|
||||
.repos
|
||||
.goal
|
||||
.find_by_user_and_year(&user_id, cmd.year)
|
||||
.await?
|
||||
.ok_or_else(|| DomainError::NotFound(format!("Goal for year {}", cmd.year)))?;
|
||||
|
||||
ctx.repos.goal.delete(goal.id(), &user_id).await?;
|
||||
|
||||
ctx.services
|
||||
.event_publisher
|
||||
.publish(&DomainEvent::GoalDeleted {
|
||||
goal_id: goal.id().clone(),
|
||||
user_id,
|
||||
year: cmd.year,
|
||||
})
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
30
crates/application/src/goals/get.rs
Normal file
30
crates/application/src/goals/get.rs
Normal file
@@ -0,0 +1,30 @@
|
||||
use domain::{errors::DomainError, models::GoalWithProgress, value_objects::UserId};
|
||||
|
||||
use super::queries::GetGoalQuery;
|
||||
use crate::context::AppContext;
|
||||
|
||||
pub async fn execute(
|
||||
ctx: &AppContext,
|
||||
query: GetGoalQuery,
|
||||
) -> Result<Option<GoalWithProgress>, DomainError> {
|
||||
let user_id = UserId::from_uuid(query.user_id);
|
||||
|
||||
let goal = ctx
|
||||
.repos
|
||||
.goal
|
||||
.find_by_user_and_year(&user_id, query.year)
|
||||
.await?;
|
||||
|
||||
let Some(goal) = goal else { return Ok(None) };
|
||||
|
||||
let current_count = ctx
|
||||
.repos
|
||||
.goal
|
||||
.count_reviews_in_year(&user_id, query.year)
|
||||
.await?;
|
||||
|
||||
Ok(Some(GoalWithProgress {
|
||||
goal,
|
||||
current_count,
|
||||
}))
|
||||
}
|
||||
27
crates/application/src/goals/list.rs
Normal file
27
crates/application/src/goals/list.rs
Normal file
@@ -0,0 +1,27 @@
|
||||
use domain::{errors::DomainError, models::GoalWithProgress, value_objects::UserId};
|
||||
|
||||
use super::queries::ListGoalsQuery;
|
||||
use crate::context::AppContext;
|
||||
|
||||
pub async fn execute(
|
||||
ctx: &AppContext,
|
||||
query: ListGoalsQuery,
|
||||
) -> Result<Vec<GoalWithProgress>, DomainError> {
|
||||
let user_id = UserId::from_uuid(query.user_id);
|
||||
let goals = ctx.repos.goal.list_for_user(&user_id).await?;
|
||||
|
||||
let mut result = Vec::with_capacity(goals.len());
|
||||
for goal in goals {
|
||||
let current_count = ctx
|
||||
.repos
|
||||
.goal
|
||||
.count_reviews_in_year(&user_id, goal.year())
|
||||
.await?;
|
||||
result.push(GoalWithProgress {
|
||||
goal,
|
||||
current_count,
|
||||
});
|
||||
}
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
7
crates/application/src/goals/mod.rs
Normal file
7
crates/application/src/goals/mod.rs
Normal file
@@ -0,0 +1,7 @@
|
||||
pub mod commands;
|
||||
pub mod create;
|
||||
pub mod delete;
|
||||
pub mod get;
|
||||
pub mod list;
|
||||
pub mod queries;
|
||||
pub mod update;
|
||||
10
crates/application/src/goals/queries.rs
Normal file
10
crates/application/src/goals/queries.rs
Normal file
@@ -0,0 +1,10 @@
|
||||
use uuid::Uuid;
|
||||
|
||||
pub struct GetGoalQuery {
|
||||
pub user_id: Uuid,
|
||||
pub year: u16,
|
||||
}
|
||||
|
||||
pub struct ListGoalsQuery {
|
||||
pub user_id: Uuid,
|
||||
}
|
||||
44
crates/application/src/goals/update.rs
Normal file
44
crates/application/src/goals/update.rs
Normal file
@@ -0,0 +1,44 @@
|
||||
use domain::{
|
||||
errors::DomainError, events::DomainEvent, models::GoalWithProgress, value_objects::UserId,
|
||||
};
|
||||
|
||||
use super::commands::UpdateGoalCommand;
|
||||
use crate::context::AppContext;
|
||||
|
||||
pub async fn execute(
|
||||
ctx: &AppContext,
|
||||
cmd: UpdateGoalCommand,
|
||||
) -> Result<GoalWithProgress, DomainError> {
|
||||
let user_id = UserId::from_uuid(cmd.user_id);
|
||||
|
||||
let mut goal = ctx
|
||||
.repos
|
||||
.goal
|
||||
.find_by_user_and_year(&user_id, cmd.year)
|
||||
.await?
|
||||
.ok_or_else(|| DomainError::NotFound(format!("Goal for year {}", cmd.year)))?;
|
||||
|
||||
goal.update_target(cmd.target_count)?;
|
||||
ctx.repos.goal.update(&goal).await?;
|
||||
|
||||
let current_count = ctx
|
||||
.repos
|
||||
.goal
|
||||
.count_reviews_in_year(&user_id, cmd.year)
|
||||
.await?;
|
||||
|
||||
ctx.services
|
||||
.event_publisher
|
||||
.publish(&DomainEvent::GoalUpdated {
|
||||
goal_id: goal.id().clone(),
|
||||
user_id,
|
||||
year: cmd.year,
|
||||
target_count: cmd.target_count,
|
||||
})
|
||||
.await?;
|
||||
|
||||
Ok(GoalWithProgress {
|
||||
goal,
|
||||
current_count,
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user