Souko/CCMA
1
0
Fork 0
mirror of https://git.hiabuto.net/C3MA/CCMA.git synced 2026-09-06 03:20:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run the housekeeper for a single member, optionally retroactively

Browse Source 
Add a "Hausmeister für dieses Mitglied" button to the member view. It
runs every rule scoped to just that member -- e.g. after editing a
contribution override or payment frequency, to recompute their claims on
demand instead of waiting for or triggering a full run over every
member. A checkbox lets the board force retroactive claim creation for
just that one run, without changing the application-wide default
setting.

Housekeeper.run() gained member_id and retroactive_claims parameters.
Scoping to one member skips the asset checks and leaves every other
member's tasks completely untouched, since their rules never ran this
pass and so fall outside the resolved-scope set that
_resolve_stale_tasks uses to decide what to clear.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Marcel Peterkau
2026-08-15 00:59:01 +02:00
co-authored by Claude Sonnet 5
parent c07bdff04e
commit ee99577b20
4 changed files with 191 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ccma/services/housekeeper.py
+44 -22
View File
@@ -6,7 +6,7 @@ import math
import os
import time
from contextlib import contextmanager
from dataclasses import dataclass, field
from dataclasses import dataclass, field, replace
from datetime import date, datetime
from pathlib import Path
from typing import Any
@@ -67,9 +67,23 @@ class Housekeeper:
today: date | None = None,
*,
member_delay: float = 0.0,
member_id: str | None = None,
retroactive_claims: bool | None = None,
) -> list[HousekeeperFinding]:
"""Run all rules. With `member_id`, only that member is (re-)evaluated --
asset checks are skipped and every other member's tasks are left untouched
(their rules never ran this pass, so they fall outside `successful_scopes`
and `_resolve_stale_tasks` can't touch them). `retroactive_claims`, if given,
overrides the configured setting for just this run without changing it
permanently -- e.g. to recompute one member's full claim history on demand
after a contribution change, without retroactively billing everyone else."""
current_date = today or date.today()
delay = _non_negative_delay(member_delay)
effective_settings = (
self.settings
if retroactive_claims is None
else replace(self.settings, retroactive_claims=retroactive_claims)
)
with _exclusive_lock(self.lock_path):
original = self._load_state()
working = copy.deepcopy(original)
@@ -78,32 +92,39 @@ class Housekeeper:
now = datetime.now().astimezone().isoformat(timespec="seconds")
items = _items_by_key(working)
successful_scopes: set[tuple[str, str]] = set()
member_ids = set(self.repository.list_member_ids())
all_member_ids = set(self.repository.list_member_ids())
asset_ids = set(self.repository.list_asset_ids())
_remove_orphaned_member_items(items, member_ids)
_remove_orphaned_member_items(items, all_member_ids)
_remove_orphaned_asset_items(items, asset_ids)
if member_id is not None:
if member_id not in all_member_ids:
raise RepositoryError(f"Mitglied nicht gefunden: {member_id}")
selected_member_ids = {member_id}
else:
selected_member_ids = all_member_ids
rules = load_rules(self.repository.root)
repository_config = self.repository.get_configuration()
for index, member_id in enumerate(sorted(member_ids)):
for index, current_member_id in enumerate(sorted(selected_member_ids)):
if index and delay:
time.sleep(delay)
try:
member, contributions = self.repository.preflight_member_record(member_id)
member, contributions = self.repository.preflight_member_record(current_member_id)
except RepositoryError as exc:
self._refresh_record_integrity_task(items, member_id, str(exc), run_id, now)
successful_scopes.add(("member-record-check", member_id))
self._refresh_record_integrity_task(items, current_member_id, str(exc), run_id, now)
successful_scopes.add(("member-record-check", current_member_id))
continue
successful_scopes.add(("member-record-check", member_id))
successful_scopes.add(("member-record-check", current_member_id))
self._refresh_hash_integrity_tasks(
items,
target_type="member",
target_id=member_id,
warnings=self.repository.member_hash_warnings(member_id),
target_id=current_member_id,
warnings=self.repository.member_hash_warnings(current_member_id),
run_id=run_id,
now=now,
)
successful_scopes.add(("member-hash-check", member_id))
successful_scopes.add(("member-hash-check", current_member_id))
for rule in rules:
scope = (rule.rule_id, member.member_id)
try:
@@ -111,7 +132,7 @@ class Housekeeper:
member=member,
contributions=contributions,
today=current_date,
settings=self.settings,
settings=effective_settings,
repository_config=repository_config,
)
actions = rule.evaluate(context)
@@ -141,16 +162,17 @@ class Housekeeper:
else:
successful_scopes.add(scope)
for asset_id in sorted(asset_ids):
self._refresh_hash_integrity_tasks(
items,
target_type="asset",
target_id=asset_id,
warnings=self.repository.asset_hash_warnings(asset_id),
run_id=run_id,
now=now,
)
successful_scopes.add(("asset-hash-check", asset_id))
if member_id is None:
for asset_id in sorted(asset_ids):
self._refresh_hash_integrity_tasks(
items,
target_type="asset",
target_id=asset_id,
warnings=self.repository.asset_hash_warnings(asset_id),
run_id=run_id,
now=now,
)
successful_scopes.add(("asset-hash-check", asset_id))
self._resolve_stale_tasks(items, successful_scopes, run_id, now)
working.update(