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.

Sign up for GitHub

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

Jump to bottom

feat: add project stauts filter #1556

Merged
merged 1 commit into from
Jun 29, 2023
Merged

feat: add project stauts filter #1556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 30 additions & 18 deletions dongtai_web/views/projects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import logging

from dongtai_common.models.agent import IastAgent
from dongtai_common.endpoint import R
from dongtai_common.endpoint import UserEndPoint
from dongtai_common.models.project import IastProject
Expand All @@ -25,13 +24,19 @@


class _ProjectsArgsSerializer(serializers.Serializer):
pageSize = serializers.IntegerField(default=20,
help_text=_('Number per page'))
page = serializers.IntegerField(min_value=1, default=1, help_text=_('Page index'))
pageSize = serializers.IntegerField(default=20, help_text=_("Number per page"))
page = serializers.IntegerField(min_value=1, default=1, help_text=_("Page index"))
name = serializers.CharField(
default=None,
help_text=_(
"The name of the item to be searched, supports fuzzy search."))
help_text=_("The name of the item to be searched, supports fuzzy search."),
)
status = serializers.IntegerField(
default=None,
allow_null=True,
min_value=0,
max_value=10,
help_text=_("The project status."),
)


_SuccessSerializer = get_response_serializer(ProjectSerializer(many=True))
Expand All @@ -43,28 +48,35 @@ class Projects(UserEndPoint):

@extend_schema_with_envcheck(
[_ProjectsArgsSerializer],
tags=[_('Project')],
summary=_('Projects List'),
description=_("Get the item corresponding to the user, support fuzzy search based on name."
),
tags=[_("Project")],
summary=_("Projects List"),
description=_(
"Get the item corresponding to the user, support fuzzy search based on name."
),
response_schema=_SuccessSerializer,
)
def get(self, request):
ser = _ProjectsArgsSerializer(data=request.GET)
try:
if ser.is_valid(True):
page = ser.validated_data.get('page', 1)
page_size = ser.validated_data.get('pageSize', 20)
name = ser.validated_data.get('name')
page: int = ser.validated_data.get("page", 1)
page_size: int = ser.validated_data.get("pageSize", 20)
name: str = ser.validated_data.get("name")
status: int | None = ser.validated_data.get("status")
else:
return R.failure(data="Can not validation data.")
except ValidationError as e:
return R.failure(data=e.detail)

# users = self.get_auth_users(request.user)
department = request.user.get_relative_department()
queryset = IastProject.objects.filter(
department__in=department).order_by('-latest_time')
queryset = IastProject.objects.filter(department__in=department).order_by(
"-latest_time"
)
if name:
queryset = queryset.filter(name__icontains=name)
if status is not None:
queryset = queryset.filter(status=status)
page_summary, page_data = self.get_paginator(queryset, page, page_size)
vul_levels_dict = get_vul_levels_dict(page_data)
project_language_dict = get_project_language(page_data)
Expand All @@ -74,9 +86,9 @@ def get(self, request):
page_data,
many=True,
context={
'vul_levels_dict': vul_levels_dict,
'project_language_dict': project_language_dict,
'agent_count_dict': agent_count_dict,
"vul_levels_dict": vul_levels_dict,
"project_language_dict": project_language_dict,
"agent_count_dict": agent_count_dict,
},
).data,
page=page_summary,
Expand Down
Loading