fix(5.19): corectii UX/retentie held (findings #2-#6 /code-review high)
#2 Filtrul "doar tinute" (held=1) devine persistent: hidden #f-held in #filtre-trimiteri sincronizat prin OOB din _submissions.html + paginare pastreaza held=1; chip "Doar tinute manual / Arata tot" ca off-switch. Param `held` schimbat la str (held= gol nu mai da 422 la coercion). #3 Banner bulk "Trimite toate (N)" extras in _bulk_held_banner.html si re-randat prin OOB (#bulk-held-banner-wrap) la fiecare reincarcare a listei -> nu mai ramane stale dupa eliberari (count revine la 0). #4 tools/carantina_held seteaza purge_after (blocked_retention_days) pe randurile carantinate -> PII nu mai sta la nesfarsit (purge_expired le poate sterge). #5 Panoul de detaliu marcheaza randul tinut (eticheta amber) si ofera buton "Trimite acum la RAR" (paritate cu randul din lista). #6 expire_held seteaza purge_after=now-1s -> randul expirat e purjabil in ACELASI ciclu (purge_expired foloseste comparatie stricta), nu la ciclul urmator. Teste noi: stickiness held + banner OOB + detaliu buton (test_web_auto_send), purge_after carantina, purge acelasi-ciclu (test_worker_held). 1541 passed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Agent
@@ -269,6 +269,20 @@ def _held_counts(conn, account_id: int) -> tuple[int, int]:
|
||||
return (int(row["manual"] or 0), int(row["aged"] or 0))
|
||||
|
||||
|
||||
def _held_bulk_ctx(conn, account_id: int) -> dict:
|
||||
"""Context partajat pentru banner-ul bulk "Trimite toate (N)" + mediul RAR tinta.
|
||||
|
||||
Randat in _submissions.html la FIECARE reincarcare a listei (nu doar la incarcarea Acasa),
|
||||
ca sa nu ramana stale dupa eliberari (fix /code-review #3). `held_manual_count` = total
|
||||
randuri tinute ale contului (independent de filtrul tabelului).
|
||||
"""
|
||||
manual, _aged = _held_counts(conn, account_id)
|
||||
return {
|
||||
"held_manual_count": manual,
|
||||
"env_bulk": rar_env_efectiv_cont(conn, account_id) or "prod",
|
||||
}
|
||||
|
||||
|
||||
def _trimiteri_versiune(conn, account_id: int) -> str:
|
||||
"""Semnatura ieftina a starii trimiterilor contului: numar randuri + cel mai recent
|
||||
updated_at. Se schimba la orice insert/update/delete -> nudge-ul "Date noi" o compara
|
||||
@@ -1126,7 +1140,7 @@ def fragment_submissions(
|
||||
vehicul: str | None = None,
|
||||
data_de: str | None = None,
|
||||
data_pana: str | None = None,
|
||||
held: int | None = None,
|
||||
held: str | None = None,
|
||||
page: int = 1,
|
||||
) -> HTMLResponse:
|
||||
"""Tabel Trimiteri, scoped pe cont, cu filtre optionale si paginare.
|
||||
@@ -1141,7 +1155,10 @@ def fragment_submissions(
|
||||
vehicul_q = (vehicul or "").strip().upper() or None
|
||||
data_de = (data_de or "").strip() or None
|
||||
data_pana = (data_pana or "").strip() or None
|
||||
filtru_activ = bool(status or vehicul_q or data_de or data_pana or held == 1)
|
||||
# `held` vine ca query string ("1" din deep-link/form; "" cand filtrul e oprit — nu int,
|
||||
# altfel un `held=` gol ar da 422 la coercion). Normalizat la bool intern.
|
||||
held_activ = (held or "").strip() == "1"
|
||||
filtru_activ = bool(status or vehicul_q or data_de or data_pana or held_activ)
|
||||
filtru_python = bool(vehicul_q or data_de or data_pana) # filtru care necesita Python
|
||||
|
||||
page = max(1, page) # pre-clamp >= 1
|
||||
@@ -1156,7 +1173,7 @@ def fragment_submissions(
|
||||
params.append(status)
|
||||
# US-007 (PRD 5.19): deep-link banner "coada tinuta" -> lista filtrata pe tinute
|
||||
# (queued AND held=1). Filtru derivat, fara stare noua.
|
||||
if held == 1:
|
||||
if held_activ:
|
||||
where.append("held=1")
|
||||
where_sql = " AND ".join(where)
|
||||
|
||||
@@ -1231,10 +1248,15 @@ def fragment_submissions(
|
||||
"f_vehicul": vehicul_q or "",
|
||||
"f_data_de": data_de or "",
|
||||
"f_data_pana": data_pana or "",
|
||||
# US-007 (5.19): filtrul "doar tinute" persistat prin OOB pe #f-held + paginare
|
||||
# (fix /code-review #2 — altfel se pierdea la reincarcare/paginare).
|
||||
"f_held": "1" if held_activ else "",
|
||||
# Pill-uri (OOB) + stare activa + versiune pentru nudge-ul "Date noi".
|
||||
"pills_categorii": _pills_categorii(_status_counts(conn, account_id)),
|
||||
"status_filtru": status or "",
|
||||
"versiune_trimiteri": _trimiteri_versiune(conn, account_id),
|
||||
# US-005 (5.19): banner bulk "Trimite toate" re-randat la fiecare reincarcare.
|
||||
**_held_bulk_ctx(conn, account_id),
|
||||
})
|
||||
finally:
|
||||
conn.close()
|
||||
@@ -1270,8 +1292,11 @@ def _render_submissions(request: Request, conn, account_id: int,
|
||||
"csrf_token": get_csrf_token(request),
|
||||
"pills_categorii": _pills_categorii(_status_counts(conn, account_id)),
|
||||
"status_filtru": "",
|
||||
"f_held": "", # lista fara filtre -> curata OOB filtrul "doar tinute"
|
||||
"versiune_trimiteri": _trimiteri_versiune(conn, account_id),
|
||||
"bulk_message": message, # US-010 (PRD 5.15): sumar bulk-fix
|
||||
# US-005 (5.19): banner bulk "Trimite toate" reflecta held count curent (fix staleness).
|
||||
**_held_bulk_ctx(conn, account_id),
|
||||
})
|
||||
|
||||
|
||||
@@ -1377,7 +1402,11 @@ def _detaliu_ctx(request: Request, row, *, message: str | None = None,
|
||||
`conn`+`account_id` (optional): cand sunt date si randul e needs_mapping, expune
|
||||
`nemapate_inline` + `nomenclator` pentru maparea inline din panou.
|
||||
"""
|
||||
eticheta = eticheta_stare(row["status"])
|
||||
# US-006/US-010 (PRD 5.19): un rand `queued AND held=1` e tinut manual -> eticheta de
|
||||
# avertizare + afordanta de eliberare in panoul de detaliu (paritate cu rândul din listă).
|
||||
tinut = (bool(row["held"]) if ("held" in row.keys() and row["held"] is not None) else False) \
|
||||
and row["status"] == "queued"
|
||||
eticheta = eticheta_stare(row["status"], held=tinut)
|
||||
nemapate_inline: list[dict] = []
|
||||
nomenclator: list[dict] = []
|
||||
# Nomenclatorul complet, incarcat pentru needs_mapping si refolosit mai jos.
|
||||
@@ -1428,6 +1457,8 @@ def _detaliu_ctx(request: Request, row, *, message: str | None = None,
|
||||
"editabil": row["status"] in _CORECTABILE,
|
||||
# error/needs_data/needs_mapping pot fi sterse / re-puse in coada
|
||||
"gestionabil": row["status"] in _GESTIONABILE_WEB,
|
||||
# US-006/US-010 (5.19): rand tinut manual (queued AND held=1) -> buton "Trimite acum".
|
||||
"tinut": tinut,
|
||||
# US-010 (PRD 5.20): mediul RAR tinta — badge in detaliu.
|
||||
"rar_env": row["rar_env"] if "rar_env" in row.keys() else None,
|
||||
# mapare inline (operatii nemapate ale acestui rand + nomenclator)
|
||||
|
||||
42
app/web/templates/_bulk_held_banner.html
Normal file
42
app/web/templates/_bulk_held_banner.html
Normal file
@@ -0,0 +1,42 @@
|
||||
{#
|
||||
_bulk_held_banner.html — banner bulk "Trimite toate (N)" (PRD 5.19 US-005).
|
||||
|
||||
N = randuri tinute ale contului (queued AND held=1). Randat:
|
||||
- initial in _coada.html (banner_oob nesetat -> fara OOB);
|
||||
- RE-RANDAT prin OOB (banner_oob=true) din _submissions.html la FIECARE reincarcare a
|
||||
listei, ca sa nu ramana stale dupa eliberari (fix /code-review #3).
|
||||
|
||||
Wrapper cu id STABIL #bulk-held-banner-wrap: OOB outerHTML il inlocuieste mereu (chiar si
|
||||
gol la N=0), ca id-ul sa ramana tinta pentru urmatorul OOB. Confirmare tipata prin modal
|
||||
(count + mediu RAR), NU hx-confirm.
|
||||
#}
|
||||
<div id="bulk-held-banner-wrap"{% if banner_oob %} hx-swap-oob="outerHTML"{% endif %}>
|
||||
{% if held_manual_count|default(0) %}
|
||||
<div style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; margin:0 0 10px;
|
||||
padding:8px 10px; border-left:3px solid var(--warn);
|
||||
background:color-mix(in srgb, var(--warn) 10%, var(--card)); border-radius:6px;">
|
||||
<span style="font-size:var(--fs-sm);">
|
||||
<strong>{{ held_manual_count }}</strong>
|
||||
{{ 'prezentare tinuta' if held_manual_count == 1 else 'prezentari tinute' }} manual.
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var m=document.getElementById('modal-trimite-toate'); if(m){m.hidden=false;}"
|
||||
style="margin-left:auto; padding:4px 12px; font-size:13px; border-radius:6px;
|
||||
border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; cursor:pointer;">
|
||||
Trimite toate ({{ held_manual_count }})
|
||||
</button>
|
||||
</div>
|
||||
{% set cf_id = 'modal-trimite-toate' %}
|
||||
{% set cf_titlu = 'Trimiti toate prezentarile tinute?' %}
|
||||
{% set cf_count = held_manual_count %}
|
||||
{% set cf_env = env_bulk | default('prod') %}
|
||||
{% set cf_url = '/trimite-toate' %}
|
||||
{% set cf_vals = '{}' %}
|
||||
{% set cf_target = '#submissions-wrap' %}
|
||||
{% set cf_swap = 'innerHTML' %}
|
||||
{% set cf_confirm_label = 'Trimite toate (' ~ held_manual_count ~ ')' %}
|
||||
{% set cf_deschis = false %}
|
||||
{% include '_modal_confirma_trimitere.html' %}
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -11,36 +11,9 @@
|
||||
aria-labelledby). Badge-ul de atentie + export CSV stau intr-un rand discret. #}
|
||||
<h2 id="trimiteri-heading" class="sr-only">Trimiterile tale</h2>
|
||||
|
||||
{# US-005 (PRD 5.19): bulk "Trimite toate (N)" — N = randuri tinute (queued AND held=1).
|
||||
Ascuns cand N=0. Confirmare tipata prin modal (count + mediu RAR), NU hx-confirm. #}
|
||||
{% if held_manual_count|default(0) %}
|
||||
<div style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; margin:0 0 10px;
|
||||
padding:8px 10px; border-left:3px solid var(--warn);
|
||||
background:color-mix(in srgb, var(--warn) 10%, var(--card)); border-radius:6px;">
|
||||
<span style="font-size:var(--fs-sm);">
|
||||
<strong>{{ held_manual_count }}</strong>
|
||||
{{ 'prezentare tinuta' if held_manual_count == 1 else 'prezentari tinute' }} manual.
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var m=document.getElementById('modal-trimite-toate'); if(m){m.hidden=false;}"
|
||||
style="margin-left:auto; padding:4px 12px; font-size:13px; border-radius:6px;
|
||||
border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; cursor:pointer;">
|
||||
Trimite toate ({{ held_manual_count }})
|
||||
</button>
|
||||
</div>
|
||||
{% set cf_id = 'modal-trimite-toate' %}
|
||||
{% set cf_titlu = 'Trimiti toate prezentarile tinute?' %}
|
||||
{% set cf_count = held_manual_count %}
|
||||
{% set cf_env = env_bulk | default('prod') %}
|
||||
{% set cf_url = '/trimite-toate' %}
|
||||
{% set cf_vals = '{}' %}
|
||||
{% set cf_target = '#submissions-wrap' %}
|
||||
{% set cf_swap = 'innerHTML' %}
|
||||
{% set cf_confirm_label = 'Trimite toate (' ~ held_manual_count ~ ')' %}
|
||||
{% set cf_deschis = false %}
|
||||
{% include '_modal_confirma_trimitere.html' %}
|
||||
{% endif %}
|
||||
{# US-005 (PRD 5.19): bulk "Trimite toate (N)". Randat initial aici; re-randat prin OOB
|
||||
din _submissions.html la fiecare reincarcare a listei (fix staleness /code-review #3). #}
|
||||
{% include '_bulk_held_banner.html' %}
|
||||
|
||||
{% if blocate_total %}
|
||||
<div style="display:flex; align-items:center; gap:6px; flex-wrap:wrap; margin:0 0 10px;">
|
||||
@@ -71,6 +44,9 @@
|
||||
<input type="hidden" id="f-status" name="status" value="{{ status_filtru | default('', true) }}">
|
||||
{# Pagina curenta — actualizata prin OOB swap din _submissions.html; inclusa la reincarcari. #}
|
||||
<input type="hidden" id="f-page" name="page" value="1">
|
||||
{# US-007 (5.19): filtrul "doar tinute" — persistat prin OOB din _submissions.html, ca sa
|
||||
nu se piarda la reincarcare (trimiteriChanged) sau paginare (fix /code-review #2). #}
|
||||
<input type="hidden" id="f-held" name="held" value="{{ f_held | default('') }}">
|
||||
|
||||
{# === STANGA: Quick-pills de data (preset interval) + buton Custom ===
|
||||
Azi / 7 zile / 30 zile → seteaza interval preset si submitr automat.
|
||||
|
||||
@@ -5,6 +5,13 @@
|
||||
#}
|
||||
<input type="hidden" id="f-page" name="page" value="{{ page | default(1) }}" hx-swap-oob="true">
|
||||
|
||||
{# OOB: sincronizeaza filtrul "doar tinute" (#f-held) cu starea randata acum, ca reincarcarile
|
||||
(trimiteriChanged / paginare) sa-l pastreze in loc sa revina la lista completa (/code-review #2). #}
|
||||
<input type="hidden" id="f-held" name="held" value="{{ f_held | default('') }}" hx-swap-oob="true">
|
||||
|
||||
{# OOB: banner bulk "Trimite toate (N)" re-randat la fiecare reincarcare a listei (fix staleness). #}
|
||||
{% with banner_oob = true %}{% include '_bulk_held_banner.html' %}{% endwith %}
|
||||
|
||||
{# OOB: re-randeaza pill-urile de stare (in bara de filtre, in afara #submissions-wrap) cu
|
||||
contoarele si starea activa proaspete la fiecare reincarcare a tabelului. #}
|
||||
<span hx-swap-oob="innerHTML:#pills-categorii">{% include '_pills.html' %}</span>
|
||||
@@ -22,6 +29,23 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# US-007 (5.19): chip filtru activ "doar tinute" cu buton de golire (fix /code-review #2 —
|
||||
filtrul held e sticky prin OOB, deci ii dam un off-switch explicit). #}
|
||||
{% if f_held %}
|
||||
<div style="display:flex; align-items:center; gap:8px; margin-bottom:8px; font-size:var(--fs-sm);">
|
||||
<span style="display:inline-flex; align-items:center; gap:6px; padding:2px 10px; border-radius:99px;
|
||||
border:1px solid var(--warn); color:var(--warn); font-weight:600;">
|
||||
Doar tinute manual
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var h=document.getElementById('f-held'); if(h){h.value='';} var f=document.getElementById('filtre-trimiteri'); if(f&&window.htmx){htmx.trigger(f,'submit');}"
|
||||
style="background:none; border:none; color:var(--muted); cursor:pointer;
|
||||
text-decoration:underline; font-size:var(--fs-sm);">
|
||||
Arata tot
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if rows %}
|
||||
{# Form bulk cu DOUA actiuni: (1) aplica cod RAR la selectate (bulk-fix, US-010),
|
||||
(2) sterge selectate (sterge-bulk). Selectia opereaza DOAR pe randuri blocate
|
||||
@@ -196,6 +220,7 @@
|
||||
{% if f_vehicul %}{% set pq = pq + "&vehicul=" + f_vehicul %}{% endif %}
|
||||
{% if f_data_de %}{% set pq = pq + "&data_de=" + f_data_de %}{% endif %}
|
||||
{% if f_data_pana %}{% set pq = pq + "&data_pana=" + f_data_pana %}{% endif %}
|
||||
{% if f_held %}{% set pq = pq + "&held=" + f_held %}{% endif %}
|
||||
|
||||
<nav aria-label="Paginare trimiteri"
|
||||
style="display:flex; justify-content:center; gap:4px; flex-wrap:wrap; margin-top:10px;">
|
||||
|
||||
@@ -150,6 +150,29 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# === Rand tinut manual (queued AND held=1) — afordanta de eliberare (US-005/US-010, 5.19).
|
||||
Buton dedicat „Trimite acum": elibereaza randul (held 1->0); worker-ul il preia la
|
||||
urmatorul poll. Reincarca lista + inchide modalul. Confirmare 1-linie (ireversibil). === #}
|
||||
{% if tinut %}
|
||||
<div class="detaliu-actiuni-jos" style="margin-top:14px; padding-top:12px; border-top:1px solid var(--line);">
|
||||
<p class="muted" style="margin:0 0 8px; font-size:12.5px;">
|
||||
Prezentare tinuta manual — nu a plecat la RAR. Elibereaz-o pentru trimitere.
|
||||
</p>
|
||||
<form hx-post="/trimitere/{{ id }}/trimite-acum"
|
||||
hx-target="#submissions-wrap" hx-swap="innerHTML"
|
||||
hx-confirm="Trimit aceasta prezentare la RAR? Declararea este ireversibila (FINALIZATA)."
|
||||
hx-on::after-request="document.getElementById('modal-detaliu').hidden=true"
|
||||
hx-disabled-elt="find button" style="margin:0;">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
||||
<button type="submit"
|
||||
style="border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; padding:6px 16px; border-radius:6px; cursor:pointer;">
|
||||
Trimite acum la RAR
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# === Actiuni de jos — primar Re-pune (doar error) + Sterge pe RAND SEPARAT === #}
|
||||
{% if status == 'error' or gestionabil %}
|
||||
<div class="detaliu-actiuni-jos" style="margin-top:14px; padding-top:12px; border-top:1px solid var(--line);">
|
||||
|
||||
@@ -149,8 +149,12 @@ def expire_held(conn, settings: Settings) -> int:
|
||||
blocat -> altfel NU primeste `purge_after` -> PII criptat ar sta la nesfarsit.
|
||||
Le trece la `error`/`TINUT_EXPIRAT` (terminal) si seteaza `purge_after` DIRECT la
|
||||
momentul expirarii (NU lasa retentia de 30z a randurilor blocate sa se adauge; altfel
|
||||
viata reala = 90 + 30 = 120 zile, nu 90). Randul devine imediat purjabil de
|
||||
`purge_expired` (purge_after < now) la urmatorul ciclu.
|
||||
viata reala = 90 + 30 = 120 zile, nu 90). `purge_after` e setat cu o secunda IN TRECUT
|
||||
(`datetime('now','-1 second')`): `purge_expired` foloseste comparatie STRICTA
|
||||
(`purge_after < datetime('now')`), iar `datetime('now')` are rezolutie de o secunda —
|
||||
cu `purge_after=now` cele doua ar fi egale in acelasi ciclu si randul NU s-ar purja
|
||||
decat la ciclul urmator (~1h de PII in plus). Cu `-1 second` randul e purjabil IMEDIAT
|
||||
in acelasi ciclu de purjare (US-008 inchide gaura strict).
|
||||
|
||||
Intoarce numarul de randuri expirate.
|
||||
"""
|
||||
@@ -159,7 +163,7 @@ def expire_held(conn, settings: Settings) -> int:
|
||||
cutoff = f"-{days} days"
|
||||
cur = conn.execute(
|
||||
"UPDATE submissions SET status='error', rar_error='TINUT_EXPIRAT', "
|
||||
"purge_after=datetime('now'), sending_since=NULL, updated_at=datetime('now') "
|
||||
"purge_after=datetime('now', '-1 second'), sending_since=NULL, updated_at=datetime('now') "
|
||||
"WHERE status='queued' AND held=1 AND created_at < datetime('now', ?)",
|
||||
(cutoff,),
|
||||
)
|
||||
@@ -562,7 +566,8 @@ def run() -> int:
|
||||
now_ts = time.time()
|
||||
if now_ts - _last_purge_time >= _PURGE_INTERVAL_S:
|
||||
# Expira intai randurile tinute imbatranite (US-008), apoi purjeaza:
|
||||
# un rand expirat cu purge_after=now devine imediat purjabil in acelasi ciclu.
|
||||
# expire_held seteaza purge_after=now-1s -> randul e purjabil IMEDIAT in
|
||||
# acelasi ciclu (purge_expired foloseste comparatie stricta purge_after<now).
|
||||
expired = expire_held(conn, settings)
|
||||
if expired:
|
||||
_wlog(conn, "held_expirat",
|
||||
|
||||
@@ -63,6 +63,12 @@ def test_carantineaza_rand_tinut(env, capsys):
|
||||
r = _row(conn, sid)
|
||||
assert r["status"] == "error"
|
||||
assert r["rar_error"] == "ROLLBACK_QUARANTINE"
|
||||
# /code-review #4: randul carantinat primeste purge_after (altfel PII ar sta la nesfarsit,
|
||||
# purge_expired sterge doar randuri cu purge_after setat).
|
||||
assert r["purge_after"] is not None
|
||||
assert conn.execute(
|
||||
"SELECT purge_after > datetime('now') AS ok FROM submissions WHERE id=?", (sid,)
|
||||
).fetchone()["ok"] == 1
|
||||
|
||||
|
||||
def test_dry_run_nu_modifica(env, capsys):
|
||||
|
||||
@@ -345,3 +345,86 @@ def test_audit_held_eliberat_bulk(client):
|
||||
client.post("/trimite-toate", data={"csrf_token": csrf})
|
||||
evs = _events(aid, "held_eliberat")
|
||||
assert len(evs) >= 1
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# /code-review (fix findings #2/#3/#5): stickiness filtru held, banner OOB, #
|
||||
# afordanta de eliberare in panoul de detaliu. #
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
||||
def test_fragment_held_gol_nu_da_422(client):
|
||||
"""Formularul include mereu `held` (gol cand filtrul e oprit) -> `held=` NU trebuie 422."""
|
||||
aid = _account_user("k1@test.com")
|
||||
_login(client, "k1@test.com")
|
||||
_ins(aid, "queued", held=0)
|
||||
resp = client.get("/_fragments/submissions?held=")
|
||||
assert resp.status_code == 200, resp.text[:200]
|
||||
|
||||
|
||||
def test_fragment_held_1_filtreaza_si_persista_oob(client):
|
||||
"""?held=1 -> doar randuri tinute + OOB #f-held=1 (sticky la reincarcari) + chip 'Arata tot'."""
|
||||
aid = _account_user("k2@test.com")
|
||||
_login(client, "k2@test.com")
|
||||
sid_tinut = _ins(aid, "queued", held=1)
|
||||
_ins(aid, "sent", held=0)
|
||||
resp = client.get("/_fragments/submissions?held=1")
|
||||
assert resp.status_code == 200
|
||||
# OOB sincronizeaza filtrul in form ca sa nu se piarda la trimiteriChanged/paginare.
|
||||
assert re.search(r'id="f-held"[^>]*value="1"[^>]*hx-swap-oob', resp.text) or \
|
||||
re.search(r'id="f-held"[^>]*hx-swap-oob[^>]*value="1"', resp.text), resp.text[:400]
|
||||
assert "Arata tot" in resp.text
|
||||
# Paginare (daca apare) pastreaza held=1.
|
||||
if "Paginare" in resp.text:
|
||||
assert "held=1" in resp.text
|
||||
|
||||
|
||||
def test_fragment_lista_curata_reseteaza_f_held(client):
|
||||
"""Reincarcarea listei fara filtre (dupa actiune) reseteaza #f-held la gol via OOB."""
|
||||
aid = _account_user("k3@test.com")
|
||||
csrf = _login(client, "k3@test.com")
|
||||
sid = _ins(aid, "queued", held=1)
|
||||
# trimite-acum -> _render_submissions (fara filtre) -> OOB f-held=""
|
||||
resp = client.post(f"/trimitere/{sid}/trimite-acum", data={"csrf_token": csrf})
|
||||
assert resp.status_code == 200
|
||||
assert re.search(r'id="f-held"[^>]*value=""[^>]*hx-swap-oob', resp.text) or \
|
||||
re.search(r'id="f-held"[^>]*hx-swap-oob[^>]*value=""', resp.text), resp.text[:400]
|
||||
|
||||
|
||||
def test_banner_bulk_dispare_dupa_eliberare(client):
|
||||
"""Banner 'Trimite toate (N)' e OOB (#bulk-held-banner-wrap): dupa eliberarea tuturor
|
||||
randurilor tinute, wrapper-ul revine gol (fara buton) — nu mai ramane stale (#3)."""
|
||||
aid = _account_user("k4@test.com")
|
||||
csrf = _login(client, "k4@test.com")
|
||||
_ins(aid, "queued", held=1)
|
||||
_ins(aid, "queued", held=1)
|
||||
# Inainte: fragmentul contine bannerul cu butonul.
|
||||
r0 = client.get("/_fragments/submissions")
|
||||
assert 'id="bulk-held-banner-wrap"' in r0.text
|
||||
assert "Trimite toate" in r0.text
|
||||
# Elibereaza toate -> wrapper OOB re-randat gol (fara buton).
|
||||
r1 = client.post("/trimite-toate", data={"csrf_token": csrf})
|
||||
assert r1.status_code == 200
|
||||
assert 'id="bulk-held-banner-wrap"' in r1.text
|
||||
assert "Trimite toate" not in r1.text
|
||||
|
||||
|
||||
def test_detaliu_rand_tinut_are_buton_trimite_acum(client):
|
||||
"""Panoul de detaliu al unui rand tinut (queued AND held=1) arata eticheta manuala +
|
||||
buton 'Trimite acum la RAR' (#5)."""
|
||||
aid = _account_user("k5@test.com")
|
||||
_login(client, "k5@test.com")
|
||||
sid = _ins(aid, "queued", held=1)
|
||||
resp = client.get(f"/_fragments/trimitere/{sid}")
|
||||
assert resp.status_code == 200, resp.text[:200]
|
||||
assert "Trimite acum la RAR" in resp.text
|
||||
assert f"/trimitere/{sid}/trimite-acum" in resp.text
|
||||
|
||||
|
||||
def test_detaliu_rand_queued_neted_fara_buton(client):
|
||||
"""Un rand queued NEtinut (held=0) NU arata butonul de eliberare in detaliu."""
|
||||
aid = _account_user("k6@test.com")
|
||||
_login(client, "k6@test.com")
|
||||
sid = _ins(aid, "queued", held=0)
|
||||
resp = client.get(f"/_fragments/trimitere/{sid}")
|
||||
assert resp.status_code == 200
|
||||
assert "Trimite acum la RAR" not in resp.text
|
||||
|
||||
@@ -178,7 +178,8 @@ def test_expire_held_ignora_rand_neted_vechi(env):
|
||||
|
||||
|
||||
def test_expire_held_apoi_purge_sterge_randul(env):
|
||||
"""Lant complet: expire_held (purge_after ~now) -> purge_expired sterge randul (PII purjat)."""
|
||||
"""Lant complet ACELASI CICLU: expire_held (purge_after=now-1s) -> purge_expired
|
||||
sterge randul imediat (PII purjat), fara sa astepte ciclul urmator (fix /code-review #6)."""
|
||||
from app.accounts import create_account
|
||||
from app.worker.__main__ import expire_held, purge_expired
|
||||
|
||||
@@ -188,17 +189,9 @@ def test_expire_held_apoi_purge_sterge_randul(env):
|
||||
conn.execute("UPDATE submissions SET created_at=datetime('now','-100 days') WHERE id=?", (sid,))
|
||||
|
||||
assert expire_held(conn, settings) == 1
|
||||
# purge_after=datetime('now') (moment expirarii). La URMATORUL ciclu de purjare
|
||||
# (o data pe ora) purge_after < now -> se sterge. Simulam trecerea timpului
|
||||
# (>= 1s) verificand ca purge_after e deja in trecutul acelui ciclu ulterior.
|
||||
assert conn.execute(
|
||||
"SELECT purge_after < datetime('now','+1 second') AS ok FROM submissions WHERE id=?",
|
||||
(sid,),
|
||||
).fetchone()["ok"] == 1
|
||||
conn.execute(
|
||||
"UPDATE submissions SET purge_after=datetime('now','-1 second') WHERE id=?", (sid,)
|
||||
)
|
||||
# expire_held seteaza purge_after=now-1s -> purge_expired (purge_after < now strict) il
|
||||
# sterge in ACELASI ciclu, fara nudge manual de timp.
|
||||
stats = purge_expired(conn)
|
||||
|
||||
assert stats["submissions_purged"] >= 1
|
||||
assert _row(conn, sid) is None, "randul expirat trebuia sters de purge_expired la ciclul ulterior"
|
||||
assert _row(conn, sid) is None, "randul expirat trebuia sters de purge_expired in acelasi ciclu"
|
||||
|
||||
@@ -36,13 +36,20 @@ def carantina(conn: sqlite3.Connection, dry_run: bool = False) -> int:
|
||||
"""Carantineaza randurile tinute. Intoarce numarul de randuri afectate.
|
||||
|
||||
Cu `dry_run=True` doar numara (nu modifica nimic).
|
||||
|
||||
Seteaza si `purge_after` (retentia randurilor blocate, `blocked_retention_days`): fara
|
||||
el un rand `error` iesit din `queued` NU primeste niciodata purge_after -> PII criptat
|
||||
ar sta la nesfarsit (`purge_expired` sterge doar randuri cu purge_after setat). Aliniat
|
||||
cu calea normala worker `error` (/code-review #4).
|
||||
"""
|
||||
n = _count(conn)
|
||||
if dry_run or n == 0:
|
||||
return n
|
||||
from app.config import get_settings
|
||||
days = int(get_settings().blocked_retention_days)
|
||||
conn.execute(
|
||||
"UPDATE submissions SET status='error', rar_error='ROLLBACK_QUARANTINE', "
|
||||
f"updated_at=datetime('now') WHERE {_WHERE}"
|
||||
f"purge_after=datetime('now', '+{days} days'), updated_at=datetime('now') WHERE {_WHERE}"
|
||||
)
|
||||
return n
|
||||
|
||||
|
||||
Reference in New Issue
Block a user