Merge branch 'master' into 1494-add-search-to-admin-users-page

backend/root/utils/routes.py

@@ -595,6 +595,7 @@
 samfundet__recruitment_application_update_state_gang = 'samfundet:recruitment_application_update_state_gang'
 samfundet__recruitment_application_update_state_position = 'samfundet:recruitment_application_update_state_position'
 samfundet__recruitment_applications_recruiter = 'samfundet:recruitment_applications_recruiter'
+samfundet__recruitment_application_interview_notes = 'samfundet:recruitment_application_interview_notes'
 samfundet__recruitment_withdraw_application = 'samfundet:recruitment_withdraw_application'
 samfundet__recruitment_user_priority_update = 'samfundet:recruitment_user_priority_update'
 samfundet__recruitment_withdraw_application_recruiter = 'samfundet:recruitment_withdraw_application_recruiter'

backend/samfundet/serializers.py

@@ -1078,6 +1078,7 @@ class RecruitmentApplicationForRecruiterSerializer(serializers.ModelSerializer):
     recruitment_position = RecruitmentPositionForApplicantSerializer()
     recruiter_priority = serializers.CharField(source='get_recruiter_priority_display')
     interview_time = serializers.SerializerMethodField(method_name='get_interview_time', read_only=True)
+    interview = InterviewSerializer(read_only=True)
 
     class Meta:
         model = RecruitmentApplication
@@ -1093,6 +1094,7 @@ class Meta:
             'recruiter_priority',
             'withdrawn',
             'interview_time',
+            'interview',
             'created_at',
         ]
         read_only_fields = [
@@ -1107,6 +1109,7 @@ class Meta:
             'applicant_state',
             'interview_time',
             'withdrawn',
+            'interview',
             'created_at',
         ]
 

backend/samfundet/urls.py

@@ -117,6 +117,11 @@
         views.RecruitmentApplicationForRecruitersView.as_view(),
         name='recruitment_applications_recruiter',
     ),
