Feature/upgradeapplicantstateview

backend/root/utils/routes.py

@@ -564,8 +564,6 @@
 samfundet__recruitment_applications_for_position_detail = 'samfundet:recruitment_applications_for_position-detail'
 samfundet__interview_list = 'samfundet:interview-list'
 samfundet__interview_detail = 'samfundet:interview-detail'
-samfundet__api_root = 'samfundet:api-root'
-samfundet__api_root = 'samfundet:api-root'
 samfundet__schema = 'samfundet:schema'
 samfundet__swagger_ui = 'samfundet:swagger_ui'
 samfundet__redoc = 'samfundet:redoc'
@@ -594,6 +592,7 @@
 samfundet__recruitment_set_interview = 'samfundet:recruitment_set_interview'
 samfundet__recruitment_application_states_choices = 'samfundet:recruitment_application_states_choices'
 samfundet__recruitment_application_update_state_gang = 'samfundet:recruitment_application_update_state_gang'
+samfundet__recruitment_position_organized_applications = 'samfundet:recruitment_position_organized_applications'
 samfundet__recruitment_application_update_state_position = 'samfundet:recruitment_application_update_state_position'
 samfundet__recruitment_applications_recruiter = 'samfundet:recruitment_applications_recruiter'
 samfundet__recruitment_withdraw_application = 'samfundet:recruitment_withdraw_application'

backend/samfundet/serializers.py

@@ -77,6 +77,8 @@
 if TYPE_CHECKING:
     from typing import Any
 
+from rest_framework.utils.serializer_helpers import ReturnList
+
 
 class TagSerializer(CustomBaseSerializer):
     class Meta:
@@ -1167,6 +1169,41 @@ def get_application_count(self, application: RecruitmentApplication) -> int:
         return application.user.applications.filter(recruitment=application.recruitment).count()
 
 
+class RecruitmentPositionOrganizedApplications(CustomBaseSerializer):
+    ApplicationSerializer = RecruitmentApplicationForGangSerializer
+    unprocessed = serializers.SerializerMethodField(method_name='get_unprocessed', read_only=True)
+    withdrawn = serializers.SerializerMethodField(method_name='get_withdrawn', read_only=True)
+    accepted = serializers.SerializerMethodField(method_name='get_accepted', read_only=True)
+    rejected = serializers.SerializerMethodField(method_name='get_rejected', read_only=True)
+    hardtoget = serializers.SerializerMethodField(method_name='get_hardtoget', read_only=True)
+
+    class Meta:
+        model = RecruitmentPosition
+        fields = ['unprocessed', 'withdrawn', 'accepted', 'rejected', 'hardtoget']
+
+    def get_unprocessed(self, instance: RecruitmentPosition) -> ReturnList:
+        unprocessed = instance.applications.filter(withdrawn=False, recruiter_status=RecruitmentStatusChoices.NOT_SET)
+        return self.ApplicationSerializer(unprocessed, many=True).data
+
+    def get_withdrawn(self, instance: RecruitmentPosition) -> ReturnList:
+        withdrawn = instance.applications.filter(withdrawn=True)
+        return self.ApplicationSerializer(withdrawn, many=True).data
+
+    def get_rejected(self, instance: RecruitmentPosition) -> ReturnList:
+        rejected = instance.applications.filter(
+            withdrawn=False, recruiter_status__in=[RecruitmentStatusChoices.AUTOMATIC_REJECTION, RecruitmentStatusChoices.REJECTION]
+        )
+        return self.ApplicationSerializer(rejected, many=True).data
+
+    def get_accepted(self, instance: RecruitmentPosition) -> ReturnList:
+        accepted = instance.applications.filter(withdrawn=False, recruiter_status=RecruitmentStatusChoices.CALLED_AND_ACCEPTED)
+        return self.ApplicationSerializer(accepted, many=True).data
+
+    def get_hardtoget(self, instance: RecruitmentPosition) -> ReturnList:
+        hardtoget = instance.applications.filter(withdrawn=False, recruiter_status=RecruitmentStatusChoices.CALLED_AND_REJECTED)
+        return self.ApplicationSerializer(hardtoget, many=True).data
+
+
 class RecruitmentApplicationUpdateForGangSerializer(serializers.Serializer):
     recruiter_priority = serializers.ChoiceField(choices=RecruitmentPriorityChoices.choices, required=False)
     recruiter_status = serializers.ChoiceField(choices=RecruitmentStatusChoices.choices, required=False)

backend/samfundet/urls.py

@@ -106,6 +106,11 @@
         views.RecruitmentApplicationForGangUpdateStateView.as_view(),
         name='recruitment_application_update_state_gang',
     ),
