Packages: from one analysis to unlimited, admin can give them
A fixed catalog (packages.rs, reasoning in docs/csomagok.md): Egy elemzés
2 990 Ft, Páros 6 990 Ft, Család 11 990 Ft (featured), Korlátlan 17 990 Ft
for a year, and two top-ups. Every grant is a package_orders row; units are
credit_ledger rows with reason 'package' and never expire. The unlimited
package is a time-limited 'unlimited' entitlement: analyses use no unit and
persons have no limit, with a daily fair-use cap (UNLIMITED_DAILY_LIMIT, 5);
buying it again extends it by a year.
- GET /v1/packages, mock payment by package id, /v1/me unlimited_until
- POST /v1/admin/users/{id}/packages: give a package as a gift
- /csomagok page; the paid step of an analysis offers three packages with
the bigger one featured; person packs use the catalog; admin user list
has a package column
- PERSON_PACK_SIZE is replaced by the catalog's +5 személy top-up
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -755,11 +755,7 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
|
||||
|
||||
#[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 app = TestApp::with_config(pool, |c| c.free_person_slots = 1).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");
|
||||
@@ -780,16 +776,15 @@ async fn persons_use_package_slots(pool: PgPool) {
|
||||
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);
|
||||
// a person package adds five slots
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "addon_persons"})).await;
|
||||
assert_eq!(r.body["persons"], json!({"used": 1, "limit": 6, "left": 5, "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);
|
||||
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 3);
|
||||
|
||||
// the unlimited package
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons_unlimited"})).await;
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "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;
|
||||
@@ -991,3 +986,85 @@ async fn comparisons_with_persons(pool: PgPool) {
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_analysed")));
|
||||
assert_eq!(app.get("/v1/synastries", Some(&anna)).await.body["synastries"].as_array().unwrap().len(), 1);
|
||||
}
|
||||
|
||||
/// An admin (or not) gives `user` a package.
|
||||
async fn grant_package(app: &TestApp, token: &str, user: &str, package: &str) -> Response {
|
||||
let body = json!({"package": package, "note": "ajándék"});
|
||||
app.call("POST", &format!("/v1/admin/users/{user}/packages"), Some(token), Some(body)).await
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn packages_grant_units_and_unlimited(pool: PgPool) {
|
||||
let app = TestApp::new(pool.clone()).await;
|
||||
let admin = app.register("admin@example.com", "Admin").await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let anna_id = app.get("/v1/me", Some(&anna)).await.body["user"]["id"].as_str().unwrap().to_string();
|
||||
|
||||
// the catalog is public
|
||||
let r = app.get("/v1/packages", None).await;
|
||||
let ids: Vec<&str> = r.body["packages"].as_array().unwrap().iter().map(|p| p["id"].as_str().unwrap()).collect();
|
||||
assert_eq!(ids, ["single", "couple", "family", "unlimited", "addon_synastry", "addon_persons"]);
|
||||
assert_eq!(
|
||||
(&r.body["packages"][2]["badge"], &r.body["packages"][2]["per_analysis_huf"]),
|
||||
(&json!("Legnépszerűbb"), &json!(1090))
|
||||
);
|
||||
|
||||
// an admin gives a package as a gift
|
||||
assert_eq!(grant_package(&app, &anna, &anna_id, "family").await.status, StatusCode::FORBIDDEN);
|
||||
assert_eq!(grant_package(&app, &admin, &anna_id, "gold").await.status, StatusCode::NOT_FOUND);
|
||||
let r = grant_package(&app, &admin, &anna_id, "family").await;
|
||||
assert_eq!(
|
||||
(r.status, &r.body["analyses_left"]),
|
||||
(StatusCode::CREATED, &json!({"natal": 6, "synastry": 5})),
|
||||
"{}",
|
||||
r.body
|
||||
);
|
||||
let me = app.get("/v1/me", Some(&anna)).await.body;
|
||||
assert_eq!((&me["persons"]["limit"], &me["unlimited_until"]), (&json!(10), &Value::Null)); // 5 free + 5
|
||||
let (source, price): (String, i32) =
|
||||
sqlx::query_as("SELECT source, price_huf FROM package_orders WHERE package = 'family'")
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!((source.as_str(), price), ("admin", 0));
|
||||
|
||||
// a (mock) purchase adds to it and records the price
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "couple"})).await;
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 8, "synastry": 6}), "{}", r.body);
|
||||
let (price,): (i32,) =
|
||||
sqlx::query_as("SELECT price_huf FROM package_orders WHERE package = 'couple'").fetch_one(&pool).await.unwrap();
|
||||
assert_eq!(price, 6990);
|
||||
|
||||
// unlimited: a year, and a second one extends it
|
||||
let bela = app.register("bela@example.com", "Béla").await;
|
||||
let bela_id = app.get("/v1/me", Some(&bela)).await.body["user"]["id"].as_str().unwrap().to_string();
|
||||
grant_package(&app, &admin, &bela_id, "unlimited").await;
|
||||
let r = grant_package(&app, &admin, &bela_id, "unlimited").await;
|
||||
let until = time::OffsetDateTime::parse(
|
||||
r.body["unlimited_until"].as_str().unwrap(),
|
||||
&time::format_description::well_known::Rfc3339,
|
||||
)
|
||||
.unwrap();
|
||||
let days = (until - time::OffsetDateTime::now_utc()).whole_days();
|
||||
assert!((725..=733).contains(&days), "{days}");
|
||||
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["persons"]["unlimited"], true);
|
||||
|
||||
// analyses use no unit, up to the daily cap (3 in tests)
|
||||
for (i, date) in ["1980-01-01", "1981-01-01", "1982-01-01"].into_iter().enumerate() {
|
||||
let chart = app.chart(&bela, &format!("P{i}"), i == 0, date).await;
|
||||
let r = app
|
||||
.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&bela), None)
|
||||
.await;
|
||||
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(0)), "{}", r.body);
|
||||
}
|
||||
let fourth = app.chart(&bela, "P3", false, "1983-01-01").await;
|
||||
let uri = format!("/v1/charts/{}/analyses", fourth["id"].as_str().unwrap());
|
||||
let r = app.call("POST", &uri, Some(&bela), None).await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::TOO_MANY_REQUESTS, Some("fair_use_limit")));
|
||||
|
||||
// after it ends, units are needed again
|
||||
sqlx::query("UPDATE entitlements SET expires_at = now() - interval '1 day'").execute(&pool).await.unwrap();
|
||||
let r = app.call("POST", &uri, Some(&bela), None).await;
|
||||
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED);
|
||||
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["unlimited_until"], Value::Null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user