Skip to content

Commit dba112d

Browse files
committed
Add user projects route, remove drafts route
1 parent deb8903 commit dba112d

3 files changed

Lines changed: 15 additions & 19 deletions

File tree

projects/managers.py

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,17 @@ def get_projects_for_list_view(self):
4141
)
4242
)
4343

44-
def get_projects_for_user_drafts_view(self):
45-
return (
46-
self.get_queryset()
47-
.filter(draft=True)
48-
.prefetch_related(
49-
Prefetch(
50-
"industry",
51-
queryset=Industry.objects.only("name").all(),
52-
),
53-
Prefetch(
54-
"leader",
55-
queryset=CustomUser.objects.only("id").all(),
56-
),
57-
Prefetch("collaborator_set"),
58-
)
44+
def get_user_projects_for_list_view(self):
45+
return self.get_queryset().prefetch_related(
46+
Prefetch(
47+
"industry",
48+
queryset=Industry.objects.only("name").all(),
49+
),
50+
Prefetch(
51+
"leader",
52+
queryset=CustomUser.objects.only("id").all(),
53+
),
54+
Prefetch("collaborator_set"),
5955
)
6056

6157
def get_projects_for_detail_view(self):

users/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
SpecialistsList,
1010
UserAdditionalRolesView,
1111
UserDetail,
12-
UserDraftsList,
12+
UserProjectsList,
1313
UserList,
1414
UserTypesView,
1515
VerifyEmail,
@@ -22,7 +22,7 @@
2222
"specialists/", SpecialistsList.as_view()
2323
), # this url actually returns mentors, experts and investors
2424
path("users/", UserList.as_view()),
25-
path("users/drafts/", UserDraftsList.as_view()),
25+
path("users/projects/", UserProjectsList.as_view()),
2626
path("users/roles/", UserAdditionalRolesView.as_view()),
2727
path("users/types/", UserTypesView.as_view()),
2828
path("users/<int:pk>/", UserDetail.as_view()),

users/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@ class AchievementDetail(RetrieveUpdateDestroyAPIView):
314314
permission_classes = [IsAchievementOwnerOrReadOnly]
315315

316316

317-
class UserDraftsList(APIView):
317+
class UserProjectsList(APIView):
318318
permission_classes = [IsAuthenticated]
319319

320320
def get(self, request):
321321
serializer = ProjectListSerializer(
322-
Project.objects.get_projects_for_user_drafts_view().filter(
322+
Project.objects.get_user_projects_for_list_view().filter(
323323
leader=self.request.user
324324
),
325325
many=True,

0 commit comments

Comments
 (0)