Skip to content

Commit

Permalink
Merge pull request #2087 from gtech-mulearn/dev
Browse files Browse the repository at this point in the history
Merge dev to dev-server
  • Loading branch information
jelanmathewjames authored Jun 20, 2024
2 parents e5cf8fc + 09ab63f commit 06b6086
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions api/launchpad/launchpad_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ def get(self, request):
"user_organization_link_user",
queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
)
).filter(
user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
org__org_type__in=allowed_org_types
).values("id")
).annotate(
karma=Subquery(total_karma_subquery, output_field=IntegerField()),
org=F("user_organization_link_user__org__title"),
Expand Down Expand Up @@ -171,7 +167,7 @@ def get(self, request):
class CollegeData(APIView):
def get(self, request):
allowed_levels = LaunchPadLevels.get_all_values()

org = Organization.objects.filter(
org_type="College",
).prefetch_related(
Expand Down Expand Up @@ -204,7 +200,7 @@ def get(self, request):
filter=Q(user_organization_link_org__user__user_role_link_user__role__title=LaunchPadLevels.LEVEL_4.value)
)
).order_by("-total_users")

paginated_queryset = CommonUtils.get_paginated_queryset(
org,
request,
Expand Down

0 comments on commit 06b6086

Please sign in to comment.