test_oa_engine.py 37 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115
  1. """OA 引擎单元测试(纯逻辑 + 轻量 mock)"""
  2. import json
  3. import unittest
  4. from datetime import datetime
  5. from unittest.mock import MagicMock, patch
  6. from app.services.oa_engine import (
  7. OaEngineError,
  8. _find_node,
  9. _flow_node_key_order,
  10. _match_condition_group,
  11. _sort_tasks_for_detail,
  12. advance_from,
  13. )
  14. class TestOaEngineHelpers(unittest.TestCase):
  15. def test_find_node(self):
  16. root = {
  17. "id": "s",
  18. "type": "start",
  19. "child": {
  20. "id": "a1",
  21. "type": "approval",
  22. "child": {"id": "e1", "type": "end"},
  23. },
  24. }
  25. self.assertEqual(_find_node(root, "a1")["id"], "a1")
  26. self.assertEqual(_find_node(root, "e1")["id"], "e1")
  27. self.assertIsNone(_find_node(root, "x"))
  28. def test_condition_match(self):
  29. groups = [
  30. {
  31. "name": "gt3",
  32. "when": "{days} > 3",
  33. "child": {"id": "n1", "type": "end"},
  34. },
  35. {"name": "default", "rules": [], "child": {"id": "n2", "type": "end"}},
  36. ]
  37. g = _match_condition_group(groups, {"days": 5})
  38. self.assertEqual(g["name"], "gt3")
  39. g2 = _match_condition_group(groups, {"days": 1})
  40. self.assertEqual(g2["name"], "default")
  41. def test_condition_match_rules_list(self):
  42. groups = [
  43. {
  44. "name": "gt3",
  45. "rules": [{"field": "days", "op": ">", "value": 3}],
  46. "child": {"id": "n1", "type": "end"},
  47. },
  48. {"name": "default", "isDefault": True, "rules": [], "child": {"id": "n2", "type": "end"}},
  49. ]
  50. self.assertEqual(_match_condition_group(groups, {"days": 5})["name"], "gt3")
  51. self.assertEqual(_match_condition_group(groups, {"days": 1})["name"], "default")
  52. def test_condition_match_rules_and(self):
  53. groups = [
  54. {
  55. "name": "both",
  56. "rules": [
  57. {"field": "days", "op": ">", "value": 3},
  58. {"field": "leaveType", "op": "==", "value": "事假"},
  59. ],
  60. "child": {"id": "n1", "type": "end"},
  61. },
  62. {"name": "default", "rules": [], "isDefault": True, "child": {"id": "n2", "type": "end"}},
  63. ]
  64. self.assertEqual(
  65. _match_condition_group(groups, {"days": 5, "leaveType": "事假"})["name"],
  66. "both",
  67. )
  68. self.assertEqual(
  69. _match_condition_group(groups, {"days": 5, "leaveType": "病假"})["name"],
  70. "default",
  71. )
  72. def test_flow_node_key_order_cc_before_approval(self):
  73. root = {
  74. "id": "s",
  75. "type": "start",
  76. "child": {
  77. "id": "c1",
  78. "type": "cc",
  79. "child": {
  80. "id": "a1",
  81. "type": "approval",
  82. "child": {"id": "e1", "type": "end"},
  83. },
  84. },
  85. }
  86. order = _flow_node_key_order(root)
  87. self.assertLess(order["c1"], order["a1"])
  88. def test_sort_tasks_by_flow_when_same_create_time(self):
  89. """抄送先于审批设计时,即使 create_time / order_num 相同也应按树序展示。"""
  90. root = {
  91. "id": "s",
  92. "type": "start",
  93. "child": {
  94. "id": "c1",
  95. "type": "cc",
  96. "child": {
  97. "id": "a1",
  98. "type": "approval",
  99. "child": {"id": "e1", "type": "end"},
  100. },
  101. },
  102. }
  103. ts = datetime(2026, 7, 15, 14, 5, 7)
  104. approval = MagicMock(node_key="a1", order_num=0, create_time=ts, id="AAAA")
  105. cc = MagicMock(node_key="c1", order_num=0, create_time=ts, id="BBBB")
  106. # 故意把审批放在列表前面,模拟 create_time 同秒时 PK 乱序
  107. sorted_tasks = _sort_tasks_for_detail([approval, cc], flow_root=root)
  108. self.assertEqual([t.node_key for t in sorted_tasks], ["c1", "a1"])
  109. class TestAdvanceFrom(unittest.TestCase):
  110. def test_linear_creates_approval_then_stops(self):
  111. flow = {
  112. "id": "s",
  113. "type": "start",
  114. "child": {
  115. "id": "a1",
  116. "type": "approval",
  117. "name": "负责人",
  118. "approverConfig": {"assigneeType": "dept_leader"},
  119. "child": {"id": "e1", "type": "end"},
  120. },
  121. }
  122. db = MagicMock()
  123. inst = MagicMock(
  124. id="inst1",
  125. tenant_no="zkxw",
  126. initiator_user_id="u0",
  127. initiator_dept_id="d1",
  128. form_data_json="{}",
  129. status="running",
  130. )
  131. ver = MagicMock(
  132. flow_tree_json=json.dumps(flow),
  133. advanced_settings_json=json.dumps({"supervisorFallbackToDeptLeader": True}),
  134. )
  135. fake_task = MagicMock()
  136. with patch(
  137. "app.services.oa_engine._next_task_order_num", return_value=1
  138. ), patch(
  139. "app.services.oa_engine._create_tasks_for_node",
  140. return_value=[fake_task],
  141. ) as mock_create:
  142. advance_from(db, inst=inst, ver=ver, from_node=None, user_id="u0")
  143. mock_create.assert_called_once()
  144. self.assertEqual(inst.status, "running")
  145. self.assertEqual(mock_create.call_args.kwargs.get("order_num_start"), 1)
  146. def test_complete_path_to_end_via_cc(self):
  147. flow = {
  148. "id": "s",
  149. "type": "start",
  150. "child": {
  151. "id": "c1",
  152. "type": "cc",
  153. "name": "抄送",
  154. "approverConfig": {"assigneeType": "users", "userIds": ["u9"]},
  155. "child": {"id": "e1", "type": "end"},
  156. },
  157. }
  158. db = MagicMock()
  159. inst = MagicMock(
  160. id="inst1",
  161. tenant_no="zkxw",
  162. initiator_user_id="u0",
  163. initiator_dept_id="d1",
  164. form_data_json="{}",
  165. status="running",
  166. update_time=datetime.now(),
  167. )
  168. ver = MagicMock(
  169. flow_tree_json=json.dumps(flow),
  170. advanced_settings_json="{}",
  171. )
  172. with patch(
  173. "app.services.oa_engine._next_task_order_num", return_value=1
  174. ), patch(
  175. "app.services.oa_engine._create_tasks_for_node",
  176. return_value=[MagicMock()],
  177. ):
  178. advance_from(db, inst=inst, ver=ver, from_node=None, user_id="u0")
  179. self.assertEqual(inst.status, "completed")
  180. def test_empty_assignee_raises(self):
  181. flow = {
  182. "id": "s",
  183. "type": "start",
  184. "child": {
  185. "id": "a1",
  186. "type": "approval",
  187. "approverConfig": {"assigneeType": "dept_leader"},
  188. "child": {"id": "e1", "type": "end"},
  189. },
  190. }
  191. db = MagicMock()
  192. inst = MagicMock(
  193. id="inst1",
  194. tenant_no="zkxw",
  195. initiator_user_id="u0",
  196. initiator_dept_id="d1",
  197. form_data_json="{}",
  198. status="running",
  199. )
  200. ver = MagicMock(flow_tree_json=json.dumps(flow), advanced_settings_json="{}")
  201. with patch(
  202. "app.services.oa_engine._next_task_order_num", return_value=1
  203. ), patch("app.services.oa_engine._create_tasks_for_node", return_value=[]):
  204. with self.assertRaises(OaEngineError):
  205. advance_from(db, inst=inst, ver=ver, from_node=None, user_id="u0")
  206. class TestAddSign(unittest.TestCase):
  207. def test_add_sign_rejects_when_disabled(self):
  208. from app.services.oa_engine import add_sign
  209. db = MagicMock()
  210. task = MagicMock(
  211. id="t1",
  212. assignee_user_id="u1",
  213. task_type="approval",
  214. status="pending",
  215. instance_id="i1",
  216. node_key="a1",
  217. node_name="审批",
  218. sign_mode="or",
  219. comment_text=None,
  220. )
  221. inst = MagicMock(id="i1", status="running", initiator_dept_id="d1")
  222. ver = MagicMock(
  223. id="v1",
  224. advanced_settings_json=json.dumps({"allowAddSign": False}),
  225. del_flag=0,
  226. )
  227. db.query.return_value.filter.return_value.first.side_effect = [task, inst, ver]
  228. with self.assertRaises(OaEngineError) as ctx:
  229. add_sign(
  230. db,
  231. "t1",
  232. tenant_no="zkxw",
  233. user_id="u1",
  234. user_ids=["u2"],
  235. )
  236. self.assertIn("不允许加签", str(ctx.exception))
  237. def test_add_sign_requires_users(self):
  238. from app.services.oa_engine import add_sign
  239. db = MagicMock()
  240. task = MagicMock(
  241. id="t1",
  242. assignee_user_id="u1",
  243. task_type="approval",
  244. status="pending",
  245. instance_id="i1",
  246. )
  247. inst = MagicMock(id="i1", status="running")
  248. ver = MagicMock(advanced_settings_json="{}", del_flag=0)
  249. db.query.return_value.filter.return_value.first.side_effect = [task, inst, ver]
  250. with self.assertRaises(OaEngineError) as ctx:
  251. add_sign(db, "t1", tenant_no="zkxw", user_id="u1", user_ids=[])
  252. self.assertIn("加签人", str(ctx.exception))
  253. class TestCompleteTaskOrSign(unittest.TestCase):
  254. """回归:Session autoflush=False 时,或签取消同节点待办不可覆盖本人已同意状态。"""
  255. def setUp(self):
  256. from sqlalchemy import create_engine
  257. from sqlalchemy.orm import sessionmaker
  258. from app.core.database import Base
  259. from app.models.models import OaApp, OaAppVersion, OaInstance, OaInstanceEvent, OaTask, SysUser
  260. self.engine = create_engine("sqlite:///:memory:")
  261. # 仅建引擎相关表
  262. OaApp.__table__.create(self.engine)
  263. OaAppVersion.__table__.create(self.engine)
  264. OaInstance.__table__.create(self.engine)
  265. OaTask.__table__.create(self.engine)
  266. OaInstanceEvent.__table__.create(self.engine)
  267. SysUser.__table__.create(self.engine)
  268. Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
  269. self.db = Session()
  270. self.Base = Base
  271. self.OaAppVersion = OaAppVersion
  272. self.OaInstance = OaInstance
  273. self.OaTask = OaTask
  274. flow = {
  275. "id": "s",
  276. "type": "start",
  277. "child": {
  278. "id": "a1",
  279. "type": "approval",
  280. "name": "审批人",
  281. "approverConfig": {"signMode": "or"},
  282. "child": {"id": "e1", "type": "end"},
  283. },
  284. }
  285. now = datetime.now()
  286. self.db.add(
  287. OaAppVersion(
  288. id="v1",
  289. app_id="app1",
  290. version_no=1,
  291. status="published",
  292. is_latest_published="1",
  293. form_schema_json="{}",
  294. flow_tree_json=json.dumps(flow),
  295. advanced_settings_json="{}",
  296. tenant_no="zkxw",
  297. create_dept_id="",
  298. create_time=now,
  299. update_time=now,
  300. del_flag=0,
  301. )
  302. )
  303. self.db.add(
  304. OaInstance(
  305. id="i1",
  306. app_id="app1",
  307. app_version_id="v1",
  308. title="单人审批",
  309. initiator_user_id="u0",
  310. initiator_dept_id="d1",
  311. form_data_json="{}",
  312. status="running",
  313. tenant_no="zkxw",
  314. create_dept_id="",
  315. create_time=now,
  316. update_time=now,
  317. del_flag=0,
  318. )
  319. )
  320. self.db.add(
  321. OaTask(
  322. id="t1",
  323. instance_id="i1",
  324. node_key="a1",
  325. node_name="审批人",
  326. task_type="approval",
  327. assignee_user_id="u1",
  328. status="pending",
  329. sign_mode="or",
  330. tenant_no="zkxw",
  331. create_dept_id="",
  332. create_time=now,
  333. update_time=now,
  334. del_flag=0,
  335. )
  336. )
  337. self.db.commit()
  338. def tearDown(self):
  339. self.db.close()
  340. self.engine.dispose()
  341. def test_approve_keeps_approved_not_done(self):
  342. from app.services.oa_engine import complete_task
  343. with patch(
  344. "app.services.oa_engine.get_instance_detail",
  345. return_value={"id": "i1", "status": "completed"},
  346. ):
  347. complete_task(
  348. self.db,
  349. "t1",
  350. tenant_no="zkxw",
  351. user_id="u1",
  352. action="approve",
  353. comment="同意",
  354. )
  355. task = self.db.query(self.OaTask).filter(self.OaTask.id == "t1").first()
  356. self.assertEqual(task.status, "approved")
  357. self.assertEqual(task.comment_text, "同意")
  358. # 已处理列表应能查到
  359. from app.services.oa_engine import list_tasks
  360. done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
  361. self.assertEqual(len(done), 1)
  362. self.assertEqual(done[0]["status"], "approved")
  363. def test_or_sign_cancels_siblings_only(self):
  364. from app.services.oa_engine import complete_task
  365. now = datetime.now()
  366. self.db.add(
  367. self.OaTask(
  368. id="t2",
  369. instance_id="i1",
  370. node_key="a1",
  371. node_name="审批人",
  372. task_type="approval",
  373. assignee_user_id="u2",
  374. status="pending",
  375. sign_mode="or",
  376. tenant_no="zkxw",
  377. create_dept_id="",
  378. create_time=now,
  379. update_time=now,
  380. del_flag=0,
  381. )
  382. )
  383. self.db.commit()
  384. with patch(
  385. "app.services.oa_engine.get_instance_detail",
  386. return_value={"id": "i1", "status": "completed"},
  387. ):
  388. complete_task(
  389. self.db,
  390. "t1",
  391. tenant_no="zkxw",
  392. user_id="u1",
  393. action="approve",
  394. comment="同意",
  395. )
  396. t1 = self.db.query(self.OaTask).filter(self.OaTask.id == "t1").first()
  397. t2 = self.db.query(self.OaTask).filter(self.OaTask.id == "t2").first()
  398. self.assertEqual(t1.status, "approved")
  399. self.assertEqual(t2.status, "done")
  400. class TestBuildProgress(unittest.TestCase):
  401. def test_cc_before_approval_and_pending_ahead(self):
  402. from app.services.oa_engine import build_progress_items
  403. root = {
  404. "id": "s",
  405. "type": "start",
  406. "child": {
  407. "id": "c1",
  408. "type": "cc",
  409. "name": "抄送人",
  410. "child": {
  411. "id": "a1",
  412. "type": "approval",
  413. "name": "审批人",
  414. "child": {
  415. "id": "a2",
  416. "type": "approval",
  417. "name": "总经理",
  418. "child": {"id": "e1", "type": "end"},
  419. },
  420. },
  421. },
  422. }
  423. ts = datetime(2026, 7, 15, 14, 5, 7)
  424. # 审批任务 create 同秒但列表故意审批在前
  425. t_approval = MagicMock(
  426. id="tA",
  427. node_key="a1",
  428. node_name="审批人",
  429. task_type="approval",
  430. status="pending",
  431. assignee_user_id="u2",
  432. order_num=0,
  433. round_no=1,
  434. create_time=ts,
  435. update_time=ts,
  436. comment_text=None,
  437. resolve_source="users",
  438. )
  439. t_cc = MagicMock(
  440. id="tC",
  441. node_key="c1",
  442. node_name="抄送人",
  443. task_type="cc",
  444. status="done",
  445. assignee_user_id="u9",
  446. order_num=0,
  447. round_no=1,
  448. create_time=ts,
  449. update_time=ts,
  450. comment_text=None,
  451. resolve_source="users",
  452. )
  453. inst = MagicMock(
  454. status="running",
  455. initiator_user_id="u0",
  456. current_round=1,
  457. create_time=ts,
  458. update_time=ts,
  459. )
  460. items = build_progress_items(
  461. inst=inst,
  462. flow_root=root,
  463. tasks=[t_approval, t_cc],
  464. name_map={"u0": "发起人甲", "u2": "审批乙", "u9": "抄送丙"},
  465. events=[], # P0 可空
  466. )
  467. kinds = [x["kind"] for x in items]
  468. self.assertEqual(kinds[0], "submit")
  469. # 已产生:cc 再 approval
  470. self.assertEqual(
  471. [x["nodeKey"] for x in items if x["kind"] == "task"],
  472. ["c1", "a1"],
  473. )
  474. # running 时未到达 a2
  475. pending = [x for x in items if x["kind"] == "pending_node"]
  476. self.assertTrue(any(p["nodeKey"] == "a2" for p in pending))
  477. def test_running_shows_all_subsequent_pending_nodes(self):
  478. """进行中应挂出路径上全部后续节点,而非只露一个空壳。"""
  479. from app.services.oa_engine import build_progress_items
  480. root = {
  481. "id": "s",
  482. "type": "start",
  483. "child": {
  484. "id": "a1",
  485. "type": "approval",
  486. "name": "一级审批",
  487. "child": {
  488. "id": "a2",
  489. "type": "approval",
  490. "name": "二级审批",
  491. "child": {
  492. "id": "a3",
  493. "type": "approval",
  494. "name": "三级审批",
  495. "child": {"id": "e1", "type": "end"},
  496. },
  497. },
  498. },
  499. }
  500. ts = datetime(2026, 7, 17, 11, 0, 0)
  501. t1 = MagicMock(
  502. id="t1",
  503. node_key="a1",
  504. node_name="一级审批",
  505. task_type="approval",
  506. status="pending",
  507. assignee_user_id="u1",
  508. order_num=0,
  509. round_no=1,
  510. create_time=ts,
  511. update_time=ts,
  512. comment_text=None,
  513. resolve_source="users",
  514. sign_mode="or",
  515. )
  516. inst = MagicMock(
  517. status="running",
  518. initiator_user_id="u0",
  519. current_round=1,
  520. create_time=ts,
  521. update_time=ts,
  522. form_data_json="{}",
  523. tenant_no="t1",
  524. initiator_dept_id="",
  525. )
  526. items = build_progress_items(
  527. inst=inst,
  528. flow_root=root,
  529. tasks=[t1],
  530. name_map={"u0": "发起人", "u1": "甲"},
  531. events=[],
  532. )
  533. pending = [x for x in items if x["kind"] == "pending_node"]
  534. self.assertEqual([p["nodeKey"] for p in pending], ["a2", "a3", "e1"])
  535. self.assertEqual([p["title"] for p in pending], ["二级审批", "三级审批", "结束"])
  536. self.assertEqual(pending[-1]["taskType"], "end")
  537. def test_or_sign_same_node_merged_into_one_card(self):
  538. """或签同节点三人只投影一张进度卡片,people 含各人状态。"""
  539. from app.services.oa_engine import build_progress_items
  540. root = {
  541. "id": "s",
  542. "type": "start",
  543. "child": {
  544. "id": "a1",
  545. "type": "approval",
  546. "name": "部门审批",
  547. "child": {"id": "e1", "type": "end"},
  548. },
  549. }
  550. ts = datetime(2026, 7, 17, 10, 0, 0)
  551. ts2 = datetime(2026, 7, 17, 10, 5, 0)
  552. def mk(tid, uid, status, comment=None, update=None):
  553. return MagicMock(
  554. id=tid,
  555. node_key="a1",
  556. node_name="部门审批",
  557. task_type="approval",
  558. status=status,
  559. assignee_user_id=uid,
  560. order_num=0,
  561. round_no=1,
  562. create_time=ts,
  563. update_time=update or ts,
  564. comment_text=comment,
  565. resolve_source="users",
  566. sign_mode="or",
  567. )
  568. tasks = [
  569. mk("t1", "u1", "approved", "同意", ts2),
  570. mk("t2", "u2", "done"),
  571. mk("t3", "u3", "done"),
  572. ]
  573. inst = MagicMock(
  574. status="completed",
  575. initiator_user_id="u0",
  576. current_round=1,
  577. create_time=ts,
  578. update_time=ts2,
  579. )
  580. items = build_progress_items(
  581. inst=inst,
  582. flow_root=root,
  583. tasks=tasks,
  584. name_map={"u0": "发起人", "u1": "甲", "u2": "乙", "u3": "丙"},
  585. events=[],
  586. )
  587. task_items = [x for x in items if x["kind"] == "task"]
  588. self.assertEqual(len(task_items), 1)
  589. card = task_items[0]
  590. self.assertEqual(card["nodeKey"], "a1")
  591. self.assertEqual(card["status"], "approved")
  592. self.assertEqual(card["signMode"], "or")
  593. self.assertEqual(len(card["people"]), 3)
  594. self.assertEqual(
  595. [(p["nickName"], p["status"]) for p in card["people"]],
  596. [("甲", "approved"), ("乙", "done"), ("丙", "done")],
  597. )
  598. self.assertIn("甲:同意", card["commentText"])
  599. def test_terminal_status_excludes_pending_nodes(self):
  600. from app.services.oa_engine import build_progress_items
  601. root = {
  602. "id": "s",
  603. "type": "start",
  604. "child": {
  605. "id": "a1",
  606. "type": "approval",
  607. "name": "审批人",
  608. "child": {
  609. "id": "a2",
  610. "type": "approval",
  611. "name": "总经理",
  612. "child": {"id": "e1", "type": "end"},
  613. },
  614. },
  615. }
  616. ts = datetime(2026, 7, 15, 14, 5, 7)
  617. t_approval = MagicMock(
  618. id="tA",
  619. node_key="a1",
  620. node_name="审批人",
  621. task_type="approval",
  622. status="rejected",
  623. assignee_user_id="u2",
  624. order_num=0,
  625. round_no=1,
  626. create_time=ts,
  627. update_time=ts,
  628. comment_text="不同意",
  629. resolve_source="users",
  630. )
  631. for status in ("rejected", "completed", "cancelled", "returned"):
  632. inst = MagicMock(
  633. status=status,
  634. initiator_user_id="u0",
  635. current_round=1,
  636. create_time=ts,
  637. update_time=ts,
  638. )
  639. items = build_progress_items(
  640. inst=inst,
  641. flow_root=root,
  642. tasks=[t_approval],
  643. name_map={"u0": "发起人甲", "u2": "审批乙"},
  644. events=[],
  645. )
  646. pending = [x for x in items if x["kind"] == "pending_node"]
  647. self.assertEqual(pending, [], f"status={status} should not have pending_node")
  648. terminal = [x for x in items if x["kind"] == "terminal"]
  649. self.assertEqual(len(terminal), 1, f"status={status} should have one terminal")
  650. def test_progress_returned_has_no_kind_return_node(self):
  651. from app.services.oa_engine import build_progress_items
  652. root = {
  653. "id": "s",
  654. "type": "start",
  655. "child": {
  656. "id": "a1",
  657. "type": "approval",
  658. "name": "审批人",
  659. "child": {"id": "e1", "type": "end"},
  660. },
  661. }
  662. ts = datetime(2026, 7, 15, 14, 58, 8)
  663. t_approval = MagicMock(
  664. id="tA",
  665. node_key="a1",
  666. node_name="审批人",
  667. task_type="approval",
  668. status="returned",
  669. assignee_user_id="u2",
  670. order_num=1,
  671. round_no=1,
  672. create_time=ts,
  673. update_time=ts,
  674. comment_text="打回",
  675. resolve_source="users",
  676. )
  677. ret_ev = MagicMock(
  678. event_type="return",
  679. round_no=1,
  680. actor_user_id="u2",
  681. create_time=ts,
  682. comment_text="打回",
  683. node_key="a1",
  684. task_id="tA",
  685. )
  686. inst = MagicMock(
  687. status="returned",
  688. initiator_user_id="u0",
  689. current_round=1,
  690. create_time=ts,
  691. update_time=ts,
  692. )
  693. items = build_progress_items(
  694. inst=inst,
  695. flow_root=root,
  696. tasks=[t_approval],
  697. name_map={"u0": "发起人", "u2": "审批人"},
  698. events=[ret_ev],
  699. )
  700. self.assertFalse(any(x["kind"] == "return" for x in items))
  701. tasks = [x for x in items if x["kind"] == "task"]
  702. self.assertEqual(len(tasks), 1)
  703. self.assertEqual(tasks[0]["status"], "returned")
  704. self.assertEqual(tasks[0]["commentText"], "打回")
  705. terminals = [x for x in items if x["kind"] == "terminal"]
  706. self.assertEqual(len(terminals), 1)
  707. self.assertEqual(terminals[0]["status"], "returned")
  708. class TestReturnAndResubmit(unittest.TestCase):
  709. def setUp(self):
  710. from sqlalchemy import create_engine
  711. from sqlalchemy.orm import sessionmaker
  712. from app.models.models import OaApp, OaAppVersion, OaInstance, OaInstanceEvent, OaTask, SysUser
  713. self.engine = create_engine("sqlite:///:memory:")
  714. OaApp.__table__.create(self.engine)
  715. OaAppVersion.__table__.create(self.engine)
  716. OaInstance.__table__.create(self.engine)
  717. OaTask.__table__.create(self.engine)
  718. OaInstanceEvent.__table__.create(self.engine)
  719. SysUser.__table__.create(self.engine)
  720. Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
  721. self.db = Session()
  722. self.OaInstance = OaInstance
  723. self.OaTask = OaTask
  724. self.OaInstanceEvent = OaInstanceEvent
  725. flow = {
  726. "id": "s",
  727. "type": "start",
  728. "child": {
  729. "id": "a1",
  730. "type": "approval",
  731. "name": "审批人",
  732. "approverConfig": {
  733. "assigneeType": "users",
  734. "userIds": ["u1"],
  735. "signMode": "or",
  736. },
  737. "child": {"id": "e1", "type": "end"},
  738. },
  739. }
  740. now = datetime.now()
  741. self.db.add(
  742. OaAppVersion(
  743. id="v1",
  744. app_id="app1",
  745. version_no=1,
  746. status="published",
  747. is_latest_published="1",
  748. form_schema_json="{}",
  749. flow_tree_json=json.dumps(flow),
  750. advanced_settings_json=json.dumps({"allowReturn": True}),
  751. tenant_no="zkxw",
  752. create_dept_id="",
  753. create_time=now,
  754. update_time=now,
  755. del_flag=0,
  756. )
  757. )
  758. self.db.add(
  759. OaInstance(
  760. id="i1",
  761. app_id="app1",
  762. app_version_id="v1",
  763. title="打回测",
  764. initiator_user_id="u0",
  765. initiator_dept_id="d1",
  766. form_data_json="{}",
  767. status="running",
  768. current_round=1,
  769. tenant_no="zkxw",
  770. create_dept_id="",
  771. create_time=now,
  772. update_time=now,
  773. del_flag=0,
  774. )
  775. )
  776. self.db.add(
  777. OaTask(
  778. id="t1",
  779. instance_id="i1",
  780. node_key="a1",
  781. node_name="审批人",
  782. task_type="approval",
  783. assignee_user_id="u1",
  784. status="pending",
  785. sign_mode="or",
  786. round_no=1,
  787. tenant_no="zkxw",
  788. create_dept_id="",
  789. create_time=now,
  790. update_time=now,
  791. del_flag=0,
  792. )
  793. )
  794. self.db.commit()
  795. def tearDown(self):
  796. self.db.close()
  797. self.engine.dispose()
  798. def test_return_sets_returned_and_event(self):
  799. from app.services.oa_engine import return_task
  800. with patch(
  801. "app.services.oa_engine.get_instance_detail",
  802. return_value={"id": "i1", "status": "returned"},
  803. ):
  804. return_task(
  805. self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
  806. )
  807. inst = self.db.query(self.OaInstance).filter_by(id="i1").first()
  808. task = self.db.query(self.OaTask).filter_by(id="t1").first()
  809. ev = (
  810. self.db.query(self.OaInstanceEvent)
  811. .filter_by(instance_id="i1", event_type="return")
  812. .first()
  813. )
  814. self.assertEqual(inst.status, "returned")
  815. self.assertEqual(task.status, "returned")
  816. self.assertIsNotNone(ev)
  817. self.assertEqual(ev.comment_text, "请补充材料")
  818. def test_resubmit_raises_deprecated(self):
  819. from app.services.oa_engine import OaEngineError, resubmit_instance, return_task
  820. with patch(
  821. "app.services.oa_engine.get_instance_detail",
  822. return_value={"id": "i1", "status": "returned"},
  823. ):
  824. return_task(
  825. self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
  826. )
  827. with self.assertRaises(OaEngineError) as ctx:
  828. resubmit_instance(
  829. self.db,
  830. "i1",
  831. tenant_no="zkxw",
  832. user_id="u0",
  833. form_data={"x": 1},
  834. )
  835. self.assertIn("废弃", str(ctx.exception))
  836. def test_done_list_includes_returned(self):
  837. from app.services.oa_engine import list_tasks, return_task
  838. with patch(
  839. "app.services.oa_engine.get_instance_detail",
  840. return_value={"id": "i1", "status": "returned"},
  841. ):
  842. return_task(
  843. self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
  844. )
  845. done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
  846. self.assertEqual(len(done), 1)
  847. self.assertEqual(done[0]["status"], "returned")
  848. class TestListTasksEnrichment(unittest.TestCase):
  849. """list_tasks 返回整单此刻进度摘要字段。"""
  850. def setUp(self):
  851. from sqlalchemy import create_engine
  852. from sqlalchemy.orm import sessionmaker
  853. from app.models.models import OaApp, OaAppVersion, OaInstance, OaTask, SysUser
  854. self.engine = create_engine("sqlite:///:memory:")
  855. OaApp.__table__.create(self.engine)
  856. OaAppVersion.__table__.create(self.engine)
  857. OaInstance.__table__.create(self.engine)
  858. OaTask.__table__.create(self.engine)
  859. SysUser.__table__.create(self.engine)
  860. Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
  861. self.db = Session()
  862. self.OaTask = OaTask
  863. now = datetime(2026, 7, 15, 10, 0, 0)
  864. self.db.add(
  865. OaApp(
  866. id="app1",
  867. app_name="请假审批",
  868. initiator_scope="all",
  869. admin_scope="all_oa_admin",
  870. status="1",
  871. tenant_no="zkxw",
  872. create_dept_id="",
  873. create_time=now,
  874. update_time=now,
  875. del_flag=0,
  876. )
  877. )
  878. self.db.add(
  879. OaAppVersion(
  880. id="v1",
  881. app_id="app1",
  882. version_no=1,
  883. status="published",
  884. is_latest_published="1",
  885. form_schema_json="{}",
  886. flow_tree_json="{}",
  887. advanced_settings_json="{}",
  888. tenant_no="zkxw",
  889. create_dept_id="",
  890. create_time=now,
  891. update_time=now,
  892. del_flag=0,
  893. )
  894. )
  895. self.db.add(
  896. SysUser(
  897. id="u0",
  898. user_no="initiator",
  899. nick_name="发起人甲",
  900. password="x",
  901. tenant_no="zkxw",
  902. create_dept_id="",
  903. create_time=now,
  904. update_time=now,
  905. del_flag=0,
  906. )
  907. )
  908. self.db.add(
  909. SysUser(
  910. id="u1",
  911. user_no="approver1",
  912. nick_name="审批人乙",
  913. password="x",
  914. tenant_no="zkxw",
  915. create_dept_id="",
  916. create_time=now,
  917. update_time=now,
  918. del_flag=0,
  919. )
  920. )
  921. self.db.add(
  922. SysUser(
  923. id="u2",
  924. user_no="approver2",
  925. nick_name="审批人丙",
  926. password="x",
  927. tenant_no="zkxw",
  928. create_dept_id="",
  929. create_time=now,
  930. update_time=now,
  931. del_flag=0,
  932. )
  933. )
  934. self.db.add(
  935. OaInstance(
  936. id="i1",
  937. app_id="app1",
  938. app_version_id="v1",
  939. title="请假-忽略",
  940. initiator_user_id="u0",
  941. initiator_dept_id="d1",
  942. form_data_json="{}",
  943. status="running",
  944. tenant_no="zkxw",
  945. create_dept_id="",
  946. create_time=now,
  947. update_time=now,
  948. del_flag=0,
  949. )
  950. )
  951. self.db.add(
  952. OaTask(
  953. id="t-done",
  954. instance_id="i1",
  955. node_key="a1",
  956. node_name="一级审批",
  957. task_type="approval",
  958. assignee_user_id="u1",
  959. status="approved",
  960. tenant_no="zkxw",
  961. create_dept_id="",
  962. create_time=now,
  963. update_time=now,
  964. del_flag=0,
  965. )
  966. )
  967. self.db.add(
  968. OaTask(
  969. id="t-pending",
  970. instance_id="i1",
  971. node_key="a2",
  972. node_name="二级审批",
  973. task_type="approval",
  974. assignee_user_id="u2",
  975. status="pending",
  976. tenant_no="zkxw",
  977. create_dept_id="",
  978. create_time=now,
  979. update_time=now,
  980. del_flag=0,
  981. )
  982. )
  983. self.db.commit()
  984. def tearDown(self):
  985. self.db.close()
  986. self.engine.dispose()
  987. def test_done_list_shows_instance_current_progress(self):
  988. from app.services.oa_engine import list_tasks
  989. done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
  990. self.assertEqual(len(done), 1)
  991. row = done[0]
  992. self.assertEqual(row["appName"], "请假审批")
  993. self.assertEqual(row["initiatorUserName"], "发起人甲")
  994. self.assertEqual(row["applyTime"], "2026-07-15 10:00:00")
  995. self.assertEqual(row["instanceStatus"], "running")
  996. self.assertEqual(row["currentNodeName"], "二级审批")
  997. self.assertEqual(row["currentApproverNames"], "审批人丙")
  998. self.assertEqual(row["status"], "approved")
  999. def test_mine_list_enrichment(self):
  1000. from app.services.oa_engine import list_tasks
  1001. mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
  1002. self.assertEqual(len(mine), 1)
  1003. row = mine[0]
  1004. self.assertEqual(row["appName"], "请假审批")
  1005. self.assertEqual(row["instanceStatus"], "running")
  1006. self.assertEqual(row["currentNodeName"], "二级审批")
  1007. self.assertEqual(row["currentApproverNames"], "审批人丙")
  1008. def test_pending_list_enrichment(self):
  1009. from app.services.oa_engine import list_tasks
  1010. pending = list_tasks(self.db, tenant_no="zkxw", user_id="u2", kind="pending")
  1011. self.assertEqual(len(pending), 1)
  1012. row = pending[0]
  1013. self.assertEqual(row["appName"], "请假审批")
  1014. self.assertEqual(row["currentNodeName"], "二级审批")
  1015. def test_terminal_instance_labels(self):
  1016. from app.services.oa_engine import list_tasks
  1017. from app.models.models import OaInstance
  1018. cases = [
  1019. ("completed", "已完成"),
  1020. ("rejected", "已拒绝"),
  1021. ("returned", "已打回"),
  1022. ("cancelled", "已撤销"),
  1023. ]
  1024. inst = self.db.query(OaInstance).filter_by(id="i1").first()
  1025. pending = self.db.query(self.OaTask).filter_by(id="t-pending").first()
  1026. for status, expected_label in cases:
  1027. with self.subTest(status=status):
  1028. inst.status = status
  1029. pending.status = "cancelled"
  1030. self.db.commit()
  1031. mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
  1032. row = mine[0]
  1033. self.assertEqual(row["instanceStatus"], status)
  1034. self.assertEqual(row["currentNodeName"], expected_label)
  1035. self.assertEqual(row["currentApproverNames"], "-")
  1036. inst.status = "running"
  1037. pending.status = "pending"
  1038. self.db.commit()
  1039. if __name__ == "__main__":
  1040. unittest.main()