Skip to content

Commit

Permalink
black formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
KunalTiwary committed Jul 5, 2024
1 parent 98e449f commit 8712935
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
22 changes: 15 additions & 7 deletions backend/projects/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,6 @@ def list_optimized(self, request):
List all projects with some optimizations.
"""
try:

projects = self.queryset.filter(annotators=request.user)
if request.user.is_superuser:
projects = self.queryset
Expand All @@ -1301,9 +1300,9 @@ def list_optimized(self, request):
elif request.user.role == User.WORKSPACE_MANAGER:
projects = (
self.queryset.filter(
workspace_id__in=Workspace.objects.filter(
workspace_id__in=Workspace.objects.filter(
managers=request.user
).values_list("id", flat=True)
).values_list("id", flat=True)
)
| self.queryset.filter(annotators=request.user)
| self.queryset.filter(annotation_reviewers=request.user)
Expand All @@ -1324,17 +1323,26 @@ def list_optimized(self, request):
projects = self.queryset.filter(annotators=request.user)
projects = projects.filter(is_published=True).filter(is_archived=False)
if "guest_view" in request.query_params:
projects = self.queryset.filter(
projects = (
self.queryset.filter(
workspace_id__in=Workspace.objects.filter(
members=request.user
).values_list("id", flat=True)
).filter(is_published=True).filter(is_archived=False)
)
.filter(is_published=True)
.filter(is_archived=False)
)
if "guest_workspace_filter" in request.query_params:
projects = self.queryset.filter(workspace_id__guest_workspace=True).filter(
projects = (
self.queryset.filter(workspace_id__guest_workspace=True)
.filter(
workspace_id__in=Workspace.objects.filter(
members=request.user
).values_list("id", flat=True)
).filter(is_published=True).filter(is_archived=False)
)
.filter(is_published=True)
.filter(is_archived=False)
)

if "project_user_type" in request.query_params:
project_user_type = request.query_params["project_user_type"]
Expand Down
8 changes: 3 additions & 5 deletions backend/workspaces/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,13 @@ def enter_workspace(self, request, pk=None):
workspace.members.add(request.user)
workspace.save()

#projects = Project.objects.filter(workspace_id=workspace.id)
#for project in projects:
# projects = Project.objects.filter(workspace_id=workspace.id)
# for project in projects:
# project.annotators.add(request.user)
# project.save()

return Response(
{
"message": "User added to the workspace."
},
{"message": "User added to the workspace."},
status=status.HTTP_200_OK,
)

Expand Down

0 comments on commit 8712935

Please sign in to comment.