+    path(
+        'recruitment-position-organized-applications/<int:pk>/',
+        views.RecruitmentPositionOrganizedApplicationsView.as_view(),
+        name='recruitment_position_organized_applications',
+    ),
     path(
         'recruitment-application-update-state-position/<slug:pk>/',
         views.RecruitmentApplicationForPositionUpdateStateView.as_view(),

backend/samfundet/views.py

@@ -92,6 +92,7 @@
     RecruitmentSeparatePositionSerializer,
     RecruitmentApplicationForGangSerializer,
     RecruitmentUpdateUserPrioritySerializer,
+    RecruitmentPositionOrganizedApplications,
     RecruitmentPositionForApplicantSerializer,
     RecruitmentInterviewAvailabilitySerializer,
     RecruitmentApplicationForApplicantSerializer,
@@ -1083,13 +1084,22 @@ def put(self, request: Request, pk: int) -> Response:
         return Response(update_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
+class RecruitmentPositionOrganizedApplicationsView(APIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = RecruitmentPositionOrganizedApplications
+
+    def get(self, request: Request, pk: int) -> Response:
+        position = get_object_or_404(RecruitmentPosition, pk=pk)
+        serializer = self.serializer_class(position)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
 class RecruitmentApplicationForPositionUpdateStateView(APIView):
     permission_classes = [IsAuthenticated]
     serializer_class = RecruitmentApplicationUpdateForGangSerializer
 
     def put(self, request: Request, pk: int) -> Response:
         application = get_object_or_404(RecruitmentApplication, pk=pk)
-
         # TODO add check if user has permission to update for GANG
         update_serializer = self.serializer_class(data=request.data)
         if update_serializer.is_valid():
@@ -1100,12 +1110,9 @@ def put(self, request: Request, pk: int) -> Response:
                 application.recruiter_status = update_serializer.data['recruiter_status']
             application.save()
             application.update_applicant_state()
-            applications = RecruitmentApplication.objects.filter(
-                recruitment_position=application.recruitment_position,  # Only change from above
-                recruitment=application.recruitment,
-            )
-            serializer = RecruitmentApplicationForGangSerializer(applications, many=True)
-            return Response(serializer.data, status=status.HTTP_200_OK)
+            position = get_object_or_404(RecruitmentPosition, pk=application.recruitment_position.id)
+            organized_serializer = RecruitmentPositionOrganizedApplications(position)
+            return Response(organized_serializer.data, status=status.HTTP_200_OK)
         return Response(update_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 

frontend/src/PagesAdmin/RecruitmentPositionOverviewPage/RecruitmentPositionOverviewPage.tsx

@@ -4,7 +4,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { Button, RecruitmentApplicantsStatus } from '~/Components';
 import { Text } from '~/Components/Text/Text';
-import { getRecruitmentApplicationsForGang, updateRecruitmentApplicationStateForPosition } from '~/api';
+import { getRecruitmentPositionOrganizedApplications, updateRecruitmentApplicationStateForPosition } from '~/api';
 import type { RecruitmentApplicationDto, RecruitmentApplicationStateDto } from '~/dto';
 import { useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
@@ -33,47 +33,13 @@ export function RecruitmentPositionOverviewPage() {
     if (!recruitmentId || !gangId || !positionId) {
       return;
     }
-    getRecruitmentApplicationsForGang(gangId, recruitmentId)
-      .then((data) => {
-        setRecruitmentApplicants(
-          data.data.filter(
-            (recruitmentApplicant) =>
-              !recruitmentApplicant.withdrawn &&
-              recruitmentApplicant.recruiter_status === 0 &&
-              recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-          ),
-        );
-        setWithdrawnApplicants(
-          data.data.filter(
-            (recruitmentApplicant) =>
-              recruitmentApplicant.withdrawn &&
-              recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-          ),
-        );
-        setHardtogetApplicants(
-          data.data.filter(
-            (recruitmentApplicant) =>
-              !recruitmentApplicant.withdrawn &&
-              recruitmentApplicant.recruiter_status === 2 &&
-              recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-          ),
-        );
-        setRejectedApplicants(
-          data.data.filter(
-            (recruitmentApplicant) =>
-              !recruitmentApplicant.withdrawn &&
-              recruitmentApplicant.recruiter_status === 3 &&
-              recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-          ),
-        );
-        setAcceptedApplicants(
-          data.data.filter(
-            (recruitmentApplicant) =>
-              !recruitmentApplicant.withdrawn &&
-              recruitmentApplicant.recruiter_status === 1 &&
-              recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-          ),
-        );
+    getRecruitmentPositionOrganizedApplications(positionId)
+      .then((response) => {
+        setRecruitmentApplicants(response.data.unprocessed);
+        setWithdrawnApplicants(response.data.withdrawn);
+        setHardtogetApplicants(response.data.hardtoget);
+        setRejectedApplicants(response.data.rejected);
+        setAcceptedApplicants(response.data.accepted);
         setShowSpinner(false);
       })
       .catch((data) => {
@@ -91,46 +57,12 @@ export function RecruitmentPositionOverviewPage() {
   const updateApplicationState = (id: string, data: RecruitmentApplicationStateDto) => {
     positionId &&
       updateRecruitmentApplicationStateForPosition(id, data)
-        .then((data) => {
-          setRecruitmentApplicants(
-            data.data.filter(
-              (recruitmentApplicant) =>
-                !recruitmentApplicant.withdrawn &&
-                recruitmentApplicant.recruiter_status === 0 &&
-                recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-            ),
-          );
-          setWithdrawnApplicants(
-            data.data.filter(
-              (recruitmentApplicant) =>
-                recruitmentApplicant.withdrawn &&
-                recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-            ),
-          );
-          setHardtogetApplicants(
-            data.data.filter(
-              (recruitmentApplicant) =>
-                !recruitmentApplicant.withdrawn &&
-                recruitmentApplicant.recruiter_status === 2 &&
-                recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-            ),
-          );
-          setRejectedApplicants(
-            data.data.filter(
-              (recruitmentApplicant) =>
-                !recruitmentApplicant.withdrawn &&
-                recruitmentApplicant.recruiter_status === 3 &&
-                recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-            ),
-          );
-          setAcceptedApplicants(
-            data.data.filter(
-              (recruitmentApplicant) =>
-                !recruitmentApplicant.withdrawn &&
-                recruitmentApplicant.recruiter_status === 1 &&
-                recruitmentApplicant.recruitment_position?.id === Number.parseInt(positionId),
-            ),
-          );
+        .then((response) => {
+          setRecruitmentApplicants(response.data.unprocessed);
+          setWithdrawnApplicants(response.data.withdrawn);
+          setHardtogetApplicants(response.data.hardtoget);
+          setRejectedApplicants(response.data.rejected);
+          setAcceptedApplicants(response.data.accepted);
           setShowSpinner(false);
         })
         .catch((data) => {

frontend/src/api.ts

@@ -30,6 +30,7 @@ import type {
   RecruitmentGangDto,
   RecruitmentGangStatDto,
   RecruitmentPositionDto,
+  RecruitmentPositionOrganizedApplicationsDto,
   RecruitmentPositionPostDto,
   RecruitmentPositionPutDto,
   RecruitmentSeparatePositionDto,
@@ -833,6 +834,20 @@ export async function getRecruitmentApplicationsForGang(
   return await axios.get(url, { withCredentials: true });
 }
 
+export async function getRecruitmentPositionOrganizedApplications(
+  positionId: string,
+): Promise<AxiosResponse<RecruitmentPositionOrganizedApplicationsDto>> {
+  const url =
+    BACKEND_DOMAIN +
+    reverse({
+      pattern: ROUTES.backend.samfundet__recruitment_position_organized_applications,
+      urlParams: {
+        pk: positionId,
+      },
+    });
+  return await axios.get(url, { withCredentials: true });
+}
+
 export async function getRecruitmentSharedInterviewGroups(
   recruitmentId: string,
 ): Promise<AxiosResponse<RecruitmentSharedInterviewGroupDto[]>> {
@@ -902,7 +917,7 @@ export async function updateRecruitmentApplicationStateForGang(
 export async function updateRecruitmentApplicationStateForPosition(
   applicationId: string,
   application: Partial<RecruitmentApplicationStateDto>,
-): Promise<AxiosResponse<RecruitmentApplicationDto[]>> {
+): Promise<AxiosResponse<RecruitmentPositionOrganizedApplicationsDto>> {
   const url =
     BACKEND_DOMAIN +
     reverse({

frontend/src/dto.ts

@@ -512,6 +512,14 @@ export type InterviewDto = {
   interviewers?: UserDto[];
 };
 
+export type RecruitmentPositionOrganizedApplicationsDto = {
+  unprocessed: RecruitmentApplicationDto[];
+  withdrawn: RecruitmentApplicationDto[];
+  rejected: RecruitmentApplicationDto[];
+  accepted: RecruitmentApplicationDto[];
+  hardtoget: RecruitmentApplicationDto[];
+};
+
 export type RecruitmentApplicationDto = {
   id: string;
   interview?: InterviewDto;

frontend/src/routes/backend.ts

@@ -563,7 +563,6 @@ export const ROUTES_BACKEND = {
   samfundet__recruitment_applications_for_position_detail: '/api/recruitment-applications-for-position/:pk/',
   samfundet__interview_list: '/api/interview/',
   samfundet__interview_detail: '/api/interview/:pk/',
-  samfundet__api_root: '/api/',
   samfundet__schema: '/schema/',
   samfundet__swagger_ui: '/schema/swagger-ui/',
   samfundet__redoc: '/schema/redoc/',
@@ -592,6 +591,7 @@ export const ROUTES_BACKEND = {
   samfundet__recruitment_set_interview: '/recruitment-set-interview/:pk/',
   samfundet__recruitment_application_states_choices: '/recruitment-application-states-choices',
   samfundet__recruitment_application_update_state_gang: '/recruitment-application-update-state-gang/:pk/',
+  samfundet__recruitment_position_organized_applications: '/recruitment-position-organized-applications/:pk/',
   samfundet__recruitment_application_update_state_position: '/recruitment-application-update-state-position/:pk/',
   samfundet__recruitment_applications_recruiter: '/recruitment-application-recruiter/:applicationId/',
   samfundet__recruitment_withdraw_application: '/recruitment-withdraw-application/:pk/',