diff --git a/app/web/main.py b/app/web/main.py index 0978652..e729b9f 100644 --- a/app/web/main.py +++ b/app/web/main.py @@ -1044,9 +1044,12 @@ def api_user_candidates(): @app.post('/api/plan/user-candidates') def api_add_user_candidates(request: Request, payload: dict = Body(...)): from app.services import plan_candidates - return ok_logged('add_plan_candidates', plan_candidates.request, 'POST', - payload=payload, actor=_actor(request), by=_actor(request), - params={k: payload.get(k) for k in ('codes', 'reason', 'expires_on')}) + result = ok_logged('add_plan_candidates', plan_candidates.request, 'POST', + payload=payload, actor=_actor(request), by=_actor(request), + params={k: payload.get(k) for k in ('codes', 'reason', 'expires_on')}) + if not result.get('ok') and str(result.get('error') or '').startswith('ValueError: '): + result['error'] = result['error'][12:] + return result @app.post('/api/plan/user-candidates/{identity}/remove') diff --git a/scripts/test_batch54_units.py b/scripts/test_batch54_units.py index f509d32..1a24219 100644 --- a/scripts/test_batch54_units.py +++ b/scripts/test_batch54_units.py @@ -100,5 +100,10 @@ class UserCandidateTests(unittest.TestCase): result=main.api_add_user_candidates(request,{'codes':['600001'],'by':'冒名'}) self.assertTrue(result['ok']);self.assertEqual(send.call_args.kwargs['actor'],'交易员甲') self.assertEqual(log.call_args.kwargs['by'],'交易员甲') + with patch.object(pc,'request',side_effect=ValueError('未找到沪深 A 股“示例”,请检查完整名称或使用代码')), \ + patch.object(main.pms_repo,'insert_op_log',return_value=1) as log: + result=main.api_add_user_candidates(request,{'codes':['示例']}) + self.assertFalse(result['ok']);self.assertTrue(result['error'].startswith('未找到沪深 A 股')) + self.assertEqual(log.call_args.kwargs['result'],'BLOCKED') if __name__=='__main__':unittest.main()