fix conflict

Author: adamspd

appointment/tests/utils/test_db_helpers.py

@@ -2,6 +2,7 @@
 # Path: appointment/tests/utils/test_db_helpers.py
 
 import datetime
+from unittest import skip
 from unittest.mock import MagicMock, PropertyMock, patch
 
 from django.apps import apps
@@ -12,8 +13,8 @@
 from django.test.client import RequestFactory
 from django.urls import reverse
 from django.utils import timezone
-from django_q.models import Schedule
 
+from appointment.logger_config import get_logger
 from appointment.models import Config, DayOff, PaymentInfo
 from appointment.tests.base.base_test import BaseTest
 from appointment.tests.mixins.base_mixin import ConfigMixin
@@ -31,6 +32,28 @@
     staff_change_allowed_on_reschedule, update_appointment_reminder, username_in_user_model, working_hours_exist
 )
 
+logger = get_logger(__name__)
+
+# Check if django-q is installed in settings
+DJANGO_Q_AVAILABLE = 'django_q' in settings.INSTALLED_APPS
+
+# Check if django-q is installed as a dependency
+try:
+    from django_q.models import Schedule
+    from django_q.tasks import schedule
+
+    DJANGO_Q_AVAILABLE = True
+except ImportError:
+    DJANGO_Q_AVAILABLE = False
+    Schedule = None
+    schedule = None
+
+
+@skip("Django-Q is not available")
+class DjangoQUnavailableTest(TestCase):
+    def test_placeholder(self):
+        self.skipTest("Django-Q is not available")
+
 
 class TestCalculateSlots(TestCase):
     def setUp(self):
@@ -165,18 +188,12 @@ def test_another_staff_member_no_day_off(self):
         self.assertFalse(check_day_off_for_staff(self.staff_member2, "2023-10-06"))
 
 
-class TestCreateAndSaveAppointment(BaseTest):
-
+class TestCreateAndSaveAppointment(BaseTest, TestCase):
     def setUp(self):
-        super().setUp()  # Call the parent class setup
-        # Specific setups for this test class
-        self.ar = self.create_appt_request_for_sm1()
+        super().setUp()
         self.factory = RequestFactory()
         self.request = self.factory.get('/')
-
-    def tearDown(self):
-        Appointment.objects.all().delete()
-        AppointmentRequest.objects.all().delete()
+        self.ar = self.create_appt_request_for_sm1()
 
     def test_create_and_save_appointment(self):
         client_data = {
@@ -190,7 +207,8 @@ def test_create_and_save_appointment(self):
             'additional_info': 'Please bring a Zat gun.'
         }
 
-        appointment = create_and_save_appointment(self.ar, client_data, appointment_data, self.request)
+        with patch('appointment.utils.db_helpers.schedule_email_reminder') as mock_schedule_reminder:
+            appointment = create_and_save_appointment(self.ar, client_data, appointment_data, self.request)
 
         self.assertIsNotNone(appointment)
         self.assertEqual(appointment.client.email, client_data['email'])
@@ -199,6 +217,32 @@ def test_create_and_save_appointment(self):
         self.assertEqual(appointment.address, appointment_data['address'])
         self.assertEqual(appointment.additional_info, appointment_data['additional_info'])
 
+        if DJANGO_Q_AVAILABLE:
+            mock_schedule_reminder.assert_called_once()
+        else:
+            mock_schedule_reminder.assert_not_called()
+
+    @patch('appointment.utils.db_helpers.DJANGO_Q_AVAILABLE', False)
+    def test_create_and_save_appointment_without_django_q(self):
+        client_data = {
+            'email': '[email protected]',
+            'name': 'samantha.carter',
+        }
+        appointment_data = {
+            'phone': '987654321',
+            'want_reminder': True,
+            'address': '456, SGC, Colorado Springs, USA',
+            'additional_info': 'Bring naquadah generator.'
+        }
+
+        with patch('appointment.utils.db_helpers.logger.warning') as mock_logger_warning:
+            appointment = create_and_save_appointment(self.ar, client_data, appointment_data, self.request)
+
+        self.assertIsNotNone(appointment)
+        self.assertEqual(appointment.client.email, client_data['email'])
+        mock_logger_warning.assert_called_with(
+            f"Email reminder requested for appointment {appointment.id}, but django-q is not available.")
+
 
 def get_mock_reverse(url_name, **kwargs):
     """A mocked version of the reverse function."""
