Merge pull request #111 from adamspd/fix/label-in-readme

Updated label in readme

Author: adamspd

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish Python Distribution [PyPi & GH Release | TestPyPi]
+name: Publishing
 
 on:
   push:

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  running_tests:
+  tests:
     runs-on: ubuntu-20.04
     strategy:
       max-parallel: 4

README.md

@@ -2,7 +2,9 @@
 
 ![Tests](https://github.com/adamspd/django-appointment/actions/workflows/tests.yml/badge.svg)
 ![Published on PyPi](https://github.com/adamspd/django-appointment/actions/workflows/publish.yml/badge.svg)
-[![PyPI version](https://badge.fury.io/py/django-appointment.svg)](https://badge.fury.io/py/django-appointment)
+[![Current Release Version](https://img.shields.io/github/release/adamspd/django-appointment.svg?style=flat-square&logo=github)](https://github.com/adamspd/django-appointment/releases)
+[![pypi Version](https://img.shields.io/pypi/v/django-appointment.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/django-appointment/)
+[![PyPi downloads](https://static.pepy.tech/personalized-badge/django-appointment?period=total&units=international_system&left_color=grey&right_color=orange&left_text=pip%20downloads)](https://pypi.org/project/django-appointment/)
 [![codecov](https://codecov.io/gh/adamspd/django-appointment/branch/main/graph/badge.svg?token=ZQZQZQZQZQ)](https://codecov.io/gh/adamspd/django-appointment)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/adamspd/django-appointment)](https://github.com/adamspd/django-appointment/commits/main)

appointment/tests/test_services.py

@@ -432,71 +432,72 @@ def setUp(self):
         self.wh2 = WorkingHours.objects.create(staff_member=self.staff_member1, day_of_week=3,
                                                start_time=datetime.time(9, 0), end_time=datetime.time(17, 0))
         # But decides to take a day off next Monday
-        DayOff.objects.create(staff_member=self.staff_member1, start_date=get_next_weekday(self.today, 0),
-                              end_date=get_next_weekday(self.today, 1))
+        self.next_monday = get_next_weekday(self.today, 0)
+        self.next_tuesday = get_next_weekday(self.today, 1)
+        self.next_wednesday = get_next_weekday(self.today, 2)
+        self.next_thursday = get_next_weekday(self.today, 3)
+        self.next_friday = get_next_weekday(self.today, 4)
+        self.next_saturday = get_next_weekday(self.today, 5)
+        self.next_sunday = get_next_weekday(self.today, 6)
+        DayOff.objects.create(staff_member=self.staff_member1, start_date=self.next_monday, end_date=self.next_monday)
         Config.objects.create(slot_duration=60, lead_time=datetime.time(9, 0), finish_time=datetime.time(17, 0),
                               appointment_buffer_time=0)
 
     def test_day_off(self):
         """Test if a day off is handled correctly when getting available slots."""
-        # Get a day in the future that is a Monday (for python weekday: 0 = Monday)
-        date = get_next_weekday(datetime.datetime.today(), 0)
         # Ask for slots for it, and it should return an empty list since next Monday is a day off
-        slots = get_available_slots_for_staff(date, self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_monday, self.staff_member1)
         self.assertEqual(slots, [])
 
     def test_staff_does_not_work(self):
         """Test if a staff member who doesn't work on a given day is handled correctly when getting available slots."""
         # For next week, the staff member works only on Monday and Wednesday, but puts a day off on Monday
         # So the staff member should not have any available slots except for Wednesday, which is day #2 (python weekday)
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 1), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_monday, self.staff_member1)
         self.assertEqual(slots, [])
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 3), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_tuesday, self.staff_member1)
         self.assertEqual(slots, [])
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 4), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_thursday, self.staff_member1)
         self.assertEqual(slots, [])
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 5), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_friday, self.staff_member1)
         self.assertEqual(slots, [])
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 6), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_saturday, self.staff_member1)
         self.assertEqual(slots, [])
-        slots = get_available_slots_for_staff(get_next_weekday(self.today, 0), self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_sunday, self.staff_member1)
         self.assertEqual(slots, [])
 
     def test_available_slots(self):
         """Test if available slots are returned correctly."""
         # On a Wednesday, the staff member should have slots from 9 AM to 5 PM
-        date = get_next_weekday(self.today, 2)
-        slots = get_available_slots_for_staff(date, self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_wednesday, self.staff_member1)
         expected_slots = [f"{hour:02d}:00 AM" for hour in range(9, 12)] + ["12:00 PM"] + \
                          [f"{hour:02d}:00 PM" for hour in range(1, 5)]
         self.assertEqual(slots, expected_slots)
 
     def test_booked_slots(self):
         """On a given day, if a staff member has an appointment, that time slot should not be available."""
         # Let's book a slot for the staff member on next Wednesday
-        appt_date = get_next_weekday(self.today, 2)
         start_time = datetime.time(10, 0)
         end_time = datetime.time(11, 0)
 
         # Create an appointment request for that time
         appt_request = self.create_appointment_request_(service=self.service1, staff_member=self.staff_member1,
-                                                        date_=appt_date, start_time=start_time, end_time=end_time)
+                                                        date_=self.next_wednesday, start_time=start_time, end_time=end_time)
         # Create an appointment using that request
         self.create_appointment_(user=self.client1, appointment_request=appt_request)
 
         # Now, the staff member should not have that slot available
-        slots = get_available_slots_for_staff(appt_date, self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_wednesday, self.staff_member1)
         expected_slots = ['09:00 AM', '11:00 AM', '12:00 PM', '01:00 PM', '02:00 PM', '03:00 PM', '04:00 PM']
         self.assertEqual(slots, expected_slots)
 
     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
-        date = get_next_weekday(self.today, 3)
         # Let's remove the config object also since it may contain default working days
         Config.objects.all().delete()
         # Now no slots should be available
-        slots = get_available_slots_for_staff(date, self.staff_member1)
+        slots = get_available_slots_for_staff(self.next_thursday, self.staff_member1)
         self.assertEqual(slots, [])