fix(pl): 按车辆类型统一派车日历卡片配色以区分自有三方和待派车。
This commit is contained in:
1 parent
cb0344498a
commit
043e2ef661
11 files changed
+268
-27
No files matched your search
@@ -73,7 +73,7 @@ def test_crud_duplicate_trips_snapshots_and_soft_delete(db):
|
||||
assert result['licensePlate'] == '鄂E67890' and result['productName'] == '盐酸'
|
||||
assert result['origin'] == '武汉'
|
||||
assert result['calendarKind'] == 'acid'
|
||||
assert set(result) == {'id', 'dispatchDate', 'vehicleId', 'licensePlate', 'productId', 'productName', 'origin', 'destination', 'quantity', 'calendarKind', 'documentType', 'sourceRecordId', 'remark', 'createTime', 'updateTime'}
|
||||
assert set(result) == {'id', 'dispatchDate', 'vehicleId', 'vehicleType', 'licensePlate', 'productId', 'productName', 'origin', 'destination', 'quantity', 'calendarKind', 'documentType', 'sourceRecordId', 'remark', 'createTime', 'updateTime'}
|
||||
assert svc.delete_record(db, 't1', user(), first.id) == 1
|
||||
assert db.get(model, first.id).del_flag == 1
|
||||
assert svc.list_records(db, 't1', user(), month='2026-10')['total'] == 1
|
||||
@@ -460,3 +460,107 @@ def test_pending_vehicle_still_validates_product(db, product_id):
|
||||
assert exc.value.status_code == 422
|
||||
assert '产品' in exc.value.detail
|
||||
assert db.query(model).count() == 0
|
||||
|
||||
|
||||
@pytest.mark.parametrize('kind', ['acid', 'alkali', 'other', 'site'])
|
||||
def test_vehicle_type_classification_is_scoped_and_current(db, monkeypatch, kind):
|
||||
model, _, _, svc = modules()
|
||||
db.add(PlVehicle(id='legacy', license_plate='待派车', vehicle_type='legacy',
|
||||
tenant_no='t1', create_by='u1'))
|
||||
ids = ['v1', 'v2', '__pending_vehicle__', 'v3', 'v4', 'missing', 'legacy']
|
||||
for vehicle_id in ids:
|
||||
db.add(model(id='type-' + vehicle_id, dispatch_date=date(2026, 10, 26),
|
||||
vehicle_id=vehicle_id, license_plate='待派车', product_id='p1',
|
||||
product_name='液碱', origin='', destination='', calendar_kind=kind,
|
||||
tenant_no='t1', create_by='u1'))
|
||||
db.commit()
|
||||
def types(caller):
|
||||
return {r['vehicleId']: r.get('vehicleType') for r in
|
||||
svc.list_records(db, 't1', caller, month='2026-10', calendar_kind=kind)['list']}
|
||||
expected = dict(zip(ids, ['self', 'carrier', 'pending', 'unknown', 'unknown', 'unknown', 'unknown']))
|
||||
assert types(user()) == expected
|
||||
import app.core.data_scope as scope
|
||||
monkeypatch.setattr(scope, '_resolve_user_role_scopes', lambda *a: [{'data_scope': '4', 'details': []}])
|
||||
assert types(user(role='admin')) == {**expected, 'v2': 'unknown'}
|
||||
db.get(PlVehicle, 'v1').vehicle_type = 'carrier'
|
||||
db.commit()
|
||||
assert types(user())['v1'] == 'carrier'
|
||||
|
||||
|
||||
def test_vehicle_types_use_one_query_for_current_page(db):
|
||||
from sqlalchemy import event
|
||||
model, _, _, svc = modules()
|
||||
for i in range(25):
|
||||
db.add(model(id=f'batch-{i:02}', dispatch_date=date(2026, 10, 26),
|
||||
vehicle_id='v1' if i < 20 else 'v2', license_plate='车牌',
|
||||
product_id='p1', product_name='液碱', origin='', destination='',
|
||||
tenant_no='t1', create_by='u1', create_time=datetime(2026, 10, 26, 0, i)))
|
||||
db.commit()
|
||||
statements = []
|
||||
def capture(conn, cursor, statement, parameters, context, executemany):
|
||||
if 'FROM pl_vehicle' in statement:
|
||||
statements.append((statement, parameters))
|
||||
event.listen(db.get_bind(), 'before_cursor_execute', capture)
|
||||
try:
|
||||
page = svc.list_records(db, 't1', user(), month='2026-10', page_size=5)
|
||||
assert [r.get('vehicleType') for r in page['list']] == ['carrier'] * 5
|
||||
assert len(statements) == 1
|
||||
assert 'v2' in statements[0][1] and 'v1' not in statements[0][1]
|
||||
statements.clear()
|
||||
assert svc.list_records(db, 't1', user(), month='2026-09')['list'] == []
|
||||
assert not statements
|
||||
finally:
|
||||
event.remove(db.get_bind(), 'before_cursor_execute', capture)
|
||||
|
||||
|
||||
def test_single_record_routes_return_vehicle_type(db):
|
||||
from app.api.pl import dispatch_calendar as api, site_dispatch_calendar as site_api
|
||||
_, Create, Update, _ = modules()
|
||||
created = api.create_record(Create(**payload()), db, user())
|
||||
assert created.get('vehicleType') == 'self'
|
||||
assert api.get_record(created['id'], db, user()).get('vehicleType') == 'self'
|
||||
updated = api.update_record(created['id'], Update(**payload(vehicleId='v2')), db, user())
|
||||
assert updated.get('vehicleType') == 'carrier'
|
||||
pending = api.create_record(Create(**payload(vehicleId='__pending_vehicle__', calendarKind='site')), db, user())
|
||||
assert pending.get('vehicleType') == 'pending'
|
||||
assert site_api.get_record(pending['id'], db, user()).get('vehicleType') == 'pending'
|
||||
with pytest.raises(ValidationError):
|
||||
Create(**payload(vehicleType='self'))
|
||||
|
||||
|
||||
@pytest.mark.parametrize('action', ['create', 'update'])
|
||||
@pytest.mark.parametrize('vehicle_id,expected', [
|
||||
('v1', 'self'), ('v2', 'carrier'), ('__pending_vehicle__', 'pending'), ('legacy', 'unknown'),
|
||||
])
|
||||
def test_save_response_never_queries_after_commit(db, action, vehicle_id, expected):
|
||||
from sqlalchemy import event
|
||||
from app.api.pl import dispatch_calendar as api
|
||||
_, Create, Update, _ = modules()
|
||||
db.add(PlVehicle(id='legacy', license_plate='旧车辆', vehicle_type='legacy',
|
||||
tenant_no='t1', create_by='u1'))
|
||||
db.commit()
|
||||
# 与应用 SessionLocal 一致;提交后失联也必须返回已成功保存的数据。
|
||||
with sessionmaker(bind=db.get_bind(), expire_on_commit=False)() as session:
|
||||
existing = api.create_record(Create(**payload()), session, user()) if action == 'update' else None
|
||||
committed = False
|
||||
|
||||
def after_commit(session):
|
||||
nonlocal committed
|
||||
committed = True
|
||||
|
||||
def reject_after_commit(conn, cursor, statement, parameters, context, executemany):
|
||||
assert not committed, '保存成功后不得再查询数据库生成响应'
|
||||
|
||||
event.listen(session, 'after_commit', after_commit)
|
||||
event.listen(db.get_bind(), 'before_cursor_execute', reject_after_commit)
|
||||
try:
|
||||
body = payload(vehicleId=vehicle_id, origin='山峡')
|
||||
result = (api.create_record(Create(**body), session, user()) if action == 'create'
|
||||
else api.update_record(existing['id'], Update(**body), session, user()))
|
||||
assert committed
|
||||
assert result['vehicleType'] == expected
|
||||
assert result['vehicleId'] == vehicle_id
|
||||
assert result['id']
|
||||
finally:
|
||||
event.remove(session, 'after_commit', after_commit)
|
||||
event.remove(db.get_bind(), 'before_cursor_execute', reject_after_commit)
|
||||
@@ -13,6 +13,7 @@ from app.core.auth import get_current_user
|
||||
from app.core.database import get_db
|
||||
from app.models.models import SysMenu, SysRole, SysRoleMenu, SysUserRole, SysRoleDataScopeDetail
|
||||
from app.models.pl_dispatch_calendar import PlDispatchCalendar
|
||||
from app.models.pl_models import PlVehicle
|
||||
|
||||
PATH = '/api/transport/site-dispatch-calendar'
|
||||
ORIGINAL = '/api/transport/dispatch-calendar'
|
||||
@@ -25,11 +26,13 @@ def setup():
|
||||
from app.api.pl.site_dispatch_calendar import router
|
||||
from app.api.pl.dispatch_calendar import router as original_router
|
||||
engine = create_engine('sqlite://', connect_args={'check_same_thread': False}, poolclass=StaticPool)
|
||||
for model in (PlDispatchCalendar, SysMenu, SysRole, SysRoleMenu, SysUserRole, SysRoleDataScopeDetail):
|
||||
for model in (PlDispatchCalendar, PlVehicle, SysMenu, SysRole, SysRoleMenu, SysUserRole, SysRoleDataScopeDetail):
|
||||
model.__table__.create(engine)
|
||||
factory = sessionmaker(bind=engine)
|
||||
with factory() as db:
|
||||
db.add_all([
|
||||
PlVehicle(id='v1', vehicle_type='self', license_plate='鄂E12345', tenant_no='t1', create_by='u1'),
|
||||
PlVehicle(id='v2', vehicle_type='carrier', license_plate='鄂E67890', tenant_no='t1', create_by='u2'),
|
||||
SysRole(id='r1', role_name='基础角色', tenant_no='t1', data_scope='4'),
|
||||
SysRole(id='r2', role_name='现场人员', tenant_no='t1', data_scope='4'),
|
||||
SysUserRole(id='ur1', user_id='u1', role_id='r1', tenant_no='t1'),
|
||||
@@ -97,7 +100,9 @@ def test_fixed_kind_tenant_scope_and_details(setup):
|
||||
'tenant_no': 't2', 'vehicleId': 'v1'})
|
||||
assert response.status_code == 200
|
||||
assert [r['id'] for r in response.json()['list']] == ['site-own']
|
||||
assert response.json()['list'][0]['vehicleType'] == 'self'
|
||||
assert client.get(PATH + '/site-own').json()['calendarKind'] == 'site'
|
||||
assert client.get(PATH + '/site-own').json()['vehicleType'] == 'self'
|
||||
for rid in ('acid', 'alkali', 'other', 'site-t2', 'site-other', 'site-deleted', 'missing', 'vehicles', 'products'):
|
||||
assert client.get(PATH + '/' + rid).status_code == 404
|
||||
assert client.get(PATH, params={'month': '2026-10', 'vehicleId': 'v2'}).json()['total'] == 0
|
||||
@@ -107,6 +112,7 @@ def test_fixed_kind_tenant_scope_and_details(setup):
|
||||
# 菜单授权来自第二角色,全部数据范围来自第一角色,均按并集生效。
|
||||
assert client.get(PATH, params={'month': '2026-10'}).json()['total'] == 2
|
||||
assert client.get(PATH + '/site-other').status_code == 200
|
||||
assert client.get(PATH + '/site-other').json()['vehicleType'] == 'carrier'
|
||||
assert client.get(PATH + '/site-t2').status_code == 404
|
||||
page1 = client.get(PATH, params={'month': '2026-10', 'pageSize': 1, 'page': 1}).json()
|
||||
page2 = client.get(PATH, params={'month': '2026-10', 'pageSize': 1, 'page': 2}).json()
|
||||
|
||||
Reference in new issue
Block a user