feat: 添加module表status字段及相关接口优化
1. 在module表新增status字段(0:待确认;1:正常;2:弃用) 2. 修改/document/generate-cases接口,创建模块时设置status=0 3. 修改/case/restore接口,恢复用例时同步更新模块及其父模块的status为1 4. 修改/case/list接口,支持module_status参数过滤,默认只显示status=1的模块 5. 修改/case/list接口,返回module_path字段 6. 修改/plan/case/list接口,返回module_path字段 7. 修改/module/tree接口,默认筛选status=1的数据 8. 优化数据库连接池配置,添加连接验证和自动重试机制
This commit is contained in:
@@ -31,6 +31,8 @@ class CaseController(BaseCrudController):
|
||||
|
||||
if hasattr(Module, 'is_delete'):
|
||||
query = query.filter(Module.is_delete == 0)
|
||||
if hasattr(Module, 'status'):
|
||||
query = query.filter(Module.status == 1)
|
||||
|
||||
total = query.count()
|
||||
|
||||
@@ -90,11 +92,18 @@ class CaseController(BaseCrudController):
|
||||
filters.append(Module.name.like('%{}%'.format(module_name)))
|
||||
|
||||
for req_key, column in [('moduleId', TestCase.module_id), ('priority', TestCase.priority),
|
||||
('caseType', TestCase.case_type), ('status', TestCase.status),
|
||||
('isAuto', TestCase.is_auto)]:
|
||||
('caseType', TestCase.case_type), ('isAuto', TestCase.is_auto)]:
|
||||
value = self._get(self.req_data, req_key)
|
||||
if value not in (None, ''):
|
||||
filters.append(column == int(value))
|
||||
is_ai_generated = self._get(self.req_data, 'isAiGenerated', 'is_ai_generated')
|
||||
if is_ai_generated not in (None, ''):
|
||||
filters.append(TestCase.is_ai_generated == int(is_ai_generated))
|
||||
status = self._get(self.req_data, 'status')
|
||||
if status not in (None, ''):
|
||||
filters.append(TestCase.status == int(status))
|
||||
else:
|
||||
filters.append(TestCase.status != 0)
|
||||
|
||||
keyword = self._get(self.req_data, 'keyword')
|
||||
if keyword:
|
||||
@@ -108,7 +117,7 @@ class CaseController(BaseCrudController):
|
||||
if created_by_name:
|
||||
filters.append(User.real_name.like('%{}%'.format(created_by_name)))
|
||||
|
||||
query = self.session.query(TestCase, Project.name.label('project_name'), Module.name.label('module_name'), User.real_name.label('created_by_name')).\
|
||||
query = self.session.query(TestCase, Project.name.label('project_name'), Module.name.label('module_name'), Module.path.label('module_path'), User.real_name.label('created_by_name')).\
|
||||
join(Project, TestCase.project_id == Project.id, isouter=True).\
|
||||
join(Module, TestCase.module_id == Module.id, isouter=True).\
|
||||
join(User, TestCase.created_by == User.id, isouter=True).\
|
||||
@@ -120,6 +129,14 @@ class CaseController(BaseCrudController):
|
||||
query = query.filter(Project.is_delete == 0)
|
||||
if hasattr(Module, 'is_delete'):
|
||||
query = query.filter(or_(Module.is_delete == 0, Module.is_delete.is_(None)))
|
||||
if hasattr(Module, 'status'):
|
||||
module_status = self._get(self.req_data, 'moduleStatus', 'module_status')
|
||||
if module_status not in (None, ''):
|
||||
# 如果传入了module_status参数,按指定状态过滤
|
||||
query = query.filter(Module.status == int(module_status))
|
||||
else:
|
||||
# 默认只查询状态为1的模块
|
||||
query = query.filter(or_(Module.status == 1, Module.status.is_(None)))
|
||||
if hasattr(User, 'is_delete'):
|
||||
query = query.filter(or_(User.is_delete == 0, User.is_delete.is_(None)))
|
||||
|
||||
@@ -132,10 +149,11 @@ class CaseController(BaseCrudController):
|
||||
items = query.offset((page_num - 1) * page_size).limit(page_size).all()
|
||||
|
||||
result_list = []
|
||||
for case, project_name, module_name, created_by_name in items:
|
||||
for case, project_name, module_name, module_path, created_by_name in items:
|
||||
case_dict = self.serialize(case, ['is_delete'])
|
||||
case_dict['project_name'] = project_name or ''
|
||||
case_dict['module_name'] = module_name or ''
|
||||
case_dict['module_path'] = module_path or ''
|
||||
case_dict['case_key'] = case_dict.get('case_key', '')
|
||||
case_dict['created_by_name'] = created_by_name or ''
|
||||
if not case_dict.get('steps'):
|
||||
@@ -184,6 +202,7 @@ class CaseController(BaseCrudController):
|
||||
'tags': self._get(self.req_data, 'tags', default=[]),
|
||||
'status': int(self._get(self.req_data, 'status', default=1)),
|
||||
'is_auto': int(self._get(self.req_data, 'isAuto', default=0)),
|
||||
'is_ai_generated': int(self._get(self.req_data, 'isAiGenerated', default=0)),
|
||||
'created_by': getattr(g, 'current_user_id', None),
|
||||
'is_delete': 0
|
||||
}
|
||||
@@ -195,7 +214,7 @@ class CaseController(BaseCrudController):
|
||||
if not case_id:
|
||||
return 0, 'caseId 为必传参数'
|
||||
update_info = {}
|
||||
mapping = [('moduleId', 'module_id'), ('caseKey', 'case_key'), ('title', 'title'), ('preconditions', 'preconditions'), ('expectedResults', 'expected_results'), ('priority', 'priority'), ('caseType', 'case_type'), ('tags', 'tags'), ('status', 'status'), ('isAuto', 'is_auto')]
|
||||
mapping = [('moduleId', 'module_id'), ('caseKey', 'case_key'), ('title', 'title'), ('preconditions', 'preconditions'), ('expectedResults', 'expected_results'), ('priority', 'priority'), ('caseType', 'case_type'), ('tags', 'tags'), ('status', 'status'), ('isAuto', 'is_auto'), ('isAiGenerated', 'is_ai_generated')]
|
||||
for req_key, column_key in mapping:
|
||||
value = self._get(self.req_data, req_key)
|
||||
if value is not None:
|
||||
@@ -208,10 +227,83 @@ class CaseController(BaseCrudController):
|
||||
return CaseService.update_by_id(self.session, TestCase, case_id, update_info)
|
||||
|
||||
def case_delete(self):
|
||||
case_id = self._get(self.req_data, 'caseId', 'id')
|
||||
if not case_id:
|
||||
return 0, 'caseId 为必传参数'
|
||||
return CaseService.delete_by_id(self.session, TestCase, case_id)
|
||||
case_ids = self._get(self.req_data, 'caseIds', 'caseId', 'ids', 'id')
|
||||
if not case_ids:
|
||||
return {}, 'caseIds 为必传参数'
|
||||
if isinstance(case_ids, str):
|
||||
case_ids = [case_id.strip() for case_id in case_ids.split(',') if case_id.strip()]
|
||||
elif not isinstance(case_ids, list):
|
||||
case_ids = [case_ids]
|
||||
try:
|
||||
case_ids = list({int(case_id) for case_id in case_ids if str(case_id).strip()})
|
||||
except ValueError:
|
||||
return {}, 'caseIds 必须为数字数组或英文逗号分隔的数字字符串'
|
||||
if not case_ids:
|
||||
return {}, 'caseIds 为必传参数'
|
||||
delete_count = self.session.query(TestCase).filter(
|
||||
TestCase.id.in_(case_ids),
|
||||
TestCase.is_delete == 0
|
||||
).update({'is_delete': 1}, synchronize_session=False)
|
||||
err = self.session.done(close=False)
|
||||
if err:
|
||||
return {}, f'删除失败!{err}'
|
||||
return {'caseIds': case_ids, 'deletedCount': delete_count}, ''
|
||||
|
||||
def case_restore(self):
|
||||
case_ids = self._get(self.req_data, 'caseIds', 'caseId', 'ids', 'id')
|
||||
if not case_ids:
|
||||
return {}, 'caseIds 为必传参数'
|
||||
if isinstance(case_ids, str):
|
||||
case_ids = [case_id.strip() for case_id in case_ids.split(',') if case_id.strip()]
|
||||
elif not isinstance(case_ids, list):
|
||||
case_ids = [case_ids]
|
||||
try:
|
||||
case_ids = list({int(case_id) for case_id in case_ids if str(case_id).strip()})
|
||||
except ValueError:
|
||||
return {}, 'caseIds 必须为数字数组或英文逗号分隔的数字字符串'
|
||||
if not case_ids:
|
||||
return {}, 'caseIds 为必传参数'
|
||||
# 先获取需要恢复的用例对应的模块ID
|
||||
cases = self.session.query(TestCase).filter(
|
||||
TestCase.id.in_(case_ids),
|
||||
TestCase.status == 0,
|
||||
TestCase.is_delete == 0
|
||||
).all()
|
||||
module_ids = list({case.module_id for case in cases if case.module_id})
|
||||
# 更新用例状态
|
||||
update_count = self.session.query(TestCase).filter(
|
||||
TestCase.id.in_(case_ids),
|
||||
TestCase.status == 0,
|
||||
TestCase.is_delete == 0
|
||||
).update({'status': 1}, synchronize_session=False)
|
||||
# 更新模块状态为1,同时更新父模块状态
|
||||
if module_ids:
|
||||
# 获取所有需要更新的模块ID(包括父模块)
|
||||
all_module_ids = set(module_ids)
|
||||
current_ids = module_ids.copy()
|
||||
|
||||
# 递归获取所有父模块ID
|
||||
while current_ids:
|
||||
parents = self.session.query(Module.parent_id).filter(
|
||||
Module.id.in_(current_ids),
|
||||
Module.parent_id != 0,
|
||||
Module.is_delete == 0
|
||||
).all()
|
||||
parent_ids = [p[0] for p in parents if p[0] not in all_module_ids]
|
||||
if not parent_ids:
|
||||
break
|
||||
all_module_ids.update(parent_ids)
|
||||
current_ids = parent_ids
|
||||
|
||||
# 更新所有模块(包括父模块)的状态为1
|
||||
self.session.query(Module).filter(
|
||||
Module.id.in_(list(all_module_ids)),
|
||||
Module.is_delete == 0
|
||||
).update({'status': 1}, synchronize_session=False)
|
||||
err = self.session.done(close=False)
|
||||
if err:
|
||||
return {}, f'恢复失败!{err}'
|
||||
return {'caseIds': case_ids, 'updatedCount': update_count}, ''
|
||||
|
||||
def snapshot_create(self):
|
||||
case_id = self._get(self.req_data, 'caseId')
|
||||
@@ -374,6 +466,7 @@ class CaseController(BaseCrudController):
|
||||
tags=tags,
|
||||
status=1,
|
||||
is_auto=0,
|
||||
is_ai_generated=0,
|
||||
created_by=getattr(g, 'current_user_id', None),
|
||||
is_delete=0
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user