finalize user admission priorities for backend

backend/root/utils/routes.py

@@ -505,6 +505,7 @@
 samfundet__active_recruitments = 'samfundet:active_recruitments'
 samfundet__recruitment_positions = 'samfundet:recruitment_positions'
 samfundet__recruitment_positions_gang = 'samfundet:recruitment_positions_gang'
+samfundet__recruitment_user_priority_update = 'samfundet:recruitment_user_priority_update'
 samfundet__active_recruitment_positions = 'samfundet:active_recruitment_positions'
 samfundet__applicants_without_interviews = 'samfundet:applicants_without_interviews/'
 samfundet__occupied_timeslots = 'samfundet:occupied_timeslots'

backend/samfundet/conftest.py

@@ -220,6 +220,18 @@ def fixture_gang(fixture_organization: Organization) -> Iterator[Gang]:
     organization.delete()
 
 
+@pytest.fixture
+def fixture_gang2(fixture_organization: Organization) -> Iterator[Gang]:
+    organization = Gang.objects.create(
+        name_nb='Gang 2',
+        name_en='Gang 2',
+        abbreviation='G2',
+        organization=fixture_organization,
+    )
+    yield organization
+    organization.delete()
+
+
 @pytest.fixture
 def fixture_text_item() -> Iterator[TextItem]:
     text_item = TextItem.objects.create(
@@ -287,6 +299,26 @@ def fixture_recruitment_position(fixture_recruitment: Recruitment, fixture_gang:
     recruitment_position.delete()
 
 
+@pytest.fixture
+def fixture_recruitment_position2(fixture_recruitment: Recruitment, fixture_gang2: Gang) -> Iterator[Recruitment]:
+    recruitment_position2 = RecruitmentPosition.objects.create(
+        name_nb='Position 2 NB',
+        name_en='Position 2 EN',
+        short_description_nb='Short Description NB',
+        short_description_en='Short Description EN',
+        long_description_nb='Long Description NB',
+        long_description_en='Long Description EN',
+        is_funksjonaer_position=False,
+        default_admission_letter_nb='Default Admission Letter NB',
+        default_admission_letter_en='Default Admission Letter EN',
+        tags='tag1,tag2',
+        gang=fixture_gang2,
+        recruitment=fixture_recruitment,
+    )
+    yield recruitment_position2
+    recruitment_position2.delete()
+
+
 @pytest.fixture
 def fixture_informationpage() -> Iterator[InformationPage]:
     informationpage = InformationPage.objects.create(title_nb='Norsk tittel', title_en='Engel', slug_field='Sygard')
@@ -326,6 +358,25 @@ def fixture_recruitment_admission(
     admission.delete()
 
 
+@pytest.fixture
+def fixture_recruitment_admission2(
+    fixture_user: User,
+    fixture_recruitment_position2: RecruitmentPosition,
+    fixture_recruitment: Recruitment,
+) -> Iterator[RecruitmentAdmission]:
+    admission2 = RecruitmentAdmission.objects.create(
+        admission_text='Test admission text',
+        recruitment_position=fixture_recruitment_position2,
+        recruitment=fixture_recruitment,
+        user=fixture_user,
+        applicant_priority=2,
+        recruiter_priority=RecruitmentPriorityChoices.NOT_SET,
+        recruiter_status=RecruitmentStatusChoices.NOT_SET,
+    )
+    yield admission2
+    admission2.delete()
+
+
 @pytest.fixture
 def fixture_venue() -> Iterator[Venue]:
     venue = Venue.objects.create(

backend/samfundet/migrations/0015_alter_recruitmentadmission_applicant_priority.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-06-07 09:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("samfundet", "0014_gangsection"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="recruitmentadmission",
+            name="applicant_priority",
+            field=models.PositiveIntegerField(
+                blank=True, help_text="The priority of the admission", null=True
+            ),
+        ),
+    ]

backend/samfundet/models/recruitment.py

@@ -177,7 +177,7 @@ class RecruitmentAdmission(CustomBaseModel):
     )
     recruitment = models.ForeignKey(Recruitment, on_delete=models.CASCADE, help_text='The recruitment that is recruiting', related_name='admissions')
     user = models.ForeignKey(User, on_delete=models.CASCADE, help_text='The user that is applying', related_name='admissions')
-    applicant_priority = models.IntegerField(null=True, blank=True, help_text='The priority of the admission')
+    applicant_priority = models.PositiveIntegerField(null=True, blank=True, help_text='The priority of the admission')
 
     created_at = models.DateTimeField(null=True, blank=True, auto_now_add=True)
 
@@ -195,6 +195,42 @@ class RecruitmentAdmission(CustomBaseModel):
         choices=RecruitmentStatusChoices.choices, default=RecruitmentStatusChoices.NOT_SET, help_text='The status of the admission'
     )
 
+    def organize_priorities(self) -> None:
+        """Organizes priorites from 1 to n, so that it is sequential with no gaps"""
+        admissions_for_user = RecruitmentAdmission.objects.filter(recruitment=self.recruitment, user=self.user).order_by('applicant_priority')
+        for i in range(len(admissions_for_user)):
+            correct_position = i + 1
+            if admissions_for_user[i].applicant_priority != correct_position:
+                admissions_for_user[i].applicant_priority = correct_position
+                admissions_for_user[i].save()
+
+    def update_priority(self, direction: int) -> None:
+        """
+        Method for moving priorites up or down,
+        positive direction indicates moving it to higher priority,
+        negative direction indicates moving it to lower priority,
+        can move n positions up or down
+
+        """
+        # Use order for more simple an unified for direction
+        ordering = f"{'' if direction < 0 else '-' }applicant_priority"
+        admissions_for_user = RecruitmentAdmission.objects.filter(recruitment=self.recruitment, user=self.user).order_by(ordering)
+        direction = abs(direction)  # convert to absolute
+        for i in range(len(admissions_for_user)):
+            if admissions_for_user[i].id == self.id:  # find current
+                # Find index of which to switch  priority with
+                switch = len(admissions_for_user) - 1 if i + direction >= len(admissions_for_user) else i + direction
+                new_priority = admissions_for_user[switch].applicant_priority
+                # Move priorites down in direction
+                for ii in range(switch, i, -1):
+                    admissions_for_user[ii].applicant_priority = admissions_for_user[ii - 1].applicant_priority
+                    admissions_for_user[ii].save()
+                # update priority
+                admissions_for_user[i].applicant_priority = new_priority
+                admissions_for_user[i].save()
+                break
+        self.organize_priorities()
+
     def __str__(self) -> str:
         return f'Admission: {self.user} for {self.recruitment_position} in {self.recruitment}'
 
@@ -205,12 +241,13 @@ def save(self, *args: tuple, **kwargs: dict) -> None:  # noqa: C901
         """
         if not self.recruitment:
             self.recruitment = self.recruitment_position.recruitment
-        """If the admission is saved without an interview, try to find an interview from a shared position."""
+        # If the admission is saved without an interview, try to find an interview from a shared position.
         if not self.applicant_priority:
-            current_applications_count = RecruitmentAdmission.objects.filter(user=self.user).count()
+            self.organize_priorities()
+            current_applications_count = RecruitmentAdmission.objects.filter(user=self.user, recruitment=self.recruitment).count()
             # Set the applicant_priority to the number of applications + 1 (for the current application)
             self.applicant_priority = current_applications_count + 1
-        """If the admission is saved without an interview, try to find an interview from a shared position."""
+        # If the admission is saved without an interview, try to find an interview from a shared position.
         if self.withdrawn:
             self.recruiter_priority = RecruitmentPriorityChoices.NOT_WANTED
             self.recruiter_status = RecruitmentStatusChoices.AUTOMATIC_REJECTION

backend/samfundet/models/tests/test_recruitment.py

@@ -184,3 +184,61 @@ def test_check_withdraw_sets_unwanted(self, fixture_recruitment_admission: Recru
 
         assert fixture_recruitment_admission.recruiter_status == RecruitmentStatusChoices.AUTOMATIC_REJECTION
         assert fixture_recruitment_admission.recruiter_priority == RecruitmentPriorityChoices.NOT_WANTED
+
+    def test_priority_up(self, fixture_recruitment_admission: RecruitmentAdmission, fixture_recruitment_admission2: RecruitmentAdmission):
+        assert fixture_recruitment_admission.applicant_priority == 1
+        assert fixture_recruitment_admission2.applicant_priority == 2
+
+        # Test general up
+        fixture_recruitment_admission2.update_priority(1)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 2
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 1
+
+        # Test up overloading
+        RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).update_priority(2)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 1
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 2
+
+        # Test up from top position does not change anything
+        RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).update_priority(1)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 1
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 2
+
+    def test_priority_down(self, fixture_recruitment_admission: RecruitmentAdmission, fixture_recruitment_admission2: RecruitmentAdmission):
+        # intial priority
+        assert fixture_recruitment_admission.applicant_priority == 1
+        assert fixture_recruitment_admission2.applicant_priority == 2
+
+        # Test general up
+        fixture_recruitment_admission.update_priority(-1)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 2
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 1
+
+        # Test up overloading
+        RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).update_priority(-2)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 1
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 2
+
+        # Test up from top position does not change anything
+        RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).update_priority(-1)
+
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission.id).applicant_priority == 1
+        assert RecruitmentAdmission.objects.get(id=fixture_recruitment_admission2.id).applicant_priority == 2
+
+    def test_auto_newest_lowest_pri(self, fixture_recruitment_admission: RecruitmentAdmission, fixture_recruitment_position2: RecruitmentPosition):
+        """Tests that the newest admission gets automatically the lowest applicant priority"""
+        # intial priority
+        assert fixture_recruitment_admission.applicant_priority == 1
+
+        new_admission = RecruitmentAdmission.objects.create(
+            admission_text='Test admission text 2',
+            recruitment_position=fixture_recruitment_position2,
+            recruitment=fixture_recruitment_position2.recruitment,
+            user=fixture_recruitment_admission.user,
+        )
+        assert new_admission.applicant_priority == 2

backend/samfundet/serializers.py

@@ -569,6 +569,10 @@ class Meta:
         fields = '__all__'
 
 
+class RecruitmentUpdateUserPrioritySerializer(serializers.Serializer):
+    direction = serializers.IntegerField(label='direction', write_only=True)
+
+
 class UserForRecruitmentSerializer(serializers.ModelSerializer):
     recruitment_admission_ids = serializers.SerializerMethodField()
 

backend/samfundet/tests/test_views.py

@@ -920,3 +920,61 @@ def test_update_admission(
     assert response.status_code == status.HTTP_200_OK
     assert response.data['admission_text'] == post_data2['admission_text']
     # Assert the returned data based on the logic in the view
+
+
+def test_recruitment_admission_update_pri_up(
+    fixture_rest_client: APIClient,
+    fixture_user: User,
+    fixture_recruitment_admission: RecruitmentAdmission,
+    fixture_recruitment_admission2: RecruitmentAdmission,
+):
+    ### Arrange ###
+    fixture_rest_client.force_authenticate(user=fixture_user)
+    assert fixture_recruitment_admission.applicant_priority == 1
+    assert fixture_recruitment_admission2.applicant_priority == 2
+
+    url = reverse(
+        routes.samfundet__recruitment_user_priority_update,
+        kwargs={'pk': fixture_recruitment_admission2.id},
+    )
+
+    ### Act ###
+    response: Response = fixture_rest_client.put(path=url, data={'direction': 1})
+
+    ### Assert ###
+    assert response.status_code == status.HTTP_200_OK
+    # Assert the returned data based on the logic in the view
+    assert len(response.data) == 2
+    assert response.data[0]['id'] == str(fixture_recruitment_admission2.pk)
+    assert response.data[0]['applicant_priority'] == 1
+    assert response.data[1]['id'] == str(fixture_recruitment_admission.pk)
+    assert response.data[1]['applicant_priority'] == 2
+
+
+def test_recruitment_admission_update_pri_down(
+    fixture_rest_client: APIClient,
+    fixture_user: User,
+    fixture_recruitment_admission: RecruitmentAdmission,
+    fixture_recruitment_admission2: RecruitmentAdmission,
+):
+    ### Arrange ###
+    fixture_rest_client.force_authenticate(user=fixture_user)
+    assert fixture_recruitment_admission.applicant_priority == 1
+    assert fixture_recruitment_admission2.applicant_priority == 2
+
+    url = reverse(
+        routes.samfundet__recruitment_user_priority_update,
+        kwargs={'pk': fixture_recruitment_admission.id},
+    )
+
+    ### Act ###
+    response: Response = fixture_rest_client.put(path=url, data={'direction': -1})
+
+    ### Assert ###
+    assert response.status_code == status.HTTP_200_OK
+    # Assert the returned data based on the logic in the view
+    assert len(response.data) == 2
+    assert response.data[0]['id'] == str(fixture_recruitment_admission2.pk)
+    assert response.data[0]['applicant_priority'] == 1
+    assert response.data[1]['id'] == str(fixture_recruitment_admission.pk)
+    assert response.data[1]['applicant_priority'] == 2

backend/samfundet/urls.py

@@ -69,6 +69,7 @@
     path('active-recruitments/', views.ActiveRecruitmentsView.as_view(), name='active_recruitments'),
     path('recruitment-positions/', views.RecruitmentPositionsPerRecruitmentView.as_view(), name='recruitment_positions'),
     path('recruitment-positions-gang/', views.RecruitmentPositionsPerGangView.as_view(), name='recruitment_positions_gang'),
+    path('recruitment-user-priority-update/<slug:pk>/', views.RecruitmentAdmissionApplicantPriorityView.as_view(), name='recruitment_user_priority_update'),
     path('active-recruitment-positions/', views.ActiveRecruitmentPositionsView.as_view(), name='active_recruitment_positions'),
     path('applicants-without-interviews/', views.ApplicantsWithoutInterviewsView.as_view(), name='applicants_without_interviews/'),
     path('occupiedtimeslot/', views.OccupiedtimeslotView.as_view(), name='occupied_timeslots'),

backend/samfundet/views.py

@@ -75,6 +75,7 @@
     RecruitmentPositionSerializer,
     RecruitmentStatisticsSerializer,
     RecruitmentAdmissionForGangSerializer,
+    RecruitmentUpdateUserPrioritySerializer,
     RecruitmentAdmissionForApplicantSerializer,
 )
 from .models.event import Event, EventGroup
@@ -708,6 +709,38 @@ def list(self, request: Request) -> Response:
         return Response(serializer.data)
 
 
+class RecruitmentAdmissionApplicantPriorityView(APIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = RecruitmentUpdateUserPrioritySerializer
+
+    def put(
+        self,
+        request: Request,
+        pk: int,
+    ) -> Response:
+        direction = RecruitmentUpdateUserPrioritySerializer(data=request.data)
+        if direction.is_valid():
+            direction = direction.validated_data['direction']
+        else:
+            return Response(direction.errors, status=status.HTTP_400_BAD_REQUEST)
+
+        # Dont think we need any extra perms in this view, admin should not be able to change priority
+        admission = get_object_or_404(
+            RecruitmentAdmission,
+            id=pk,
+            user=request.user,
+        )
+        admission.update_priority(direction)
+        serializer = RecruitmentAdmissionForApplicantSerializer(
+            RecruitmentAdmission.objects.filter(
+                recruitment=admission.recruitment,
+                user=request.user,
+            ).order_by('applicant_priority'),
+            many=True,
+        )
+        return Response(serializer.data)
+
+
 class RecruitmentAdmissionForGangView(ModelViewSet):
     permission_classes = [IsAuthenticated]
     serializer_class = RecruitmentAdmissionForGangSerializer