Merge branch 'Features/CompanyVacancyApplicationList' of...

Merge branch 'Features/CompanyVacancyApplicationList' of https://gitlab.com/PPL2017csui/PPLA1 into Features/create-vacancy-company

# Conflicts:
#	core/tests/test_vacancies.py

core/tests/__init__.py

 # __init__.py
 from core.tests.test_accounts import LoginTests, RegisterTests
-from core.tests.test_vacancies import ApplicationTests, BookmarkApplicationTests
+from core.tests.test_vacancies import ApplicationTests, BookmarkApplicationTests, CompanyListsTests

core/tests/test_vacancies.py

@@ -26,7 +26,7 @@ class ApplicationTests(APITestCase):
         response = self.client.post(url, {'username': 'dummy.mahasiswa', 'password': 'lalala', 'login-type': 'sso-ui'}, format='json')
         student_id = response.data.get('student').get('id')
 
-        url = '/api/students/' + str(student_id) + '/applications/'
+        url = '/api/students/' + str(student_id) + '/applied-vacancies/'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -52,11 +52,11 @@ class ApplicationTests(APITestCase):
         new_company = Company.objects.create(user=new_user, description="lalala",verified=True,logo=None,address=None)
         new_vacancy = Vacancy.objects.create(company=new_company, verified=True, open_time=datetime.fromtimestamp(0), description="lalala", close_time=datetime.today())
 
-        url = '/api/students/' + str(student_id) + '/applications/'
+        url = '/api/students/' + str(student_id) + '/applied-vacancies/'
         response = self.client.post(url, {'vacancy_id' : new_vacancy.pk, 'cover_letter' : 'this is a cover letter.'}, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        url = '/api/students/' + str(student_id) + '/applications/' + str(new_vacancy.pk) + '/'
+        url = '/api/students/' + str(student_id) + '/applied-vacancies/' + str(new_vacancy.pk) + '/'
         response = self.client.delete(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
@@ -100,7 +100,7 @@ class BookmarkApplicationTests(APITestCase):
                                     format='json')
         student_id = response.data.get('student').get('id')
 
-        new_user = User.objects.create_user('dummy.company', 'dummy.company@company.com', 'lalala123')
+        new_user = User.objects.create_user('dummy.company2', 'dummy.compan2y@company.com', 'lalala123')
         new_company = Company.objects.create(user=new_user, description="lalala",verified=True,logo=None,address=None)
         new_vacancy = Vacancy.objects.create(company=new_company, verified=True, open_time=datetime.fromtimestamp(0), description="lalala", close_time=datetime.today())
 
@@ -112,7 +112,6 @@ class BookmarkApplicationTests(APITestCase):
         response = self.client.delete(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-
 class VacancyTest(APITestCase):
     def test_verified_vacancy_list(self):
         superuser = User.objects.create_superuser('dummy.company', 'dummy.company@company.com', 'lalala123')
@@ -134,3 +133,23 @@ class VacancyTest(APITestCase):
         url = '/api/vacancies/'
         response = self.client.post(url, format='json')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+
+class CompanyListsTests(APITestCase):
+
+    def test_company_vacancy_list_exist(self):
+        new_user = User.objects.create_user('dummy.company3', 'dummy.company3@company.com', 'lalala123')
+        new_company = Company.objects.create(user=new_user, description="lalala", verified=True, logo=None, address=None)
+
+        url = '/api/companies/' + str(new_company.pk) + '/vacancies'
+        response = self.client.post(url, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_company_application_list_exist(self):
+        new_user = User.objects.create_user('dummy.company4', 'dummy.company4@company.com', 'lalala123')
+        new_company = Company.objects.create(user=new_user, description="lalala", verified=True, logo=None,
+                                             address=None)
+
+        url = '/api/companies/' + str(new_company.pk) + '/applications'
+        response = self.client.post(url, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)

core/views/vacancies.py

@@ -5,7 +5,7 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from core.lib.permissions import IsAdminOrStudent, IsAdminOrCompany
-from core.models import Student
+from core.models import Student, Company
 from core.models.vacancies import Vacancy, Application
 from core.serializers.vacancies import VacancySerializer, ApplicationSerializer
 
@@ -74,6 +74,33 @@ class ApplicationViewSet(viewsets.GenericViewSet):
         return Response(ApplicationSerializer(application, context={'request': request}).data)
 
 
+class CompanyApplicationViewSet(viewsets.GenericViewSet):
+    queryset = Application.objects.all()
+
+    def list(self, request, company_id):
+        """
+        Get list of company {company_id}'s applications
+        ---
+        """
+        company = get_object_or_404(Company.objects.all(), pk=company_id)
+        vacancies = Vacancy.objects.filter(company = company)
+        applications = Application.objects.filter(vacancy__in = vacancies)
+        return Response(ApplicationSerializer(applications, many=True, context={'request': request}).data)
+
+
+class CompanyVacanciesViewSet(viewsets.GenericViewSet):
+    queryset = Vacancy. objects.all()
+
+    def list(self, request, company_id):
+        """
+        Get list of company {company_id}'s vacancies
+        ---
+        """
+        company = get_object_or_404(Company.objects.all(), pk=company_id)
+        vacancies = Vacancy.objects.filter(company = company)
+        return Response(VacancySerializer(vacancies, many=True, context={'request': request}).data)
+
+
 class BookmarkedVacancyByStudentViewSet(viewsets.GenericViewSet):
     serializer_class = VacancySerializer
     permission_classes = [IsAdminOrStudent]

kape/urls.py

@@ -23,7 +23,7 @@ from rest_framework_swagger.views import get_swagger_view
 
 from core import apps
 from core.views.accounts import StudentViewSet, CompanyViewSet, SupervisorViewSet, UserViewSet, LoginViewSet, CompanyRegisterViewSet
-from core.views.vacancies import VacancyViewSet, BookmarkedVacancyByStudentViewSet, ApplicationViewSet
+from core.views.vacancies import VacancyViewSet, BookmarkedVacancyByStudentViewSet, ApplicationViewSet, CompanyApplicationViewSet, CompanyVacanciesViewSet
 
 schema_view = get_swagger_view()
 router = routers.DefaultRouter()
@@ -38,7 +38,10 @@ router.register(r'students/(?P<student_id>\d+)/bookmarked-vacancies', Bookmarked
                 base_name='bookmarked-vacancy-list')
 router.register(r'students/(?P<student_id>\d+)/applied-vacancies', ApplicationViewSet,
                 base_name='applications')
-
+router.register(r'companies/(?P<company_id>\d+)/applications', CompanyApplicationViewSet,
+                base_name='company-applications')
+router.register(r'companies/(?P<company_id>\d+)/vacancies', CompanyVacanciesViewSet,
+                base_name='company-vacancies')
 
 urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 urlpatterns += [
@@ -49,5 +52,3 @@ urlpatterns += [
     url(r'^admin/', admin.site.urls),
     url(r'', apps.index, name="index"),
 ]
-
-