Persons: other people's charts with package slots, list page, switcher
- charts.kind own/person; a new person uses a 'person' unit (not refunded on delete); person packages and an unlimited entitlement; admins unlimited - a person's birth data can be corrected within an hour (admins any time) - /kepletek list with tiles, /kepletek/uj, correction page, mock person packages, chart page title switches between charts keeping the tab Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -752,3 +752,78 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "natal"})).await;
|
||||
assert_eq!(r.status, StatusCode::NOT_FOUND);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn persons_use_package_slots(pool: PgPool) {
|
||||
let app = TestApp::with_config(pool, |c| {
|
||||
c.free_person_slots = 1;
|
||||
c.person_pack_size = 2;
|
||||
})
|
||||
.await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||
assert_eq!(own["kind"], "own");
|
||||
let persons = |me: Value| me["persons"].clone();
|
||||
assert_eq!(
|
||||
persons(app.get("/v1/me", Some(&anna)).await.body),
|
||||
json!({"used": 0, "limit": 1, "left": 1, "unlimited": false})
|
||||
);
|
||||
|
||||
// the free slot, then the limit; deleting does not give the slot back
|
||||
let first = app.chart(&anna, "Béla", false, "1985-08-02").await;
|
||||
assert_eq!((&first["kind"], first["editable_until"].is_string()), (&json!("person"), true));
|
||||
let new_person = |date: &str| json!({"label": "Cili", "birth": {"date": date, "time": "14:30", "country": "HU", "place": "Szeged"}});
|
||||
let r = app.post("/v1/charts", Some(&anna), new_person("1986-01-01")).await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_limit_reached")));
|
||||
assert_eq!(r.body["error"]["message"], crate::persons::LIMIT_MESSAGE);
|
||||
let r = app.call("DELETE", &format!("/v1/charts/{}", first["id"].as_str().unwrap()), Some(&anna), None).await;
|
||||
assert_eq!(r.status, StatusCode::NO_CONTENT);
|
||||
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 0);
|
||||
|
||||
// a package adds two slots
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons"})).await;
|
||||
assert_eq!(r.body["persons"], json!({"used": 1, "limit": 3, "left": 2, "unlimited": false}), "{}", r.body);
|
||||
let second = app.chart(&anna, "Cili", false, "1986-01-01").await;
|
||||
app.chart(&anna, "Dani", false, "1987-01-01").await;
|
||||
let r = app.post("/v1/charts", Some(&anna), new_person("1988-01-01")).await;
|
||||
assert_eq!(r.status, StatusCode::CONFLICT);
|
||||
|
||||
// the unlimited package
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons_unlimited"})).await;
|
||||
assert_eq!(r.body["persons"], json!({"used": 3, "limit": null, "left": null, "unlimited": true}));
|
||||
app.chart(&anna, "Emma", false, "1988-01-01").await;
|
||||
let list = app.get("/v1/charts", Some(&anna)).await.body;
|
||||
let kinds: Vec<&str> = list["charts"].as_array().unwrap().iter().map(|c| c["kind"].as_str().unwrap()).collect();
|
||||
assert_eq!(kinds, ["own", "person", "person", "person"]);
|
||||
assert_eq!(list["charts"][1]["birth"]["date"], "1988-01-01");
|
||||
|
||||
// a person's birth data can be corrected within an hour, then it is locked
|
||||
let id = second["id"].as_str().unwrap();
|
||||
let corrected = json!({"birth": {"date": "1986-01-02", "time": "10:00", "country": "HU", "place": "Szeged"}});
|
||||
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(corrected.clone())).await;
|
||||
assert_eq!((r.status, &r.body["birth_data"]["date"]), (StatusCode::OK, &json!("1986-01-02")), "{}", r.body);
|
||||
sqlx::query("UPDATE charts SET created_at = now() - interval '2 hours' WHERE id = $1::uuid")
|
||||
.bind(id)
|
||||
.execute(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(corrected.clone())).await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_locked")));
|
||||
let r =
|
||||
app.call("PATCH", &format!("/v1/charts/{}", own["id"].as_str().unwrap()), Some(&anna), Some(corrected)).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST);
|
||||
|
||||
// admins: no limit, corrections any time
|
||||
let admin = app.register("admin@example.com", "Admin").await;
|
||||
assert_eq!(persons(app.get("/v1/me", Some(&admin)).await.body)["unlimited"], true);
|
||||
let p = app.chart(&admin, "Feri", false, "1970-01-01").await;
|
||||
let pid = p["id"].as_str().unwrap();
|
||||
sqlx::query("UPDATE charts SET created_at = now() - interval '2 days' WHERE id = $1::uuid")
|
||||
.bind(pid)
|
||||
.execute(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let corrected = json!({"birth": {"date": "1970-01-02", "time": "10:00", "country": "HU", "place": "Szeged"}});
|
||||
let r = app.call("PATCH", &format!("/v1/charts/{pid}"), Some(&admin), Some(corrected)).await;
|
||||
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user