Upload 2 files

router_tasks.py

@@ -212,7 +212,15 @@ def _read_task_pages(db_session, task_id=None):
         }
         message = error.args[0] if len(error.args) == 1 and type(error.args[0]) is str else None
         reason = message.replace(' ', '_') if type(error) is ValueError and message in reasons else 'unexpected_read_error'
-        run_tip_effect(lambda: logger.error("TASK_READ_FAILED | error_type=%s | reason=%s", type(error).__name__, reason))
+        detail = 'none'
+        if type(error) is ValueError and message == 'task deposit mismatch':
+            candidate = getattr(error, 'validation_detail', None)
+            if type(candidate) is str and candidate in {
+                    'ledger_count', 'deposit_type', 'funding_missing', 'deposit_range',
+                    'ledger_publisher', 'ledger_assignee', 'ledger_amount_type', 'ledger_amount'}:
+                detail = candidate
+        run_tip_effect(lambda: logger.error("TASK_READ_FAILED | error_type=%s | check=%s | reason=%s",
+                                           type(error).__name__, detail, reason))
         raise HTTPException(status_code=503, detail="任务状态暂时无法核实，请稍后核对")
     finally:
         db_session.rollback()

task_read.py

@@ -25,6 +25,12 @@ def ledger(rows, identifier, kind, account, related, amount):
         raise ValueError('task closing ledger mismatch')
 
 
+def _reject_deposit(detail):
+    error = ValueError('task deposit mismatch')
+    error.validation_detail = detail
+    raise error
+
+
 def merged_task(current, records, funds):
     publication, revision, assignment, delivery, dispute, response, settlement, resolution = records
     if current is None and publication is None:
@@ -73,10 +79,22 @@ def merged_task(current, records, funds):
         deposit = result.get('deposit_amount')
         if type(deposit) is float and deposit.is_integer() and 0 <= deposit <= 2147483647:
             deposit = int(deposit)
-        if (len(deposits) != 1 or type(deposit) is not int or amount is None or not 0 <= deposit <= amount
-                or deposits[0].account != publisher or deposits[0].related_account != assignee
-                or type(deposits[0].amount) is not int or deposits[0].amount != -deposit):
-            raise ValueError('task deposit mismatch')
+        if len(deposits) != 1:
+            _reject_deposit('ledger_count')
+        if type(deposit) is not int:
+            _reject_deposit('deposit_type')
+        if amount is None:
+            _reject_deposit('funding_missing')
+        if not 0 <= deposit <= amount:
+            _reject_deposit('deposit_range')
+        if deposits[0].account != publisher:
+            _reject_deposit('ledger_publisher')
+        if deposits[0].related_account != assignee:
+            _reject_deposit('ledger_assignee')
+        if type(deposits[0].amount) is not int:
+            _reject_deposit('ledger_amount_type')
+        if deposits[0].amount != -deposit:
+            _reject_deposit('ledger_amount')
         result.update(assignee=assignee, deposit_amount=deposit, deposit_paid=deposit)
     if assignment is not None:
         if type(assignment.deposit) is not int or assignment.deposit != deposit or type(assignment.assigned_at) is not int: