Merge pull request #1231 from Bidaya0/feat/project-template-p16

fix: fix api route change .
HXSecurity · Feb 7, 2023 · efa0fe6 · efa0fe6
2 parents 832265d + a32dca9
commit efa0fe6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/dongtai_web/base/project_version.py b/dongtai_web/base/project_version.py
@@ -83,7 +83,7 @@ def version_modify(user, department, versionData=None):
 
 def get_project_version(project_id, auth_users=None):
     versionInfo = IastProjectVersion.objects.filter(
-        project_id=project_id, status=1, current_version=1
+        project_id=project_id,
     ).first()
     if versionInfo:
         current_project_version = {

diff --git a/dongtai_web/views/api_route_cover_rate.py b/dongtai_web/views/api_route_cover_rate.py
@@ -16,6 +16,7 @@
 from dongtai_common.models.api_route import IastApiRoute, FromWhereChoices
 from dongtai_web.utils import extend_schema_with_envcheck, get_response_serializer
 from rest_framework import serializers
+from dongtai_common.models.project import IastProject
 import logging
 
 logger = logging.getLogger("dongtai-webapi")
@@ -64,7 +65,8 @@ def get(self, request):
             bind_project_id=project_id,
             project_version_id=current_project_version.get("version_id",
                                                            0)).values("id")
-        q = Q(project_version_id=version_id, project_id=project_id)
+        q = Q(project_version_id=current_project_version.get("version_id", 0),
+              project_id=project_id)
         queryset = IastApiRoute.objects.filter(q)
         total = queryset.values("path").distinct().count()
         cover_count = checkcover_batch(queryset, agents)

diff --git a/dongtai_web/views/api_route_search.py b/dongtai_web/views/api_route_search.py
@@ -175,13 +175,13 @@ def post(self, request):
                 project_id)
         else:
             current_project_version = get_project_version_by_id(version_id)
+        departments = request.user.get_relative_department()
         agents = IastAgent.objects.filter(
-            user__in=auth_users,
+            bind_project__department__in=departments,
             bind_project_id=project_id,
             project_version_id=current_project_version.get("version_id",
                                                            0)).values("id")
         q = Q(agent_id__in=[_['id'] for _ in agents])
-        departments = request.user.get_relative_department()
         projectexist = IastProject.objects.filter(department__in=departments,
                                                   pk=project_id).first()
         if not projectexist:
@@ -190,7 +190,8 @@ def post(self, request):
             bind_project_id=project_id,
             project_version_id=current_project_version.get("version_id",
                                                            0)).values("id")
-        q = Q(project_version_id=version_id, project_id=project_id)
+        q = Q(project_version_id=current_project_version.get("version_id", 0),
+              project_id=project_id)
         q = q & Q(
             method_id__in=[_['id']
                            for _ in api_methods]) if api_methods != [] else q