b71c4a66e1
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. 优化数据库连接池配置，添加连接验证和自动重试机制
167 lines
9.3 KiB
Python
167 lines
9.3 KiB
Python
# encoding: UTF-8
|
|
from datetime import datetime
|
|
|
|
from .baseCrudController import BaseCrudController
|
|
from ..model.planModel import PlanCase, TestPlan, TestRound
|
|
from ..model.caseModel import Module, TestCase
|
|
from ..service.planService import PlanService
|
|
from ..service.userService import UserService
|
|
|
|
|
|
class PlanController(BaseCrudController):
|
|
def plan_list(self):
|
|
filters = []
|
|
project_id = self._get(self.req_data, 'projectId', 'project_id')
|
|
status = self._get(self.req_data, 'status')
|
|
keyword = self._get(self.req_data, 'keyword')
|
|
owner_id = self._get(self.req_data, 'ownerId', 'owner_id', 'owner')
|
|
if project_id:
|
|
filters.append(TestPlan.project_id == int(project_id))
|
|
if status not in (None, ''):
|
|
filters.append(TestPlan.status == int(status))
|
|
if keyword:
|
|
filters.append(TestPlan.name.like('%{}%'.format(keyword)))
|
|
if owner_id:
|
|
filters.append(TestPlan.owner_id == int(owner_id))
|
|
|
|
items, total = PlanService.list_by_filters(self.session, TestPlan, filters, self._get(self.req_data, 'pageNo', 'page', default=1), self._get(self.req_data, 'pageSize', 'size', default=20), TestPlan.created_time)
|
|
|
|
owner_ids = [item.owner_id for item in items if item.owner_id]
|
|
user_info_map = UserService.get_user_info_map(self.session, owner_ids) if owner_ids else {}
|
|
|
|
result_list = []
|
|
for item in items:
|
|
plan_dict = item.to_dict()
|
|
if item.owner_id and item.owner_id in user_info_map:
|
|
plan_dict['owner_name'] = user_info_map[item.owner_id].get('real_name', '')
|
|
else:
|
|
plan_dict['owner_name'] = ''
|
|
result_list.append(plan_dict)
|
|
|
|
return {'list': result_list, 'total': total}
|
|
|
|
def plan_detail(self):
|
|
plan_id = self._get(self.req_data, 'planId', 'id')
|
|
if not plan_id:
|
|
return {}, 'planId 为必传参数'
|
|
item = PlanService.get_by_id(self.session, TestPlan, plan_id)
|
|
if not item:
|
|
return {}, '未查询到对应计划！'
|
|
ret = self.serialize(item, ['is_delete'])
|
|
ret.update(PlanService.plan_stats(self.session, plan_id))
|
|
return ret, ''
|
|
|
|
def plan_create(self):
|
|
project_id = self._get(self.req_data, 'projectId', 'project_id')
|
|
name = self._get(self.req_data, 'name')
|
|
if not project_id or not name:
|
|
return 0, 'projectId、name 为必传参数'
|
|
add_info = {'project_id': project_id, 'name': name, 'version': self._get(self.req_data, 'version'), 'description': self._get(self.req_data, 'description'), 'start_date': self._get(self.req_data, 'startDate', 'start_time'), 'end_date': self._get(self.req_data, 'endDate', 'end_time'), 'owner_id': self._get(self.req_data, 'ownerId', 'owner_id'), 'status': int(self._get(self.req_data, 'status', default=0)), 'environment_id': self._get(self.req_data, 'environmentId', 'environment_id'), 'jenkins_url': self._get(self.req_data, 'jenkinsUrl', 'jenkins_url'), 'is_auto': int(self._get(self.req_data, 'isAuto', 'is_auto', default=0)), 'is_delete': 0}
|
|
return PlanService.create(self.session, TestPlan, add_info)
|
|
|
|
def plan_update(self):
|
|
"""更新测试计划，只更新请求中传入的字段。"""
|
|
plan_id = self._get(self.req_data, 'planId', 'id')
|
|
if not plan_id:
|
|
return 0, 'planId 为必传参数'
|
|
update_info = {}
|
|
for req_keys, column_key in [(('name', 'name'), 'name'), (('version', 'version'), 'version'), (('description', 'description'), 'description'), (('startDate', 'start_time', 'start_date'), 'start_date'), (('endDate', 'end_time', 'end_date'), 'end_date'), (('ownerId', 'owner_id'), 'owner_id'), (('status', 'status'), 'status'), (('environmentId', 'environment_id'), 'environment_id'), (('jenkinsUrl', 'jenkins_url'), 'jenkins_url'), (('isAuto', 'is_auto'), 'is_auto')]:
|
|
value = self._get(self.req_data, *req_keys)
|
|
if value is not None:
|
|
update_info[column_key] = value
|
|
return PlanService.update_by_id(self.session, TestPlan, plan_id, update_info)
|
|
|
|
def plan_delete(self):
|
|
plan_id = self._get(self.req_data, 'planId', 'id')
|
|
if not plan_id:
|
|
return 0, 'planId 为必传参数'
|
|
return PlanService.delete_by_id(self.session, TestPlan, plan_id)
|
|
|
|
def round_create(self):
|
|
plan_id = self._get(self.req_data, 'planId')
|
|
round_no = self._get(self.req_data, 'roundNo')
|
|
if not plan_id or not round_no:
|
|
return 0, 'planId、roundNo 为必传参数'
|
|
return PlanService.create(self.session, TestRound, {'plan_id': plan_id, 'round_no': round_no, 'name': self._get(self.req_data, 'name'), 'start_date': self._get(self.req_data, 'startDate'), 'end_date': self._get(self.req_data, 'endDate')})
|
|
|
|
def round_list(self):
|
|
plan_id = self._get(self.req_data, 'planId')
|
|
filters = [TestRound.plan_id == int(plan_id)] if plan_id else []
|
|
items, total = PlanService.list_by_filters(self.session, TestRound, filters, self._get(self.req_data, 'pageNo', default=1), self._get(self.req_data, 'pageSize', default=50), TestRound.id)
|
|
return {'list': self.serialize_list(items), 'total': total}
|
|
|
|
def plan_case_add(self):
|
|
plan_id = self._get(self.req_data, 'planId')
|
|
case_ids = self._get(self.req_data, 'caseIds', default=[])
|
|
if not plan_id or not case_ids:
|
|
return 0, 'planId、caseIds 为必传参数'
|
|
batch_info_list = [{'plan_id': plan_id, 'case_id': case_id, 'assignee_id': self._get(self.req_data, 'assigneeId'), 'round_no': int(self._get(self.req_data, 'roundNo', default=1)), 'status': 0} for case_id in case_ids]
|
|
return PlanService.batch_create(self.session, PlanCase, batch_info_list)
|
|
|
|
def plan_case_list(self):
|
|
plan_id = self._get(self.req_data, 'planId', 'plan_id')
|
|
filters = [PlanCase.plan_id == int(plan_id)] if plan_id else []
|
|
round_no = self._get(self.req_data, 'roundNo')
|
|
if round_no not in (None, ''):
|
|
filters.append(PlanCase.round_no == int(round_no))
|
|
items, total = PlanService.list_by_filters(self.session, PlanCase, filters, self._get(self.req_data, 'pageNo', default=1), self._get(self.req_data, 'pageSize', default=20), PlanCase.id, asc=True)
|
|
|
|
case_ids = [item.case_id for item in items if item.case_id]
|
|
case_info_map = {}
|
|
module_info_map = {}
|
|
if case_ids:
|
|
cases = self.session.query(TestCase).filter(TestCase.id.in_(case_ids), TestCase.is_delete == 0).all()
|
|
case_info_map = {case.id: {'case_key': case.case_key, 'title': case.title, 'module_id': case.module_id} for case in cases}
|
|
|
|
module_ids = [case.module_id for case in cases if case.module_id]
|
|
if module_ids:
|
|
modules = self.session.query(Module).filter(Module.id.in_(module_ids), Module.is_delete == 0).all()
|
|
module_info_map = {module.id: {'name': module.name, 'path': module.path} for module in modules}
|
|
|
|
result_list = []
|
|
for item in items:
|
|
case_dict = item.to_dict()
|
|
if item.case_id and item.case_id in case_info_map:
|
|
case_dict['case_key'] = case_info_map[item.case_id]['case_key']
|
|
case_dict['case_title'] = case_info_map[item.case_id]['title']
|
|
module_id = case_info_map[item.case_id].get('module_id')
|
|
if module_id and module_id in module_info_map:
|
|
case_dict['module_name'] = module_info_map[module_id]['name']
|
|
case_dict['module_path'] = module_info_map[module_id].get('path', '')
|
|
else:
|
|
case_dict['module_name'] = ''
|
|
case_dict['module_path'] = ''
|
|
else:
|
|
case_dict['case_key'] = ''
|
|
case_dict['case_title'] = ''
|
|
case_dict['module_name'] = ''
|
|
case_dict['module_path'] = ''
|
|
result_list.append(case_dict)
|
|
|
|
return {'list': result_list, 'total': total}
|
|
|
|
def plan_case_execute(self):
|
|
plan_case_id = self._get(self.req_data, 'planCaseId', 'id')
|
|
if not plan_case_id:
|
|
return 0, 'planCaseId 为必传参数'
|
|
|
|
plan_case = PlanService.get_by_id(self.session, PlanCase, plan_case_id, soft_delete=False)
|
|
if not plan_case:
|
|
return 0, '未查询到对应计划用例！'
|
|
|
|
plan_id = plan_case.plan_id
|
|
|
|
update_info = {'status': int(self._get(self.req_data, 'status', default=0)), 'actual_result': self._get(self.req_data, 'actualResult'), 'defect_links': self._get(self.req_data, 'defectLinks', default=[]), 'attachments': self._get(self.req_data, 'attachments', default=[]), 'executed_time': datetime.now(), 'execution_duration': self._get(self.req_data, 'executionDuration')}
|
|
result = PlanService.update_by_id(self.session, PlanCase, plan_case_id, update_info, soft_delete=False)
|
|
|
|
PlanService.refresh_plan_status(self.session, plan_id)
|
|
|
|
return result
|
|
|
|
def progress(self):
|
|
"""查询计划进度统计。"""
|
|
plan_id = self._get(self.req_data, 'planId', 'plan_id')
|
|
if not plan_id:
|
|
return {}, 'planId 为必传参数'
|
|
return PlanService.plan_stats(self.session, plan_id), ''
|