feat(platform-fulfillment): 按任务状态配置租约释放
This commit is contained in:
@@ -1564,6 +1564,76 @@ class TestAccountSelection(_Base):
|
||||
assert unlimited["leaseDurationMinutes"] is None
|
||||
assert lease.expires_at is None
|
||||
|
||||
def test_lease_policy_is_applied_by_task_state(self):
|
||||
self.account("state-policy-account")
|
||||
task = self.task()
|
||||
service.allocate_task(self.session, task_id=task.id, current=self.admin)
|
||||
lease = self.session.query(AccountLease).one()
|
||||
task = self.session.get(PlatformFulfillmentTask, task.id)
|
||||
|
||||
service.update_settings(
|
||||
self.session,
|
||||
lease_duration_minutes=60,
|
||||
completed_release_delay_minutes=30,
|
||||
manual_completed_release_delay_minutes=120,
|
||||
presale_waiting_release_ttl_minutes=None,
|
||||
manual_required_lease_ttl_minutes=90,
|
||||
order_match_started_at=NOW - timedelta(days=1),
|
||||
current=self.admin,
|
||||
)
|
||||
self.session.refresh(lease)
|
||||
assert lease.expires_at is not None
|
||||
|
||||
task.sale_mode = "presale"
|
||||
task.execution_status = "bound"
|
||||
task.exchange_status = "waiting_release"
|
||||
self.session.commit()
|
||||
service.update_settings(
|
||||
self.session,
|
||||
lease_duration_minutes=60,
|
||||
completed_release_delay_minutes=30,
|
||||
manual_completed_release_delay_minutes=120,
|
||||
presale_waiting_release_ttl_minutes=None,
|
||||
manual_required_lease_ttl_minutes=90,
|
||||
order_match_started_at=NOW - timedelta(days=1),
|
||||
current=self.admin,
|
||||
)
|
||||
self.session.refresh(lease)
|
||||
assert lease.expires_at is None
|
||||
|
||||
task.execution_status = "manual_required"
|
||||
task.exchange_status = "points_short"
|
||||
self.session.commit()
|
||||
service.update_settings(
|
||||
self.session,
|
||||
lease_duration_minutes=60,
|
||||
completed_release_delay_minutes=30,
|
||||
manual_completed_release_delay_minutes=120,
|
||||
presale_waiting_release_ttl_minutes=None,
|
||||
manual_required_lease_ttl_minutes=90,
|
||||
order_match_started_at=NOW - timedelta(days=1),
|
||||
current=self.admin,
|
||||
)
|
||||
self.session.refresh(lease)
|
||||
assert lease.expires_at is not None
|
||||
|
||||
task.execution_status = "completed"
|
||||
task.exchange_status = "manual_done"
|
||||
self.session.commit()
|
||||
service.update_settings(
|
||||
self.session,
|
||||
lease_duration_minutes=60,
|
||||
completed_release_delay_minutes=30,
|
||||
manual_completed_release_delay_minutes=120,
|
||||
presale_waiting_release_ttl_minutes=None,
|
||||
manual_required_lease_ttl_minutes=90,
|
||||
order_match_started_at=NOW - timedelta(days=1),
|
||||
current=self.admin,
|
||||
)
|
||||
self.session.refresh(lease)
|
||||
assert lease.status == "active"
|
||||
assert lease.expires_at is not None
|
||||
|
||||
|
||||
class TestBindingAndCompletion(_Base):
|
||||
def _allocated(self):
|
||||
@@ -2572,7 +2642,7 @@ class TestBindingAndCompletion(_Base):
|
||||
assert listed["items"][0]["bindTask"]["qrUrl"] == ""
|
||||
assert detail["task"]["bindTask"]["qrUrl"] == "https://example.com/private-qr"
|
||||
|
||||
def test_manual_completion_requires_bound_and_releases_lease(self):
|
||||
def test_manual_completion_requires_bound_and_keeps_review_window(self):
|
||||
task = self._allocated()
|
||||
task.binding_status = "bound"
|
||||
task.execution_status = "bound"
|
||||
@@ -2588,8 +2658,48 @@ class TestBindingAndCompletion(_Base):
|
||||
|
||||
assert detail["task"]["executionStatus"] == "completed"
|
||||
assert detail["task"]["exchangeStatus"] == "manual_done"
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.status == "active"
|
||||
assert lease.expires_at is not None
|
||||
|
||||
job = AutomationJob(key=reaper.JOB_KEY, batch_size=100)
|
||||
result = reaper.run_platform_fulfillment_lease_reaper(
|
||||
self.session,
|
||||
job,
|
||||
now=lease.expires_at + timedelta(seconds=1),
|
||||
)
|
||||
|
||||
self.session.refresh(lease)
|
||||
assert result["expired"] == 1
|
||||
assert lease.status == "expired"
|
||||
|
||||
def test_manual_completion_zero_delay_releases_immediately(self):
|
||||
task = self._allocated()
|
||||
task.binding_status = "bound"
|
||||
task.execution_status = "bound"
|
||||
task.exchange_status = "eligible"
|
||||
self.session.commit()
|
||||
service.update_settings(
|
||||
self.session,
|
||||
lease_duration_minutes=None,
|
||||
completed_release_delay_minutes=30,
|
||||
manual_completed_release_delay_minutes=0,
|
||||
presale_waiting_release_ttl_minutes=None,
|
||||
manual_required_lease_ttl_minutes=None,
|
||||
order_match_started_at=NOW - timedelta(days=1),
|
||||
current=self.admin,
|
||||
)
|
||||
|
||||
service.complete_manual_exchange(
|
||||
self.session,
|
||||
task_id=task.id,
|
||||
current=self.admin,
|
||||
note="立即释放",
|
||||
)
|
||||
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.status == "released"
|
||||
assert lease.release_reason == "lease_policy:manual_completed"
|
||||
|
||||
def test_points_short_after_binding_keeps_account_and_stays_bound(
|
||||
self, monkeypatch
|
||||
|
||||
Reference in New Issue
Block a user