Fix dependant tests

Author: adamspd

appointment/models.py

@@ -454,30 +454,16 @@ def save(self, *args, **kwargs):
 
         if self.id_request is None:
             self.id_request = f"{get_timestamp()}{self.appointment_request.id}{generate_random_id()}"
-
-        try:
-            # Ensure `amount_to_pay` is a Decimal and handle both int and float inputs
-            if self.amount_to_pay is None:
-                self.amount_to_pay = self._calculate_amount_to_pay()
-
-            self.amount_to_pay = self._to_decimal(self.amount_to_pay)
-        except InvalidOperation:
-            raise ValidationError("Invalid amount format for payment.")
-
+        if self.amount_to_pay is None or self.amount_to_pay == 0:
+            payment_type = self.appointment_request.payment_type
+            if payment_type == 'full':
+                self.amount_to_pay = self.appointment_request.get_service_price()
+            elif payment_type == 'down':
+                self.amount_to_pay = self.appointment_request.get_service_down_payment()
+            else:
+                self.amount_to_pay = 0
         return super().save(*args, **kwargs)
 
-    def _calculate_amount_to_pay(self):
-        payment_type = self.appointment_request.payment_type
-        if payment_type == 'full':
-            return self.appointment_request.get_service_price()
-        elif payment_type == 'down':
-            return self.appointment_request.get_service_down_payment()
-        else:
-            return Decimal('0.00')
-
-    def _to_decimal(self, value):
-        return Decimal(f"{value}").quantize(Decimal('0.01'))
-
     def get_client_name(self):
         if hasattr(self.client, 'get_full_name') and callable(getattr(self.client, 'get_full_name')):
             name = self.client.get_full_name()

appointment/tests/test_services.py

@@ -41,24 +41,30 @@ def tearDownClass(cls):
 
     def setUp(self):
         self.tomorrow = timezone.now().date() + datetime.timedelta(days=1)
-        ar = self.create_appt_request_for_sm1(date_=self.tomorrow)
+        ar = self.create_appt_request_for_sm1(date_=self.tomorrow, start_time=time(11, 0), end_time=time(12, 0))
         self.appointment = self.create_appt_for_sm1(appointment_request=ar)
 
+    @override_settings(DEBUG=True)
+    def tearDown(self):
+        Config.objects.all().delete()
+        super().tearDown()
+        cache.clear()
+
     def test_get_available_slots(self):
         slots = get_available_slots(self.tomorrow, [self.appointment])
         self.assertIsInstance(slots, list)
-        self.assertNotIn('09:00 AM', slots)
+        self.assertNotIn('11:00 AM', slots)
 
     def test_get_available_slots_with_config(self):
         Config.objects.create(
-                lead_time=datetime.time(8, 0),
-                finish_time=datetime.time(17, 0),
+                lead_time=datetime.time(11, 0),
+                finish_time=datetime.time(15, 0),
                 slot_duration=30,
                 appointment_buffer_time=2.0
         )
         slots = get_available_slots(self.tomorrow, [self.appointment])
         self.assertIsInstance(slots, list)
-        self.assertNotIn('09:00 AM', slots)
+        self.assertNotIn('11:00 AM', slots)
 
 
 class FetchUserAppointmentsTests(BaseTest):
@@ -244,6 +250,13 @@ def test_regular_user_with_non_existent_staff_user_id(self):
 
 
 class HandleEntityManagementRequestTests(BaseTest):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super().tearDownClass()
 
     def setUp(self):
         super().setUp()
@@ -254,6 +267,10 @@ def setUp(self):
         self.request = self.factory.post('/')
         self.request.user = self.staff_member1.user
 
+    def tearDown(self):
+        WorkingHours.objects.all().delete()
+        super().tearDown()
+
     def test_staff_member_none(self):
         """A day off cannot be created for a staff member that doesn't exist."""
         response = handle_entity_management_request(self.request, None, 'day_off')
@@ -318,10 +335,21 @@ def test_working_hours_post(self):
 
 
 class HandleWorkingHoursFormTest(BaseTest):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super().tearDownClass()
 
     def setUp(self):
         super().setUp()
 
+    def tearDown(self):
+        WorkingHours.objects.all().delete()
+        super().tearDown()
+
     def test_add_working_hours(self):
         """Test if working hours can be added."""
         response = handle_working_hours_form(self.staff_member1, 1, '09:00 AM', '05:00 PM', True)
@@ -535,6 +563,14 @@ def setUp(self):
         Config.objects.create(slot_duration=60, lead_time=datetime.time(9, 0), finish_time=datetime.time(17, 0),
                               appointment_buffer_time=0)
 
+    @override_settings(DEBUG=True)
+    def tearDown(self):
+        WorkingHours.objects.all().delete()
+        DayOff.objects.all().delete()
+        Config.objects.all().delete()
+        cache.clear()
+        super().tearDown()
+
     def test_day_off(self):
         """Test if a day off is handled correctly when getting available slots."""
         # Ask for slots for it, and it should return an empty list since next Monday is a day off
@@ -587,6 +623,7 @@ def test_booked_slots(self):
             hour in range(9, 17) if hour != 10]
         self.assertEqual(slots, expected_slots)
 
+    @override_settings(DEBUG=True)
     def test_no_working_hours(self):
         """If a staff member doesn't have working hours on a given day, no slots should be available."""
         # Let's ask for slots on a Thursday, which the staff member doesn't work
@@ -856,6 +893,14 @@ def test_get_finish_button_text_paid_service(self):
 
 class SlotAvailabilityTest(BaseTest, ConfigMixin):
 
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super().tearDownClass()
+
     def setUp(self):
         self.service = self.create_service_(duration=timedelta(hours=2))
         self.config = self.create_config_(lead_time=time(11, 0), finish_time=time(15, 0), slot_duration=120)
@@ -864,7 +909,6 @@ def setUp(self):
     @override_settings(DEBUG=True)
     def tearDown(self):
         self.service.delete()
-        self.config.delete()
         cache.clear()
 
     def test_slot_availability_without_appointments(self):