提交
This commit is contained in:
1 parent
80138c6388
commit
693e8a678e
682 files changed
+211375
-5306
No files matched your search
@@ -0,0 +1,187 @@
|
||||
"""cn_holiday sync / read unit tests"""
|
||||
from datetime import date, datetime
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from app.services.cn_holiday import is_rest_day, list_day_flags
|
||||
from app.services.cn_holiday_sync import (
|
||||
_is_rest_from_type,
|
||||
is_year_calendar_complete,
|
||||
map_ailcc_day_row,
|
||||
seconds_until_next_local_midnight,
|
||||
sync_cn_holidays,
|
||||
)
|
||||
|
||||
|
||||
def test_type_rest_flags():
|
||||
assert _is_rest_from_type(1) == 1
|
||||
assert _is_rest_from_type(2) == 1
|
||||
assert _is_rest_from_type(3) == 1
|
||||
assert _is_rest_from_type(0) == 0
|
||||
assert _is_rest_from_type(4) == 0
|
||||
|
||||
|
||||
def test_map_row():
|
||||
row = map_ailcc_day_row(
|
||||
"2026-10-01",
|
||||
holiday={"holiday": True, "name": "国庆节(休)", "date": "2026-10-01"},
|
||||
type_info={"type": 2, "name": "国庆节(休)", "week": 4},
|
||||
)
|
||||
assert row["day_date"] == date(2026, 10, 1)
|
||||
assert row["day_type"] == 2
|
||||
assert row["is_rest_day"] == 1
|
||||
assert row["day_name"] == "国庆节(休)"
|
||||
assert row["week"] == 4
|
||||
assert row["raw_json"]
|
||||
|
||||
|
||||
def test_map_row_workday_makeup():
|
||||
row = map_ailcc_day_row(
|
||||
"2026-10-10",
|
||||
holiday=None,
|
||||
type_info={"type": 4, "name": "国庆节(班)", "week": 6},
|
||||
)
|
||||
assert row["day_type"] == 4
|
||||
assert row["is_rest_day"] == 0
|
||||
|
||||
|
||||
def test_map_row_infer_weekend_when_type_missing():
|
||||
# 2026-10-03 is Saturday
|
||||
row = map_ailcc_day_row("2026-10-03", holiday=None, type_info=None)
|
||||
assert row["day_type"] == 1
|
||||
assert row["is_rest_day"] == 1
|
||||
assert row["week"] == 6
|
||||
|
||||
|
||||
def test_is_rest_day_from_row():
|
||||
db = MagicMock()
|
||||
row = MagicMock()
|
||||
row.is_rest_day = 1
|
||||
row.day_type = 2
|
||||
db.query.return_value.filter.return_value.first.return_value = row
|
||||
assert is_rest_day(db, date(2026, 10, 1)) is True
|
||||
|
||||
|
||||
def test_is_rest_day_work_type():
|
||||
db = MagicMock()
|
||||
row = MagicMock()
|
||||
row.is_rest_day = 0
|
||||
row.day_type = 4
|
||||
db.query.return_value.filter.return_value.first.return_value = row
|
||||
assert is_rest_day(db, date(2026, 10, 10)) is False
|
||||
|
||||
|
||||
def test_is_rest_day_fallback_weekend():
|
||||
db = MagicMock()
|
||||
db.query.return_value.filter.return_value.first.return_value = None
|
||||
# Saturday
|
||||
assert is_rest_day(db, date(2026, 8, 8)) is True
|
||||
# Friday
|
||||
assert is_rest_day(db, date(2026, 8, 7)) is False
|
||||
|
||||
|
||||
def test_list_day_flags_fills_gaps():
|
||||
db = MagicMock()
|
||||
row = MagicMock()
|
||||
row.day_date = date(2026, 10, 1)
|
||||
row.day_type = 2
|
||||
row.is_rest_day = 1
|
||||
row.day_name = "国庆节(休)"
|
||||
db.query.return_value.filter.return_value.all.return_value = [row]
|
||||
|
||||
flags = list_day_flags(db, date(2026, 10, 1), date(2026, 10, 3))
|
||||
assert len(flags) == 3
|
||||
assert flags[0] == {
|
||||
"dayDate": "2026-10-01",
|
||||
"dayType": 2,
|
||||
"isRestDay": True,
|
||||
"dayName": "国庆节(休)",
|
||||
}
|
||||
# 2026-10-02 Friday → work fallback
|
||||
assert flags[1]["dayDate"] == "2026-10-02"
|
||||
assert flags[1]["dayType"] == 0
|
||||
assert flags[1]["isRestDay"] is False
|
||||
# 2026-10-03 Saturday → rest fallback
|
||||
assert flags[2]["dayDate"] == "2026-10-03"
|
||||
assert flags[2]["dayType"] == 1
|
||||
assert flags[2]["isRestDay"] is True
|
||||
|
||||
|
||||
def test_seconds_until_next_local_midnight():
|
||||
now = datetime(2026, 8, 10, 23, 59, 0)
|
||||
assert seconds_until_next_local_midnight(now) == 60
|
||||
noon = datetime(2026, 8, 10, 12, 0, 0)
|
||||
assert seconds_until_next_local_midnight(noon) == 12 * 3600
|
||||
|
||||
|
||||
def test_is_year_calendar_complete_true():
|
||||
session = MagicMock()
|
||||
# 2026 is not leap → 365
|
||||
session.query.return_value.filter.return_value.count.return_value = 365
|
||||
assert is_year_calendar_complete(session, 2026) is True
|
||||
|
||||
|
||||
def test_is_year_calendar_complete_false():
|
||||
session = MagicMock()
|
||||
session.query.return_value.filter.return_value.count.return_value = 100
|
||||
assert is_year_calendar_complete(session, 2026) is False
|
||||
|
||||
|
||||
def test_is_year_calendar_complete_leap():
|
||||
session = MagicMock()
|
||||
session.query.return_value.filter.return_value.count.return_value = 366
|
||||
assert is_year_calendar_complete(session, 2024) is True
|
||||
session.query.return_value.filter.return_value.count.return_value = 365
|
||||
assert is_year_calendar_complete(session, 2024) is False
|
||||
|
||||
|
||||
def test_sync_cn_holidays_upsert_mocked():
|
||||
holiday_payload = {
|
||||
"code": 0,
|
||||
"holiday": {
|
||||
"2026-10-01": {"holiday": True, "name": "国庆节(休)", "date": "2026-10-01"},
|
||||
},
|
||||
"type": {
|
||||
"2026-10-01": {"type": 2, "name": "国庆节(休)", "week": 4},
|
||||
"2026-10-02": {"type": 2, "name": "国庆节(休)", "week": 5},
|
||||
},
|
||||
}
|
||||
|
||||
session = MagicMock()
|
||||
session.query.return_value.filter.return_value.first.return_value = None
|
||||
# year incomplete → still fetch
|
||||
session.query.return_value.filter.return_value.count.return_value = 0
|
||||
|
||||
class Factory:
|
||||
def __call__(self):
|
||||
return session
|
||||
|
||||
with patch("app.services.cn_holiday_sync._fetch_batch", return_value=holiday_payload), patch(
|
||||
"app.services.cn_holiday_sync._years_to_sync", return_value=[2026]
|
||||
), patch(
|
||||
"app.services.cn_holiday_sync._months_for_year", return_value=[(2026, 10)]
|
||||
):
|
||||
n = sync_cn_holidays(Factory())
|
||||
|
||||
assert n >= 1
|
||||
assert session.add.call_count >= 1 or session.merge.call_count >= 1
|
||||
session.commit.assert_called()
|
||||
session.close.assert_called()
|
||||
|
||||
|
||||
def test_sync_skips_complete_year():
|
||||
session = MagicMock()
|
||||
session.query.return_value.filter.return_value.count.return_value = 365
|
||||
|
||||
class Factory:
|
||||
def __call__(self):
|
||||
return session
|
||||
|
||||
with patch("app.services.cn_holiday_sync._fetch_batch") as fetch, patch(
|
||||
"app.services.cn_holiday_sync._years_to_sync", return_value=[2026]
|
||||
):
|
||||
n = sync_cn_holidays(Factory())
|
||||
|
||||
assert n == 0
|
||||
fetch.assert_not_called()
|
||||
session.commit.assert_called()
|
||||
session.close.assert_called()
|
||||
@@ -502,7 +502,7 @@ class TestCompleteTaskOrSign(unittest.TestCase):
|
||||
# 已处理列表应能查到
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
|
||||
self.assertEqual(len(done), 1)
|
||||
self.assertEqual(done[0]["status"], "approved")
|
||||
|
||||
@@ -1019,7 +1019,7 @@ class TestReturnAndResubmit(unittest.TestCase):
|
||||
return_task(
|
||||
self.db, "t1", tenant_no="zkxw", user_id="u1", comment="请补充材料"
|
||||
)
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
|
||||
self.assertEqual(len(done), 1)
|
||||
self.assertEqual(done[0]["status"], "returned")
|
||||
|
||||
@@ -1170,7 +1170,7 @@ class TestListTasksEnrichment(unittest.TestCase):
|
||||
def test_done_list_shows_instance_current_progress(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
|
||||
self.assertEqual(len(done), 1)
|
||||
row = done[0]
|
||||
self.assertEqual(row["appName"], "请假审批")
|
||||
@@ -1184,7 +1184,7 @@ class TestListTasksEnrichment(unittest.TestCase):
|
||||
def test_mine_list_enrichment(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
|
||||
mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")["list"]
|
||||
self.assertEqual(len(mine), 1)
|
||||
row = mine[0]
|
||||
self.assertEqual(row["appName"], "请假审批")
|
||||
@@ -1195,7 +1195,7 @@ class TestListTasksEnrichment(unittest.TestCase):
|
||||
def test_pending_list_enrichment(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
pending = list_tasks(self.db, tenant_no="zkxw", user_id="u2", kind="pending")
|
||||
pending = list_tasks(self.db, tenant_no="zkxw", user_id="u2", kind="pending")["list"]
|
||||
self.assertEqual(len(pending), 1)
|
||||
row = pending[0]
|
||||
self.assertEqual(row["appName"], "请假审批")
|
||||
@@ -1219,7 +1219,7 @@ class TestListTasksEnrichment(unittest.TestCase):
|
||||
pending.status = "cancelled"
|
||||
self.db.commit()
|
||||
|
||||
mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")
|
||||
mine = list_tasks(self.db, tenant_no="zkxw", user_id="u0", kind="mine")["list"]
|
||||
row = mine[0]
|
||||
self.assertEqual(row["instanceStatus"], status)
|
||||
self.assertEqual(row["currentNodeName"], expected_label)
|
||||
@@ -1429,7 +1429,7 @@ class TestTransferTask(unittest.TestCase):
|
||||
self.assertEqual(new_task.sign_mode, "and")
|
||||
self.assertEqual(new_task.node_key, "a1")
|
||||
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")
|
||||
done = list_tasks(self.db, tenant_no="zkxw", user_id="u1", kind="done")["list"]
|
||||
self.assertEqual(len(done), 1)
|
||||
self.assertEqual(done[0]["status"], "transferred")
|
||||
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
"""OA 审批应用列表:避免按应用 N+1 拉取版本大字段。"""
|
||||
import json
|
||||
import unittest
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import create_engine, event
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
|
||||
class TestListAppsPerf(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from app.models.models import OaApp, OaAppGroup, OaAppVersion
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
OaAppGroup.__table__.create(self.engine)
|
||||
OaApp.__table__.create(self.engine)
|
||||
OaAppVersion.__table__.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
self.OaApp = OaApp
|
||||
self.OaAppGroup = OaAppGroup
|
||||
self.OaAppVersion = OaAppVersion
|
||||
self.now = datetime.now()
|
||||
self.query_count = 0
|
||||
|
||||
@event.listens_for(self.engine, "before_cursor_execute")
|
||||
def _count(_conn, _cursor, _statement, _parameters, _context, _executemany):
|
||||
self.query_count += 1
|
||||
|
||||
self._listener = _count
|
||||
|
||||
def tearDown(self):
|
||||
event.remove(self.engine, "before_cursor_execute", self._listener)
|
||||
self.db.close()
|
||||
self.engine.dispose()
|
||||
|
||||
def _seed_apps(self, n: int = 8):
|
||||
bulky = json.dumps({"rule": [{"x": "y" * 2000}] * 50}, ensure_ascii=False)
|
||||
self.db.add(
|
||||
self.OaAppGroup(
|
||||
id="g1",
|
||||
group_name="人事",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
for i in range(n):
|
||||
app_id = f"app{i}"
|
||||
self.db.add(
|
||||
self.OaApp(
|
||||
id=app_id,
|
||||
group_id="g1",
|
||||
app_name=f"应用{i}",
|
||||
initiator_scope="all",
|
||||
admin_scope="all_oa_admin",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
order_num=i,
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.OaAppVersion(
|
||||
id=f"draft{i}",
|
||||
app_id=app_id,
|
||||
version_no=0,
|
||||
status="draft",
|
||||
is_latest_published="0",
|
||||
form_schema_json=bulky,
|
||||
flow_tree_json=bulky,
|
||||
advanced_settings_json="{}",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.OaAppVersion(
|
||||
id=f"pub{i}",
|
||||
app_id=app_id,
|
||||
version_no=i + 1,
|
||||
status="published",
|
||||
is_latest_published="1",
|
||||
form_schema_json=bulky,
|
||||
flow_tree_json=bulky,
|
||||
advanced_settings_json="{}",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.commit()
|
||||
|
||||
def test_list_apps_query_count_bounded_and_fields_correct(self):
|
||||
from app.crud.oa_approval import list_apps
|
||||
|
||||
n = 8
|
||||
self._seed_apps(n)
|
||||
self.query_count = 0
|
||||
items = list_apps(self.db, tenant_no="zkxw")
|
||||
|
||||
self.assertEqual(len(items), n)
|
||||
self.assertTrue(all(it["hasDraft"] for it in items))
|
||||
self.assertEqual(
|
||||
{it["id"]: it["latestPublishedVersion"] for it in items},
|
||||
{f"app{i}": i + 1 for i in range(n)},
|
||||
)
|
||||
self.assertEqual(items[0]["groupName"], "人事")
|
||||
# apps + groups + drafts batch + published batch(不应随应用数线性增长)
|
||||
self.assertLessEqual(self.query_count, 5)
|
||||
self.assertLess(self.query_count, 2 + 2 * n)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,147 @@
|
||||
"""oa_overtime_hours unit tests"""
|
||||
from app.services.oa_overtime_hours import (
|
||||
MANUAL_PREFIX,
|
||||
DEFAULT_OVERTIME_WINDOWS,
|
||||
apply_overtime_kit_hours,
|
||||
calc_overtime_hours,
|
||||
validate_overtime_kit_form_values,
|
||||
)
|
||||
|
||||
REST = {
|
||||
"2026-08-07": False,
|
||||
"2026-08-08": True,
|
||||
"2026-08-09": True,
|
||||
}
|
||||
|
||||
|
||||
def is_rest(ymd: str) -> bool:
|
||||
if ymd in REST:
|
||||
return REST[ymd]
|
||||
from datetime import datetime
|
||||
|
||||
return datetime.strptime(ymd, "%Y-%m-%d").weekday() >= 5
|
||||
|
||||
|
||||
def test_weekday_evening():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-07 18:00", "2026-08-07 20:00", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
== 2.0
|
||||
)
|
||||
|
||||
|
||||
def test_weekday_partial_window():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-07 14:00", "2026-08-07 18:00", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
== 0.5
|
||||
)
|
||||
|
||||
|
||||
def test_full_weekday_window():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-07 17:30", "2026-08-08 08:30", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
== 15.0
|
||||
)
|
||||
|
||||
|
||||
def test_saturday_with_break():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-08 09:00", "2026-08-08 15:00", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
== 4.0
|
||||
)
|
||||
|
||||
|
||||
def test_fri_to_sat():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-07 18:00", "2026-08-08 12:00", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
== 17.5
|
||||
)
|
||||
|
||||
|
||||
def test_invalid():
|
||||
assert (
|
||||
calc_overtime_hours("2026-08-07 20:00", "2026-08-07 18:00", DEFAULT_OVERTIME_WINDOWS, is_rest)
|
||||
is None
|
||||
)
|
||||
|
||||
|
||||
def test_apply_overwrites_when_not_manual():
|
||||
schema = {
|
||||
"rule": [
|
||||
{
|
||||
"type": "overtimeKit",
|
||||
"props": {
|
||||
"startField": "overtimeStart",
|
||||
"endField": "overtimeEnd",
|
||||
"durationField": "overtimeDuration",
|
||||
},
|
||||
"children": [
|
||||
{"type": "person", "field": "overtimePerson"},
|
||||
{
|
||||
"type": "datePicker",
|
||||
"field": "overtimeStart",
|
||||
"props": {"_fc_kit_field": "overtimeStart"},
|
||||
},
|
||||
{
|
||||
"type": "datePicker",
|
||||
"field": "overtimeEnd",
|
||||
"props": {"_fc_kit_field": "overtimeEnd"},
|
||||
},
|
||||
{
|
||||
"type": "inputNumber",
|
||||
"field": "overtimeDuration",
|
||||
"props": {"_fc_kit_field": "overtimeDuration"},
|
||||
},
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
data = {
|
||||
"overtimeStart": "2026-08-07 18:00",
|
||||
"overtimeEnd": "2026-08-07 20:00",
|
||||
"overtimeDuration": 1,
|
||||
}
|
||||
out = apply_overtime_kit_hours(schema, data, is_rest)
|
||||
assert out["overtimeDuration"] == 2.0
|
||||
|
||||
|
||||
def test_apply_respects_manual():
|
||||
schema = {
|
||||
"rule": [
|
||||
{
|
||||
"type": "overtimeKit",
|
||||
"props": {},
|
||||
"children": [
|
||||
{"type": "datePicker", "field": "overtimeStart"},
|
||||
{"type": "datePicker", "field": "overtimeEnd"},
|
||||
{"type": "inputNumber", "field": "overtimeDuration"},
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
data = {
|
||||
"overtimeStart": "2026-08-07 18:00",
|
||||
"overtimeEnd": "2026-08-07 20:00",
|
||||
"overtimeDuration": 8,
|
||||
f"{MANUAL_PREFIX}overtimeDuration": True,
|
||||
}
|
||||
out = apply_overtime_kit_hours(schema, data, is_rest)
|
||||
assert out["overtimeDuration"] == 8.0
|
||||
|
||||
|
||||
def test_validate_end_before_start():
|
||||
schema = {
|
||||
"rule": [
|
||||
{
|
||||
"type": "overtimeKit",
|
||||
"children": [
|
||||
{"type": "datePicker", "field": "s"},
|
||||
{"type": "datePicker", "field": "e"},
|
||||
{"type": "inputNumber", "field": "d"},
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
errs = validate_overtime_kit_form_values(
|
||||
schema, {"s": "2026-08-07 20:00", "e": "2026-08-07 18:00", "d": 1}
|
||||
)
|
||||
assert any("结束" in e for e in errs)
|
||||
@@ -30,7 +30,7 @@ class TestFlatten(unittest.TestCase):
|
||||
self.assertEqual(fields[0], {"label": "事由", "value": "出差"})
|
||||
self.assertEqual(
|
||||
fields[1]["value"],
|
||||
"https://cdn.example.com/a.png、https://cdn.example.com/b.png",
|
||||
"a.png、b.png",
|
||||
)
|
||||
self.assertTrue(fields[1].get("fullWidth"))
|
||||
self.assertEqual(fields[2]["value"], "已关联 2 条")
|
||||
@@ -115,7 +115,7 @@ class TestFlatten(unittest.TestCase):
|
||||
fields = flatten_form_fields_for_summary(schema, data)
|
||||
self.assertEqual(
|
||||
fields[0]["value"],
|
||||
"https://cdn.example.com/a.pdf、/mini/b.pdf",
|
||||
"a.pdf、b.pdf",
|
||||
)
|
||||
|
||||
def test_extract_links_with_field_key_and_dedupe(self):
|
||||
@@ -133,15 +133,153 @@ class TestFlatten(unittest.TestCase):
|
||||
self.assertEqual(links, [("relA", "x"), ("relB", "solo")])
|
||||
|
||||
|
||||
def test_trip_itinerary_formats_legs(self):
|
||||
schema = {
|
||||
"rule": [
|
||||
{"type": "tripItinerary", "field": "legs", "title": "行程"},
|
||||
]
|
||||
}
|
||||
data = {
|
||||
"legs": [
|
||||
{
|
||||
"transport": "汽车",
|
||||
"tripType": "往返",
|
||||
"fromCity": "合肥",
|
||||
"toCity": "上海",
|
||||
"startDate": "2026-08-10",
|
||||
"startHalf": "上午",
|
||||
"endDate": "2026-08-13",
|
||||
"endHalf": "下午",
|
||||
"duration": 4.0,
|
||||
"durationManual": False,
|
||||
}
|
||||
]
|
||||
}
|
||||
fields = flatten_form_fields_for_summary(schema, data)
|
||||
self.assertEqual(len(fields), 1)
|
||||
self.assertIn("合肥 → 上海", fields[0]["value"])
|
||||
self.assertIn("汽车", fields[0]["value"])
|
||||
self.assertNotIn("durationManual", fields[0]["value"])
|
||||
self.assertTrue(fields[0].get("fullWidth"))
|
||||
|
||||
def test_region_and_cascader_path(self):
|
||||
schema = {
|
||||
"rule": [
|
||||
{"type": "region", "field": "r1", "title": "省市区"},
|
||||
{"type": "cascader", "field": "c1", "title": "级联"},
|
||||
{"type": "dateRange", "field": "d1", "title": "日期区间"},
|
||||
]
|
||||
}
|
||||
data = {
|
||||
"r1": ["安徽省", "合肥市", "蜀山区"],
|
||||
"c1": {"province": "安徽省", "city": "合肥市", "district": "蜀山区"},
|
||||
"d1": ["2026-08-10", "2026-08-13"],
|
||||
}
|
||||
fields = flatten_form_fields_for_summary(schema, data)
|
||||
by = {f["label"]: f["value"] for f in fields}
|
||||
self.assertEqual(by["省市区"], "安徽省 / 合肥市 / 蜀山区")
|
||||
self.assertEqual(by["级联"], "安徽省 / 合肥市 / 蜀山区")
|
||||
self.assertEqual(by["日期区间"], "2026-08-10 ~ 2026-08-13")
|
||||
|
||||
def test_unknown_object_does_not_dump_json(self):
|
||||
schema = {"rule": [{"type": "input", "field": "x", "title": "怪字段"}]}
|
||||
# 模拟误写入对象:不应出现整段 dict 字面量
|
||||
fields = flatten_form_fields_for_summary(
|
||||
schema, {"x": {"foo": 1, "bar": "baz", "id": "hidden"}}
|
||||
)
|
||||
self.assertNotIn("{", fields[0]["value"])
|
||||
self.assertNotIn("hidden", fields[0]["value"])
|
||||
self.assertIn("baz", fields[0]["value"])
|
||||
|
||||
def test_kit_containers_skipped(self):
|
||||
schema = {
|
||||
"rule": [
|
||||
{
|
||||
"type": "tripKit",
|
||||
"field": "kit1",
|
||||
"title": "出差套件",
|
||||
"children": [
|
||||
{"type": "input", "field": "reason", "title": "出差事由"},
|
||||
],
|
||||
}
|
||||
]
|
||||
}
|
||||
fields = flatten_form_fields_for_summary(schema, {"kit1": {"x": 1}, "reason": "学习"})
|
||||
labels = [f["label"] for f in fields]
|
||||
self.assertNotIn("出差套件", labels)
|
||||
self.assertEqual(fields[0], {"label": "出差事由", "value": "学习"})
|
||||
|
||||
|
||||
class TestValidateLinkable(unittest.TestCase):
|
||||
def test_rejects_non_completed(self):
|
||||
def _inst(self, **kw):
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
defaults = dict(
|
||||
status="running",
|
||||
initiator_user_id="u1",
|
||||
tenant_no="t",
|
||||
del_flag=0,
|
||||
id="i1",
|
||||
)
|
||||
defaults.update(kw)
|
||||
return MagicMock(**defaults)
|
||||
|
||||
def test_initiator_any_status_ok(self):
|
||||
from app.services.oa_related_approval import assert_linkable_instance
|
||||
|
||||
for st in ("running", "completed", "rejected", "returned", "cancelled"):
|
||||
assert_linkable_instance(
|
||||
self._inst(status=st), user_id="u1", tenant_no="t", db=None
|
||||
)
|
||||
|
||||
def test_rejects_unrelated_user_without_db_tasks(self):
|
||||
from app.services.oa_related_approval import assert_linkable_instance
|
||||
from app.services.oa_engine import OaEngineError
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
inst = MagicMock(status="running", initiator_user_id="u1", tenant_no="t", del_flag=0)
|
||||
db = MagicMock()
|
||||
# no tasks
|
||||
db.query.return_value.filter.return_value.first.return_value = None
|
||||
with self.assertRaises(OaEngineError):
|
||||
assert_linkable_instance(inst, user_id="u1", tenant_no="t")
|
||||
assert_linkable_instance(
|
||||
self._inst(initiator_user_id="other"),
|
||||
user_id="u1",
|
||||
tenant_no="t",
|
||||
db=db,
|
||||
)
|
||||
|
||||
def test_done_approver_ok(self):
|
||||
from app.services.oa_related_approval import assert_linkable_instance
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
db = MagicMock()
|
||||
db.query.return_value.filter.return_value.first.return_value = MagicMock()
|
||||
assert_linkable_instance(
|
||||
self._inst(initiator_user_id="other", status="running"),
|
||||
user_id="u1",
|
||||
tenant_no="t",
|
||||
db=db,
|
||||
)
|
||||
|
||||
|
||||
class TestCandidateCardHelpers(unittest.TestCase):
|
||||
def test_status_text(self):
|
||||
from app.services.oa_related_approval import related_status_text
|
||||
|
||||
self.assertEqual(related_status_text("running"), "处理中")
|
||||
self.assertEqual(related_status_text("completed"), "已通过")
|
||||
self.assertEqual(related_status_text("rejected"), "已拒绝")
|
||||
self.assertEqual(related_status_text("returned"), "已打回")
|
||||
self.assertEqual(related_status_text("cancelled"), "已撤销")
|
||||
|
||||
def test_display_title(self):
|
||||
from app.services.oa_related_approval import related_display_title
|
||||
|
||||
self.assertEqual(
|
||||
related_display_title("吴自龙", "人事审批", ""),
|
||||
"吴自龙提交的人事审批",
|
||||
)
|
||||
self.assertEqual(related_display_title("", "请假", "自定义标题"), "请假")
|
||||
|
||||
|
||||
class TestMergeRelationTargets(unittest.TestCase):
|
||||
|
||||
@@ -0,0 +1,228 @@
|
||||
"""OA 待办/已办/我发起/抄送列表分页"""
|
||||
import unittest
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
|
||||
class TestListTasksPagination(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from app.models.models import OaApp, OaAppVersion, OaInstance, OaTask, SysUser
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
OaApp.__table__.create(self.engine)
|
||||
OaAppVersion.__table__.create(self.engine)
|
||||
OaInstance.__table__.create(self.engine)
|
||||
OaTask.__table__.create(self.engine)
|
||||
SysUser.__table__.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
self.OaTask = OaTask
|
||||
self.OaInstance = OaInstance
|
||||
now = datetime(2026, 8, 11, 10, 0, 0)
|
||||
self.db.add(
|
||||
OaApp(
|
||||
id="app1",
|
||||
app_name="请假审批",
|
||||
initiator_scope="all",
|
||||
admin_scope="all_oa_admin",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaAppVersion(
|
||||
id="v1",
|
||||
app_id="app1",
|
||||
version_no=1,
|
||||
status="published",
|
||||
is_latest_published="1",
|
||||
form_schema_json="{}",
|
||||
flow_tree_json="{}",
|
||||
advanced_settings_json="{}",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
SysUser(
|
||||
id="u0",
|
||||
user_no="initiator",
|
||||
nick_name="发起人",
|
||||
password="x",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
SysUser(
|
||||
id="u1",
|
||||
user_no="approver",
|
||||
nick_name="审批人",
|
||||
password="x",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
# 25 条 pending 给 u1;各绑独立实例便于 enrich
|
||||
for i in range(25):
|
||||
iid = f"i-p-{i:02d}"
|
||||
t = now + timedelta(minutes=i)
|
||||
self.db.add(
|
||||
OaInstance(
|
||||
id=iid,
|
||||
app_id="app1",
|
||||
app_version_id="v1",
|
||||
title=f"单-{i}",
|
||||
initiator_user_id="u0",
|
||||
initiator_dept_id="d1",
|
||||
form_data_json="{}",
|
||||
status="running",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=t,
|
||||
update_time=t,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaTask(
|
||||
id=f"t-p-{i:02d}",
|
||||
instance_id=iid,
|
||||
node_key="a1",
|
||||
node_name="审批",
|
||||
task_type="approval",
|
||||
assignee_user_id="u1",
|
||||
status="pending",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=t,
|
||||
update_time=t,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
# 3 条 mine 实例
|
||||
for i in range(3):
|
||||
t = now + timedelta(hours=i)
|
||||
self.db.add(
|
||||
OaInstance(
|
||||
id=f"i-m-{i}",
|
||||
app_id="app1",
|
||||
app_version_id="v1",
|
||||
title=f"我发-{i}",
|
||||
initiator_user_id="u0",
|
||||
initiator_dept_id="d1",
|
||||
form_data_json="{}",
|
||||
status="running",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=t,
|
||||
update_time=t,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
# 5 条 cc,其中 2 未读
|
||||
for i in range(5):
|
||||
iid = f"i-c-{i}"
|
||||
t = now + timedelta(seconds=i)
|
||||
self.db.add(
|
||||
OaInstance(
|
||||
id=iid,
|
||||
app_id="app1",
|
||||
app_version_id="v1",
|
||||
title=f"抄送-{i}",
|
||||
initiator_user_id="u0",
|
||||
initiator_dept_id="d1",
|
||||
form_data_json="{}",
|
||||
status="running",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=t,
|
||||
update_time=t,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
OaTask(
|
||||
id=f"t-c-{i}",
|
||||
instance_id=iid,
|
||||
node_key="cc1",
|
||||
node_name="抄送",
|
||||
task_type="cc",
|
||||
assignee_user_id="u1",
|
||||
status="done",
|
||||
is_read=0 if i < 2 else 1,
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=t,
|
||||
update_time=t,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.commit()
|
||||
|
||||
def tearDown(self):
|
||||
self.db.close()
|
||||
self.engine.dispose()
|
||||
|
||||
def test_pending_paginates(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
page1 = list_tasks(
|
||||
self.db, tenant_no="zkxw", user_id="u1", kind="pending", page=1, page_size=20
|
||||
)
|
||||
self.assertEqual(page1["total"], 25)
|
||||
self.assertEqual(len(page1["list"]), 20)
|
||||
|
||||
page2 = list_tasks(
|
||||
self.db, tenant_no="zkxw", user_id="u1", kind="pending", page=2, page_size=20
|
||||
)
|
||||
self.assertEqual(page2["total"], 25)
|
||||
self.assertEqual(len(page2["list"]), 5)
|
||||
ids1 = {r["id"] for r in page1["list"]}
|
||||
ids2 = {r["id"] for r in page2["list"]}
|
||||
self.assertFalse(ids1 & ids2)
|
||||
|
||||
def test_mine_paginates(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
# u0 发起:25 pending 实例 + 3 mine + 5 cc 实例 = 33
|
||||
res = list_tasks(
|
||||
self.db, tenant_no="zkxw", user_id="u0", kind="mine", page=1, page_size=10
|
||||
)
|
||||
self.assertEqual(res["total"], 33)
|
||||
self.assertEqual(len(res["list"]), 10)
|
||||
|
||||
def test_cc_unread_filter_then_paginate(self):
|
||||
from app.services.oa_engine import list_tasks
|
||||
|
||||
res = list_tasks(
|
||||
self.db,
|
||||
tenant_no="zkxw",
|
||||
user_id="u1",
|
||||
kind="cc",
|
||||
read_status="unread",
|
||||
page=1,
|
||||
page_size=20,
|
||||
)
|
||||
self.assertEqual(res["total"], 2)
|
||||
self.assertEqual(len(res["list"]), 2)
|
||||
self.assertTrue(all(not r.get("isRead") for r in res["list"]))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,167 @@
|
||||
"""用户列表关联补全:须批量查询,避免按用户 N+1。"""
|
||||
import unittest
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import create_engine, event
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
|
||||
class TestEnrichUserRelationsPerf(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from app.models.models import (
|
||||
SysPost,
|
||||
SysPostRole,
|
||||
SysRole,
|
||||
SysUser,
|
||||
SysUserPost,
|
||||
SysUserRole,
|
||||
)
|
||||
|
||||
self.engine = create_engine("sqlite:///:memory:")
|
||||
for table in (
|
||||
SysUser.__table__,
|
||||
SysRole.__table__,
|
||||
SysUserRole.__table__,
|
||||
SysPost.__table__,
|
||||
SysUserPost.__table__,
|
||||
SysPostRole.__table__,
|
||||
):
|
||||
table.create(self.engine)
|
||||
Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self.db = Session()
|
||||
self.now = datetime.now()
|
||||
self.query_count = 0
|
||||
|
||||
@event.listens_for(self.engine, "before_cursor_execute")
|
||||
def _count(_conn, _cursor, _statement, _parameters, _context, _executemany):
|
||||
self.query_count += 1
|
||||
|
||||
self._listener = _count
|
||||
self.SysUser = SysUser
|
||||
self.SysRole = SysRole
|
||||
self.SysUserRole = SysUserRole
|
||||
self.SysPost = SysPost
|
||||
self.SysUserPost = SysUserPost
|
||||
self.SysPostRole = SysPostRole
|
||||
|
||||
def tearDown(self):
|
||||
event.remove(self.engine, "before_cursor_execute", self._listener)
|
||||
self.db.close()
|
||||
self.engine.dispose()
|
||||
|
||||
def _seed(self, n: int = 20):
|
||||
self.db.add(
|
||||
self.SysRole(
|
||||
id="role-direct",
|
||||
role_name="运营管理员",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.SysRole(
|
||||
id="role-post",
|
||||
role_name="职位角色",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.SysPost(
|
||||
id="post-1",
|
||||
post_name="人事",
|
||||
post_code="hr",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.SysPostRole(
|
||||
id="pr-1",
|
||||
post_id="post-1",
|
||||
role_id="role-post",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
for i in range(n):
|
||||
uid = f"u{i}"
|
||||
self.db.add(
|
||||
self.SysUser(
|
||||
id=uid,
|
||||
user_no=f"user{i}",
|
||||
nick_name=f"用户{i}",
|
||||
password="x",
|
||||
status="1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.SysUserRole(
|
||||
id=f"ur{i}",
|
||||
user_id=uid,
|
||||
role_id="role-direct",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.add(
|
||||
self.SysUserPost(
|
||||
id=f"up{i}",
|
||||
user_id=uid,
|
||||
post_id="post-1",
|
||||
tenant_no="zkxw",
|
||||
create_dept_id="",
|
||||
create_time=self.now,
|
||||
update_time=self.now,
|
||||
del_flag=0,
|
||||
)
|
||||
)
|
||||
self.db.commit()
|
||||
|
||||
def test_enrich_query_count_bounded_and_fields_correct(self):
|
||||
from app.crud import user as user_crud
|
||||
|
||||
n = 20
|
||||
self._seed(n)
|
||||
items = [{"id": f"u{i}"} for i in range(n)]
|
||||
self.query_count = 0
|
||||
out = user_crud.enrich_user_dicts_with_relations(self.db, items)
|
||||
|
||||
self.assertIs(out, items)
|
||||
self.assertEqual(len(items), n)
|
||||
first = items[0]
|
||||
self.assertEqual(first["roleIds"], ["role-direct"])
|
||||
self.assertEqual(first["postIds"], ["post-1"])
|
||||
self.assertEqual(first["postInheritedRoleIds"], ["role-post"])
|
||||
self.assertEqual(first["effectiveRoleIds"], ["role-direct", "role-post"])
|
||||
self.assertEqual(first["effectiveRoleNames"], ["运营管理员", "职位角色"])
|
||||
# 批量查询:角色/职位关联 + 启用角色名,不应随用户数线性增长
|
||||
self.assertLessEqual(self.query_count, 8)
|
||||
self.assertLess(self.query_count, n)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,60 @@
|
||||
"""微信登录:openid 已绑定也须校验本次授权手机号。"""
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from app.services.wechat_login_service import resolve_wechat_login_user
|
||||
from app.services.wechat_mini_auth import phones_match
|
||||
|
||||
|
||||
def test_phones_match_equal():
|
||||
assert phones_match("13800138000", "13800138000") is True
|
||||
|
||||
|
||||
def test_phones_match_normalizes_plus86():
|
||||
assert phones_match("13800138000", "+8613800138000") is True
|
||||
|
||||
|
||||
def test_phones_match_mismatch():
|
||||
assert phones_match("13866751937", "17756576757") is False
|
||||
|
||||
|
||||
def test_phones_match_empty_account_fails():
|
||||
assert phones_match(None, "17756576757") is False
|
||||
assert phones_match("", "17756576757") is False
|
||||
|
||||
|
||||
def test_resolve_openid_bound_but_phone_mismatch_rejects():
|
||||
bound = SimpleNamespace(
|
||||
id="admin-id",
|
||||
phone_no="13866751937",
|
||||
wx_openid="oid-admin",
|
||||
)
|
||||
db = MagicMock()
|
||||
with patch(
|
||||
"app.services.wechat_login_service.user_crud.get_by_wx_openid",
|
||||
return_value=bound,
|
||||
):
|
||||
user, err, code = resolve_wechat_login_user(
|
||||
db, openid="oid-admin", phone="17756576757"
|
||||
)
|
||||
assert user is None
|
||||
assert code == 401
|
||||
assert "不一致" in err
|
||||
|
||||
|
||||
def test_resolve_openid_bound_and_phone_match_ok():
|
||||
bound = SimpleNamespace(
|
||||
id="admin-id",
|
||||
phone_no="13866751937",
|
||||
wx_openid="oid-admin",
|
||||
)
|
||||
db = MagicMock()
|
||||
with patch(
|
||||
"app.services.wechat_login_service.user_crud.get_by_wx_openid",
|
||||
return_value=bound,
|
||||
):
|
||||
user, err, code = resolve_wechat_login_user(
|
||||
db, openid="oid-admin", phone="13866751937"
|
||||
)
|
||||
assert err is None and code is None
|
||||
assert user is bound
|
||||
Reference in new issue
Block a user