fix(douyu): 统一外部协作账号租约
This commit is contained in:
@@ -520,6 +520,8 @@ class TestFulfillmentCollabSync(_Base):
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
lease = self.session.query(AccountLease).one()
|
||||
assert lease.purpose == "douyu_collab"
|
||||
|
||||
def test_manual_sync_does_not_clear_account_added_in_collab(self):
|
||||
task = self.task()
|
||||
@@ -1479,9 +1481,7 @@ class TestBindingAndCompletion(_Base):
|
||||
assert exc_info.value.status_code == 403
|
||||
assert checker(current_user=admin) is admin
|
||||
|
||||
def test_restore_manual_cancel_requeues_task_and_restores_collab(
|
||||
self, monkeypatch
|
||||
):
|
||||
def test_restore_manual_cancel_requeues_task_and_restores_collab(self, monkeypatch):
|
||||
task = self.task()
|
||||
service.cancel_task(
|
||||
self.session,
|
||||
@@ -1711,6 +1711,36 @@ class TestBindingAndCompletion(_Base):
|
||||
assert event.detail_json["releasedAccountId"] == account_id
|
||||
assert event.detail_json["releasedLeaseId"] == lease_id
|
||||
|
||||
def test_release_to_manual_hands_lease_to_active_collab_order(self):
|
||||
task = self._allocated()
|
||||
lease_id = task.lease_id
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
assert order.status == collab.STATUS_INCOMPLETE
|
||||
lease = self.session.query(AccountLease).filter_by(id=lease_id).one()
|
||||
assert lease.purpose == "platform_fulfillment"
|
||||
|
||||
detail = service.release_task_to_manual(
|
||||
self.session,
|
||||
task_id=task.id,
|
||||
current=self.admin,
|
||||
reason="以外部协作单的人工处理为准",
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert detail["task"]["executionStatus"] == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == "douyu_collab"
|
||||
assert lease.expires_at is None
|
||||
assert lease.batch_id == f"collab:{lease.account_id}"
|
||||
assert self.session.query(AccountLease).count() == 1
|
||||
|
||||
def test_refresh_binding_maps_role_ready(self, monkeypatch):
|
||||
notified: list[int] = []
|
||||
monkeypatch.setattr(
|
||||
@@ -2074,6 +2104,36 @@ class TestBindingAndCompletion(_Base):
|
||||
assert result["expired"] == 0
|
||||
assert task.execution_status == "allocated"
|
||||
|
||||
def test_expired_platform_lease_hands_off_to_active_collab(self):
|
||||
task = self._allocated()
|
||||
lease = self.session.query(AccountLease).one()
|
||||
collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
lease.expires_at = NOW - timedelta(minutes=1)
|
||||
self.session.commit()
|
||||
|
||||
job = AutomationJob(key=reaper.JOB_KEY, batch_size=100)
|
||||
result = reaper.run_platform_fulfillment_lease_reaper(
|
||||
self.session,
|
||||
job,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.session.refresh(task)
|
||||
self.session.refresh(lease)
|
||||
assert result["expired"] == 0
|
||||
assert result["affected_tasks"] == 1
|
||||
assert task.execution_status == "manual_required"
|
||||
assert task.account_id is None
|
||||
assert task.lease_id is None
|
||||
assert task.issue_code == "lease_expired_collab_handoff"
|
||||
assert lease.status == "active"
|
||||
assert lease.purpose == "douyu_collab"
|
||||
assert lease.expires_at is None
|
||||
|
||||
def test_completion_rejects_limited_exchange(self):
|
||||
task = self._allocated()
|
||||
task.binding_status = "bound"
|
||||
|
||||
Reference in New Issue
Block a user