Update backend/api/views.py

backend/api/views.py

@@ -257,90 +257,38 @@ class AppointmentStatusView(views.APIView):
     permission_classes = [IsAuthenticated]
 
     def patch(self, request, pk):
-        print(f"DEBUG: Update Request Received for Appointment #{pk}")
         try:
             appointment = Appointment.objects.get(pk=pk)
-
             # Permission check
             if request.user.profile != appointment.doctor and request.user.profile != appointment.patient:
                 return response.Response({"error": "Unauthorized"}, status=403)
 
-            new_status    = request.data.get('status')         # Optional — may be None
-            doctor_note   = request.data.get('doctor_note', '')
-            new_date_time = request.data.get('new_date_time', None)
-
-            # ---------------------------------------------------------------
-            # BUG FIX #1 — Status gate was blocking ALL updates
-            # Previously, the entire update block was wrapped inside:
-            #   if new_status in dict(Appointment.STATUS_CHOICES):
-            # So any request that only changed date/note (status=None) returned
-            # {"error": "Invalid status"} 400. Now status is validated only when
-            # it is actually provided, and each field updates independently.
-            # ---------------------------------------------------------------
-            valid_statuses = dict(Appointment.STATUS_CHOICES)
-
-            if new_status is not None and new_status not in valid_statuses:
-                return response.Response({"error": f"Invalid status '{new_status}'"}, status=400)
-
-            # Require at least one field to update
-            if new_status is None and not new_date_time and not doctor_note:
-                return response.Response(
-                    {"error": "Nothing to update. Provide status, new_date_time, or doctor_note."},
-                    status=400
-                )
-
-            # 1. Update Status (only if provided)
-            if new_status is not None:
-                appointment.status = new_status
-
-            # 2. Update Note (only if provided)
-            if doctor_note:
-                appointment.doctor_note = doctor_note
-
-            # 3. Update Date/Time (only if provided)
-            if new_date_time:
-                appointment.date_time = new_date_time
-
-            appointment.save()
-
-            # ---------------------------------------------------------------
-            # BUG FIX #2 — strftime() crashing with 500 Internal Server Error
-            # After `appointment.date_time = new_date_time` (a raw string from
-            # the request) and calling .save(), the in-memory Python object's
-            # date_time attribute is STILL a plain string — Django only converts
-            # it to a proper datetime when reading from the database.
-            # Calling .strftime() on a string raises AttributeError → 500.
-            # refresh_from_db() re-fetches the saved row so date_time is a
-            # proper datetime object that strftime() can work with safely.
-            # ---------------------------------------------------------------
-            appointment.refresh_from_db()
-            print("DEBUG: Appointment Saved and Refreshed from Database.")
-
-            # 4. Trigger Email — use the current (possibly updated) status
-            email_status = new_status if new_status is not None else appointment.status
-            should_notify = new_status is not None or new_date_time
-
-            if should_notify and hasattr(appointment.patient.user, 'email') and appointment.patient.user.email:
-                print(f"DEBUG: Triggering Email to {appointment.patient.user.email}")
-
-                formatted_date = appointment.date_time.strftime('%B %d, %Y at %I:%M %p')
-
-                send_appointment_status_email(
-                    recipient_email=appointment.patient.user.email,
-                    patient_name=appointment.patient.full_name or "Patient",
-                    doctor_name=appointment.doctor.full_name or "Doctor",
-                    appointment_date=formatted_date,
-                    status=email_status,
-                    doctor_note=doctor_note
-                )
-            else:
-                print("DEBUG: No notify condition met or patient has no email. Skipping email.")
+            new_status = request.data.get('status')
+            doctor_note = request.data.get('doctor_note', '')
 
-            return response.Response(AppointmentSerializer(appointment).data)
+            # If user selects "Request Reschedule" (or 'cancelled'), we treat it as cancelled 
+            # but allow a custom email with the note.
+            if new_status in dict(Appointment.STATUS_CHOICES):
+                appointment.status = new_status
+                appointment.save()
+
+                # --- TRIGGER EMAIL NOTIFICATION ---
+                if appointment.patient.user.email:
+                    # Determine formatted date
+                    formatted_date = appointment.date_time.strftime('%B %d, %Y at %I:%M %p')
+                    
+                    send_appointment_status_email(
+                        recipient_email=appointment.patient.user.email,
+                        patient_name=appointment.patient.full_name or "Patient",
+                        doctor_name=appointment.doctor.full_name or "Doctor",
+                        appointment_date=formatted_date,
+                        status=new_status,
+                        doctor_note=doctor_note
+                    )
+                # ----------------------------------
 
+                return response.Response(AppointmentSerializer(appointment).data)
+            return response.Response({"error": "Invalid status"}, status=400)
+            
         except Appointment.DoesNotExist:
-            print("DEBUG: Appointment not found.")
-            return response.Response({"error": "Appointment not found"}, status=404)
-        except Exception as e:
-            print(f"DEBUG: Error in View: {e}")
-            return response.Response({"error": str(e)}, status=500)
+            return response.Response({"error": "Appointment not found"}, status=404)