feat: Phase 3 — polish & settings complete
Card pool: - TOTW cards (5): overall 88-92, rarity "totw" - Hero cards (5): overall 85-88, rarity "hero" - Icon cards (5): overall 93-95, rarity "icon" (permanent, non-loan) Packs: - TOTW Pack (30,000 coins): 5 TOTW cards guaranteed - Icon Pack (50,000 coins): 3 icon cards guaranteed - Hero Pack (20,000 coins): 5 hero cards guaranteed Objectives: - Milestone objectives (6): win 10/50, score 100/500 goals, 10 SBCs, 25 packs Formations: - GET /formations returns 12 valid formation strings Multiple named squads (#20): - POST /squad with no squad_id always creates a new squad - POST /squad with squad_id updates that specific squad - GET /squads: list all squads for the club (metadata only) - GET /squads/🆔 squad with players + chemistry - DELETE /squads/🆔 remove a squad Per-position goal stats (#41): - Migration 0003: position_goals table - POST /matches/result accepts optional goal_positions: ["ST","CAM",...] - GET /statistics now includes position_goals map Settings (#44-46): - GET /settings: { difficulty, preferred_formation } with defaults - PUT /settings: upsert any key-value combination Draft mode skeleton (#38): - GET /draft/squad?difficulty=... returns a randomly generated 11-player squad Integration tests: - 9 new tests covering: formations, pack buy/open, SBC submit, settings R/W, multiple squads, draft endpoint, goal position tracking, win streak Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+63
-22
@@ -1,4 +1,7 @@
|
||||
use axum::{extract::State, Json};
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
Json,
|
||||
};
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use crate::{
|
||||
@@ -15,28 +18,27 @@ pub async fn get_squad(State(state): State<AppState>) -> AppResult<Json<Value>>
|
||||
let (squad, players) = squad_svc::get_squad(&state.pool, &club.id).await?;
|
||||
let chemistry = squad_svc::calculate_chemistry(&state.pool, &state.card_db, &players).await?;
|
||||
|
||||
let enriched: Vec<Value> = players
|
||||
.iter()
|
||||
.map(|sp| {
|
||||
json!({
|
||||
"squad_player_id": sp.id,
|
||||
"owned_card_id": sp.owned_card_id,
|
||||
"position_index": sp.position_index,
|
||||
"is_captain": sp.is_captain,
|
||||
"is_on_bench": sp.is_on_bench,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
Ok(Json(squad_response(&squad, &players, chemistry)))
|
||||
}
|
||||
|
||||
Ok(Json(json!({
|
||||
"squad": {
|
||||
"id": squad.id,
|
||||
"name": squad.name,
|
||||
"formation": squad.formation,
|
||||
},
|
||||
"players": enriched,
|
||||
"chemistry": chemistry,
|
||||
})))
|
||||
pub async fn get_squads(State(state): State<AppState>) -> AppResult<Json<Value>> {
|
||||
let profile = profile_svc::get_active_profile(&state.pool).await?;
|
||||
let club = club_svc::get_club_by_profile(&state.pool, &profile.id).await?;
|
||||
let squads = squad_svc::list_squads(&state.pool, &club.id).await?;
|
||||
Ok(Json(json!({ "squads": squads })))
|
||||
}
|
||||
|
||||
pub async fn get_squad_by_id(
|
||||
State(state): State<AppState>,
|
||||
Path(squad_id): Path<String>,
|
||||
) -> AppResult<Json<Value>> {
|
||||
let profile = profile_svc::get_active_profile(&state.pool).await?;
|
||||
let club = club_svc::get_club_by_profile(&state.pool, &profile.id).await?;
|
||||
|
||||
let (squad, players) = squad_svc::get_squad_by_id(&state.pool, &club.id, &squad_id).await?;
|
||||
let chemistry = squad_svc::calculate_chemistry(&state.pool, &state.card_db, &players).await?;
|
||||
|
||||
Ok(Json(squad_response(&squad, &players, chemistry)))
|
||||
}
|
||||
|
||||
pub async fn post_squad(
|
||||
@@ -53,3 +55,42 @@ pub async fn post_squad(
|
||||
let squad = squad_svc::save_squad(&state.pool, &club.id, &req).await?;
|
||||
Ok(Json(json!({ "squad": squad })))
|
||||
}
|
||||
|
||||
pub async fn delete_squad(
|
||||
State(state): State<AppState>,
|
||||
Path(squad_id): Path<String>,
|
||||
) -> AppResult<Json<Value>> {
|
||||
let profile = profile_svc::get_active_profile(&state.pool).await?;
|
||||
let club = club_svc::get_club_by_profile(&state.pool, &profile.id).await?;
|
||||
squad_svc::delete_squad(&state.pool, &club.id, &squad_id).await?;
|
||||
Ok(Json(json!({ "deleted": squad_id })))
|
||||
}
|
||||
|
||||
fn squad_response(
|
||||
squad: &crate::models::squad::Squad,
|
||||
players: &[crate::models::squad::SquadPlayer],
|
||||
chemistry: Value,
|
||||
) -> Value {
|
||||
let enriched: Vec<Value> = players
|
||||
.iter()
|
||||
.map(|sp| {
|
||||
json!({
|
||||
"squad_player_id": sp.id,
|
||||
"owned_card_id": sp.owned_card_id,
|
||||
"position_index": sp.position_index,
|
||||
"is_captain": sp.is_captain,
|
||||
"is_on_bench": sp.is_on_bench,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
json!({
|
||||
"squad": {
|
||||
"id": squad.id,
|
||||
"name": squad.name,
|
||||
"formation": squad.formation,
|
||||
},
|
||||
"players": enriched,
|
||||
"chemistry": chemistry,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user