Merge pull request 'chore: 提交除 const.py 外的所有修改' (#6) from qiaoxinjiu into master

Reviewed-on: #6

app/api/controller/caseController.py

@@ -97,10 +97,8 @@ class CaseController(BaseCrudController):
             if value not in (None, ''):
                 filters.append(column == int(value))
         is_ai_generated = self._get(self.req_data, 'isAiGenerated', 'is_ai_generated')
-        is_ai_generated_val = None
         if is_ai_generated not in (None, ''):
-            is_ai_generated_val = int(is_ai_generated)
+            filters.append(TestCase.is_ai_generated == int(is_ai_generated))
-            filters.append(TestCase.is_ai_generated == is_ai_generated_val)
         status = self._get(self.req_data, 'status')
         if status not in (None, ''):
             filters.append(TestCase.status == int(status))
@@ -119,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'), Module.path.label('module_path'), Module.status.label('module_status'), 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).\
@@ -133,11 +131,8 @@ class CaseController(BaseCrudController):
             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')
-            # AI 用例列表需要展示对应模块数据，不能因为模块状态变化把用例隐藏掉
+            if module_status not in (None, ''):
-            if is_ai_generated_val == 1:
+                # 如果传入了module_status参数，按指定状态过滤
-                pass
-            elif module_status not in (None, ''):
-                # 非 AI 场景下，仍支持按模块状态过滤
                 query = query.filter(Module.status == int(module_status))
             else:
                 # 默认只查询状态为1的模块
@@ -154,13 +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, module_path, module_status, 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['module_id'] = case.module_id
-            case_dict['module_status'] = module_status
             case_dict['case_key'] = case_dict.get('case_key', '')
             case_dict['created_by_name'] = created_by_name or ''
             if not case_dict.get('steps'):

config/ai_config.py

@@ -5,12 +5,7 @@ AI大模型配置文件
 """
 import os
 from pathlib import Path
-
-try:
 from dotenv import load_dotenv
-except ModuleNotFoundError:
-    def load_dotenv(*args, **kwargs):
-        return False
 
 # 加载项目根目录.env，避免进程工作目录不同导致读取到其他配置
 ENV_PATH = Path(__file__).resolve().parents[1] / '.env'

requirements.txt

@@ -13,4 +13,3 @@ PyPDF2~=3.0.1
 Flask-Docs~=0.6.4
 flask_redis~=0.4.0
 jira~=3.0.1
-python-dotenv~=1.0.1