@@ -208,6 +252,13 @@ def get_mock_reverse(url_name, **kwargs):
 
 
 class ScheduleEmailReminderTest(BaseTest):
+    @classmethod
+    def setUpClass(cls):
+        if not DJANGO_Q_AVAILABLE:
+            import unittest
+            raise unittest.SkipTest("Django-Q is not available")
+        super().setUpClass()
+
     def setUp(self):
         super().setUp()
         self.factory = RequestFactory()
@@ -217,6 +268,7 @@ def setUp(self):
     def tearDown(self):
         Appointment.objects.all().delete()
         AppointmentRequest.objects.all().delete()
+        super().tearDown()
 
     def test_schedule_email_reminder_cluster_running(self):
         with patch('appointment.settings.check_q_cluster', return_value=True), \
@@ -233,7 +285,14 @@ def test_schedule_email_reminder_cluster_not_running(self):
                     "Django-Q cluster is not running. Email reminder will not be scheduled.")
 
 
-class UpdateAppointmentReminderTest(BaseTest):
+class UpdateAppointmentReminderTest(BaseTest, TestCase):
+    @classmethod
+    def setUpClass(cls):
+        if not DJANGO_Q_AVAILABLE:
+            import unittest
+            raise unittest.SkipTest("Django-Q is not available")
+        super().setUpClass()
+
     def setUp(self):
         super().setUp()
         self.factory = RequestFactory()
@@ -243,6 +302,7 @@ def setUp(self):
     def tearDown(self):
         Appointment.objects.all().delete()
         AppointmentRequest.objects.all().delete()
+        super().tearDown()
 
     def test_update_appointment_reminder_date_time_changed(self):
         appointment = self.create_appt_for_sm1()
@@ -267,7 +327,7 @@ def test_update_appointment_reminder_no_change(self):
             mock_cancel_existing_reminder.assert_not_called()
             mock_schedule_email_reminder.assert_not_called()
 
-    @patch('appointment.utils.db_helpers.logger')  # Adjust the import path as necessary
+    @patch('appointment.utils.db_helpers.logger')
     def test_reminder_not_scheduled_due_to_user_preference(self, mock_logger):
         # Scenario where user does not want a reminder
         want_reminder = False
@@ -281,7 +341,7 @@ def test_reminder_not_scheduled_due_to_user_preference(self, mock_logger):
                 f"Reminder for appointment {self.appointment.id} is not scheduled per user's preference or past datetime."
         )
 
-    @patch('appointment.utils.db_helpers.logger')  # Adjust the import path as necessary
+    @patch('appointment.utils.db_helpers.logger')
     def test_reminder_not_scheduled_due_to_past_datetime(self, mock_logger):
         # Scenario where the new datetime is in the past
         want_reminder = True
@@ -371,6 +431,8 @@ def test_staff_change_not_allowed(self, mock_config_first):
 
 class CancelExistingReminderTest(BaseTest):
     def test_cancel_existing_reminder(self):
+        if not DJANGO_Q_AVAILABLE:
+            return
         appointment = self.create_appt_for_sm1()
         Schedule.objects.create(func='appointment.tasks.send_email_reminder', name=f"reminder_{appointment.id_request}")
 

appointment/utils/db_helpers.py

@@ -179,7 +179,7 @@ def update_appointment_reminder(appointment, new_date, new_start_time, request,
         cancel_existing_reminder(appointment.id_request)
 
         # If a reminder is still desired and the appointment is in the future, schedule a new one
-        if want_reminder and new_datetime > timezone.now():
+        if want_reminder and new_datetime > timezone.now() and DJANGO_Q_AVAILABLE:
             schedule_email_reminder(appointment, request, new_datetime)
         else:
             logger.info(