Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: No user ID is required when querying project versions #1222

Merged
merged 2 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dongtai_web/base/project_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ def version_modify(user, auth_users, versionData=None):
}


def get_project_version(project_id, auth_users):
def get_project_version(project_id, auth_users=None):
versionInfo = IastProjectVersion.objects.filter(
project_id=project_id, status=1, current_version=1, user__in=auth_users
project_id=project_id, status=1, current_version=1
).first()
if versionInfo:
current_project_version = {
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/api_route_cover_rate.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get(self, request):
auth_users = self.get_auth_users(request.user)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
agents = IastAgent.objects.filter(
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/api_route_related_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def get(self, request):
if project_id:
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
agents = IastAgent.objects.filter(
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/api_route_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def post(self, request):

if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
agents = IastAgent.objects.filter(
Expand Down
7 changes: 4 additions & 3 deletions dongtai_web/views/project_detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ class ProjectDetail(UserEndPoint):
response_schema=_ResponseSerializer,
)
def get(self, request, id):
auth_users = self.get_auth_users(request.user)
project = IastProject.objects.filter(user__in=auth_users, id=id).first()
# auth_users = self.get_auth_users(request.user)
department = request.user.get_relative_department()
project = IastProject.objects.filter(department__in=department, id=id).first()

if project:
relations = IastAgent.objects.filter(bind_project_id=project.id, online=const.RUNNING)
Expand All @@ -64,7 +65,7 @@ def get(self, request, id):
scan_id = 0
scan_name = ''

current_project_version = get_project_version(project.id, auth_users)
current_project_version = get_project_version(project.id)
return R.success(data={
"name": project.name,
"id": project.id,
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/project_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def get(self, request, id):

if not version_id:
current_project_version = get_project_version(
project.id, auth_users)
project.id)
else:
current_project_version = get_project_version_by_id(version_id)
data['versionData'] = current_project_version
Expand Down
5 changes: 3 additions & 2 deletions dongtai_web/views/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ def get(self, request):
except ValidationError as e:
return R.failure(data=e.detail)

users = self.get_auth_users(request.user)
# users = self.get_auth_users(request.user)
department = request.user.get_relative_department()
queryset = IastProject.objects.filter(
user__in=users).order_by('-latest_time')
department__in=department).order_by('-latest_time')
if name:
queryset = queryset.filter(name__icontains=name)
page_summary, page_data = self.get_paginator(queryset, page, page_size)
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/sca_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def post(self, request):
if project_id and project_id != '':
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(project_id, auth_users)
current_project_version = get_project_version(project_id)
else:
current_project_version = get_project_version_by_id(version_id)
# base_query_sql = base_query_sql + " and iast_asset.project_id=%s and iast_asset.project_version_id=%s "
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/scas.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def post(self, request):
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)

Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/vul_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def get(self, request):
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
auth_agents = auth_agents.filter(
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/vul_summary_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def get(self, request):
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
auth_agents = auth_agents.filter(
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/vul_summary_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def get(self, request):
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
auth_agents = auth_agents.filter(
Expand Down
2 changes: 1 addition & 1 deletion dongtai_web/views/vuls.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def get(self, request):
version_id = request.GET.get('version_id', None)
if not version_id:
current_project_version = get_project_version(
project_id, auth_users)
project_id)
else:
current_project_version = get_project_version_by_id(version_id)
agents = auth_agents.filter(
Expand Down