+    path(
+        'recruitment-application-interview-notes/<int:interview_id>/',
+        views.RecruitmentApplicationInterviewNotesView.as_view(),
+        name='recruitment_application_interview_notes',
+    ),
     path('recruitment-withdraw-application/<int:pk>/', views.RecruitmentApplicationWithdrawApplicantView.as_view(), name='recruitment_withdraw_application'),
     path('recruitment-user-priority-update/<slug:pk>/', views.RecruitmentApplicationApplicantPriorityView.as_view(), name='recruitment_user_priority_update'),
     path(

backend/samfundet/views.py

@@ -957,6 +957,20 @@ def list(self, request: Request) -> Response:
         return Response(serializer.data)
 
 
+class RecruitmentApplicationInterviewNotesView(APIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = InterviewSerializer
+
+    def put(self, request: Request, interview_id: str) -> Response:
+        interview = get_object_or_404(Interview, pk=interview_id)
+        update_serializer = self.serializer_class(interview, data=request.data, partial=True)
+        if update_serializer.is_valid() and 'notes' in update_serializer.validated_data:
+            interview.notes = update_serializer.validated_data['notes']
+            interview.save()
+            return Response(status=status.HTTP_200_OK)
+        return Response(update_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
 class RecruitmentApplicationWithdrawApplicantView(APIView):
     permission_classes = [IsAuthenticated]
 

frontend/src/PagesAdmin/RecruitmentApplicantAdminPage/RecruitmentApplicantAdminPage.tsx

@@ -39,6 +39,7 @@ export function RecruitmentApplicantAdminPage() {
   const recruitmentApplication = data?.data.application;
   const applicant = data?.data.user;
   const interviewNotes = recruitmentApplication?.interview?.notes;
+  const interviewId = recruitmentApplication?.interview?.id;
 
   if (isLoading) {
     return (
@@ -64,25 +65,21 @@ export function RecruitmentApplicantAdminPage() {
         </Text>
         <Text>{recruitmentApplication?.application_text}</Text>
       </div>
+      {interviewId && (
+        <div className={classNames(styles.infoContainer)}>
+          <RecruitmentInterviewNotesForm initialData={initialData} interviewId={interviewId} />
+        </div>
+      )}
       <div className={styles.withdrawContainer}>
         <RecruitmentApplicantWithdraw application={data?.data.application} />
       </div>
-      <div className={classNames(styles.infoContainer)}>
-        <RecruitmentInterviewNotesForm initialData={initialData} />
-      </div>
       <div className={classNames(styles.infoContainer)}>
         <Text size="l" as="strong" className={styles.textBottom}>
           {t(KEY.recruitment_applications)} {t(KEY.common_in)}{' '}
           {dbT(data?.data.application.recruitment_position.gang, 'name')}
         </Text>
         <RecruitmentApplicantAllApplications applications={data?.data.other_applications} />
       </div>
-      <div className={classNames(styles.infoContainer)}>
-        <Text size="l" as="strong" className={styles.textBottom}>
-          {t(KEY.recruitment_all_applications)}
-        </Text>
-        <RecruitmentApplicantAllApplications applications={data?.data.other_applications} />
-      </div>
     </AdminPage>
   );
 }

frontend/src/PagesAdmin/RecruitmentApplicantAdminPage/components/RecruitmentInterviewNotesForm/RecruitmentInterviewNotesForm.tsx

@@ -1,32 +1,54 @@
 import { zodResolver } from '@hookform/resolvers/zod';
+import { useMutation } from '@tanstack/react-query';
+import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
+import { toast } from 'react-toastify';
 import { z } from 'zod';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage, Textarea } from '~/Components';
+import { putRecrutmentInterviewNotes } from '~/api';
 import { KEY } from '~/i18n/constants';
 
 const recruitmentNotesSchema = z.object({
   notes: z.string(),
+  interviewId: z.number(),
 });
 
 type RecruitmentInterviewNotesFormType = z.infer<typeof recruitmentNotesSchema>;
 
 interface RecruitmentInterviewNotesFormProps {
   initialData: Partial<RecruitmentInterviewNotesFormType>;
+  interviewId?: number;
 }
 
-export function RecruitmentInterviewNotesForm({ initialData }: RecruitmentInterviewNotesFormProps) {
+export function RecruitmentInterviewNotesForm({ initialData, interviewId }: RecruitmentInterviewNotesFormProps) {
   const { t } = useTranslation();
-
+  const [currentNotes, setCurrentNotes] = useState(initialData.notes || '');
   const form = useForm<RecruitmentInterviewNotesFormType>({
     resolver: zodResolver(recruitmentNotesSchema),
-    defaultValues: initialData,
+    defaultValues: {
+      notes: initialData.notes || '',
+      interviewId: interviewId || 0,
+    },
+  });
+
+  const handleUpdateNotes = useMutation({
+    mutationFn: ({ notes, interviewId }: { notes: string; interviewId: number }) =>
+      putRecrutmentInterviewNotes(notes, interviewId),
+    onSuccess: () => {
+      toast.success(t(KEY.common_update_successful));
+    },
+    onError: (error) => {
+      toast.error(t(KEY.common_something_went_wrong));
+    },
   });
 
-  function handleUpdateNotes(value: string) {
-    // TODO: Update notes using a put request
-    console.log(value);
-  }
+  const handleNotesChange = (newNotes: string) => {
+    if (newNotes !== currentNotes && interviewId) {
+      setCurrentNotes(newNotes);
+      handleUpdateNotes.mutate({ notes: newNotes, interviewId });
+    }
+  };
 
   return (
     <Form {...form}>
@@ -43,7 +65,7 @@ export function RecruitmentInterviewNotesForm({ initialData }: RecruitmentInterv
                     {...field}
                     onBlur={(newNotes) => {
                       field.onBlur(); // Call the default onBlur handler from react-hook-form
-                      handleUpdateNotes(newNotes.target.value); // Call your custom function on blur
+                      handleNotesChange(newNotes.target.value); // Call your custom function on blur
                     }}
                   />
                 </FormControl>

frontend/src/api.ts

@@ -979,6 +979,16 @@ export async function putRecruitmentApplication(
   return response;
 }
 
+export async function putRecrutmentInterviewNotes(notes: string, interviewId: number): Promise<AxiosResponse> {
+  const url =
+    BACKEND_DOMAIN +
+    reverse({
+      pattern: ROUTES.backend.samfundet__recruitment_application_interview_notes,
+      urlParams: { interviewId: interviewId },
+    });
+  return await axios.put(url, { notes: notes }, { withCredentials: true });
+}
+
 export async function getRecruitmentApplicationForPosition(
   positionId: string,
 ): Promise<AxiosResponse<RecruitmentApplicationDto>> {

frontend/src/routes/backend.ts

@@ -594,6 +594,7 @@ export const ROUTES_BACKEND = {
   samfundet__recruitment_application_update_state_gang: '/recruitment-application-update-state-gang/:pk/',
   samfundet__recruitment_application_update_state_position: '/recruitment-application-update-state-position/:pk/',
   samfundet__recruitment_applications_recruiter: '/recruitment-application-recruiter/:applicationId/',
+  samfundet__recruitment_application_interview_notes: '/recruitment-application-interview-notes/:interviewId/',
   samfundet__recruitment_withdraw_application: '/recruitment-withdraw-application/:pk/',
   samfundet__recruitment_user_priority_update: '/recruitment-user-priority-update/:pk/',
   samfundet__recruitment_withdraw_application_recruiter: '/recruitment-withdraw-application-recruiter/:pk/',