Skip to content

appointment model: clean() and save() improvements #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamspd merged 3 commits into from
Mar 24, 2024
Merged

appointment model: clean() and save() improvements #156

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
022442c
Appointment: raise ValidationError instead of ValueError in clean()
Mar 24, 2024
5385320
Appointment: remove useless date validity check
Mar 24, 2024
cec8061
Appointment: check start time is only strictly before end time
Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions appointment/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,16 +310,10 @@ def __str__(self):

def clean(self):
if self.start_time is not None and self.end_time is not None:
if self.start_time >= self.end_time:
raise ValueError(_("Start time must be before end time"))
if self.start_time > self.end_time:
raise ValidationError(_("Start time must be before end time"))
if self.start_time == self.end_time:
raise ValueError(_("Start time and end time cannot be the same"))
# Check for valid date
try:
# This will raise a ValueError if the date is not valid
datetime.datetime.strptime(str(self.date), '%Y-%m-%d')
except ValueError:
raise ValidationError(_("The date is not valid"))
raise ValidationError(_("Start time and end time cannot be the same"))

# Ensure the date is not in the past:
if self.date < datetime.date.today():
Expand All @@ -338,10 +332,6 @@ def save(self, *args, **kwargs):
# duration should not exceed the service duration
if time_difference(self.start_time, self.end_time) > self.service.duration:
raise ValidationError(_("Duration cannot exceed the service duration"))
try:
datetime.datetime.strptime(str(self.date), '%Y-%m-%d')
except ValueError:
raise ValidationError(_("The date is not valid"))
return super().save(*args, **kwargs)

def get_service_name(self):
Expand Down