Merge branch 'dev'

PROCOLLAB-github · Nov 21, 2022 · f016261 · f016261
2 parents 1563eee + b1ada49
commit f016261
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/vacancy/urls.py b/vacancy/urls.py
@@ -17,6 +17,6 @@
     path("<int:pk>/", VacancyDetail.as_view()),
     path("<int:vacancy_id>/responses/", VacancyResponseList.as_view()),
     path("responses/<int:pk>/", VacancyResponseDetail.as_view()),
-    path("responses/<int:pk>/accept", VacancyResponseAccept.as_view()),
-    path("responses/<int:pk>/decline", VacancyResponseDecline.as_view()),
+    path("responses/<int:pk>/accept/", VacancyResponseAccept.as_view()),
+    path("responses/<int:pk>/decline/", VacancyResponseDecline.as_view()),
 ]
diff --git a/vacancy/views.py b/vacancy/views.py
@@ -2,6 +2,7 @@
 from rest_framework import generics, mixins, permissions, status
 from rest_framework.generics import GenericAPIView
 from rest_framework.response import Response
+from projects.models import Collaborator
 
 from vacancy.filters import VacancyFilter
 from vacancy.models import Vacancy, VacancyResponse
@@ -100,7 +101,13 @@ def post(self, request, pk):
             return Response(status=status.HTTP_400_BAD_REQUEST)
         vacancy_request.is_approved = True
         vacancy = vacancy_request.vacancy
-        vacancy.project.collaborators.add(vacancy_request.user)
+        new_collaborator = Collaborator(
+            user=vacancy_request.user,
+            project=vacancy.project,
+            role=vacancy.role,
+        )
+        new_collaborator.save()
+        # vacancy.project.collaborator_set.add(vacancy_request.user)
         vacancy.project.save()
         vacancy_request.save()
         return Response(status=status.HTTP_200_OK)