Skip to content
Merged
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
18 changes: 12 additions & 6 deletions coldfront/plugins/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
from datetime import timedelta

from django.contrib.auth import get_user_model
from django.db.models import ExpressionWrapper, F, OuterRef, Q, Subquery, fields
from django.db.models import ExpressionWrapper, F, OuterRef, Q, Subquery, fields, Prefetch
from django.db.models.functions import Cast
from django_filters import rest_framework as filters
from rest_framework import viewsets
from rest_framework.permissions import IsAdminUser, IsAuthenticated

from simple_history.utils import get_history_model_for_model

from coldfront.core.allocation.models import Allocation, AllocationChangeRequest
from coldfront.core.project.models import Project
from coldfront.core.project.models import Project, ProjectUser
from coldfront.core.resource.models import Resource
from coldfront.plugins.api import serializers

Expand Down Expand Up @@ -282,7 +281,7 @@ class ProjectViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = serializers.ProjectSerializer

def get_queryset(self):
projects = Project.objects.prefetch_related("status")
projects = Project.objects.select_related("status", "pi", "school")

if not (
self.request.user.is_superuser
Expand All @@ -298,14 +297,21 @@ def get_queryset(self):
)
)
.distinct()
.select_related("pi", "school", "status")
.order_by("pi")
)

if self.request.query_params.get("project_users") in ["True", "true"]:
projects = projects.prefetch_related("projectuser_set")
projects = projects.prefetch_related(
Prefetch("projectuser_set", queryset=ProjectUser.objects.select_related("user", "status", "role"))
)

if self.request.query_params.get("allocations") in ["True", "true"]:
projects = projects.prefetch_related("allocation_set")
projects = projects.prefetch_related(
Prefetch(
"allocation_set", queryset=Allocation.objects.select_related("status").prefetch_related("resources")
)
)

if self.request.query_params.get("project_attributes") in ["True", "true"]:
projects = projects.prefetch_related("projectattribute_set")
Expand Down
Loading