Added responsivity to appointment page

Refactored some of the code

Author: adamspd

appointment/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Service, AppointmentRequest, Appointment, EmailVerificationCode
+from .models import Service, AppointmentRequest, Appointment, EmailVerificationCode, Config
 
 
 @admin.register(Service)
@@ -27,3 +27,8 @@ class AppointmentAdmin(admin.ModelAdmin):
 @admin.register(EmailVerificationCode)
 class EmailVerificationCodeAdmin(admin.ModelAdmin):
     list_display = ('user', 'code')
+
+
+@admin.register(Config)
+class ConfigAdmin(admin.ModelAdmin):
+    list_display = ('slot_duration', 'lead_time', 'finish_time', 'appointment_buffer_time', 'website_name')

appointment/email_messages.py

@@ -6,4 +6,4 @@
 If you choose the deposit, you will have to pay the rest of the amount on the day of the booking.""")
 
 thank_you_payment = ("""We're excited to have you on board! Thank you for booking us. The next step is to pay for
-the booking.""")
+the booking.""")

appointment/forms.py

@@ -1,4 +1,5 @@
 from django import forms
+
 from .models import AppointmentRequest
 
 

appointment/models.py

@@ -44,10 +44,24 @@ def get_description(self):
         return self.description
 
     def get_duration(self):
-        return self.duration.seconds // 3600
+        total_seconds = self.duration.total_seconds()
+        if total_seconds >= 86400:  # 1 day = 86400 seconds
+            days = total_seconds // 86400
+            return f"{days} day{'s' if days > 1 else ''}"
+        elif total_seconds >= 3600:  # 1 hour = 3600 seconds
+            hours = total_seconds // 3600
+            return f"{hours} hour{'s' if hours > 1 else ''}"
+        elif total_seconds >= 60:  # 1 minute = 60 seconds
+            minutes = total_seconds // 60
+            return f"{minutes} minute{'s' if minutes > 1 else ''}"
+        else:
+            return f"{total_seconds} second{'s' if total_seconds > 1 else ''}"
 
     def get_price(self):
-        return self.price
+        if self.price == 0:
+            return "Free"
+        else:
+            return f"{self.price} {self.currency}"
 
     def get_down_payment(self):
         return self.down_payment
@@ -249,16 +263,25 @@ def set_appointment_paid_status(self, status: bool):
 
 class Config(models.Model):
     slot_duration = models.PositiveIntegerField(
-        default=30,
-        help_text=_("Duration of each slot in minutes"),
+        null=True,
+        help_text=_("Minimum time for an appointment in minutes, recommended 30."),
     )
     lead_time = models.TimeField(
-        default="09:00",
-        help_text=_("Time when slots start"),
+        null=True,
+        help_text=_("Time when we start working."),
     )
     finish_time = models.TimeField(
-        default="16:30",
-        help_text=_("Time when we stop working"),
+        null=True,
+        help_text=_("Time when we stop working."),
+    )
+    appointment_buffer_time = models.DurationField(
+        null=True,
+        help_text=_("Time between now and the first available slot for the current day (doesn't affect tomorrow)."),
+    )
+    website_name = models.CharField(
+        max_length=255,
+        default="",
+        help_text=_("Name of your website."),
     )
 
     def clean(self):
@@ -325,4 +348,4 @@ def generate_code(cls, user):
         code = ''.join(random.choices(string.ascii_uppercase + string.digits, k=6))
         verification_code = cls(user=user, code=code)
         verification_code.save()
-        return code
+        return code

appointment/operations/__init__.py

@@ -0,0 +1,57 @@
+# appointment/operations/database_operations.py
+
+from django.apps import apps
+from django.contrib.auth.hashers import make_password
+from django.urls import reverse
+
+from appointment.models import Appointment, PaymentInfo
+from logger_config import logger
+from appointment.settings import APPOINTMENT_CLIENT_MODEL, APPOINTMENT_PAYMENT_URL
+from appointment.utils import Utility
+
+CLIENT_MODEL = apps.get_model(APPOINTMENT_CLIENT_MODEL)
+
+
+def get_appointments_and_slots(date_, service=None):
+    if service:
+        appointments = Appointment.objects.filter(appointment_request__service=service,
+                                                  appointment_request__date=date_)
+    else:
+        appointments = Appointment.objects.filter(appointment_request__date=date_)
+    available_slots = Utility.get_available_slots(date_, appointments)
+    return appointments, available_slots
+
+
+def get_user_by_email(email):
+    return CLIENT_MODEL.objects.filter(email=email).first()
+
+
+def create_new_user(client_data):
+    username = client_data['email'].split('@')[0]
+    user = CLIENT_MODEL.objects.create_user(first_name=client_data['name'], email=client_data['email'],
+                                            username=username)
+    password = f"{Utility.get_website_name()}{Utility.get_current_year()}"
+    user.password = make_password(password=password)
+    user.save()
+    return user
+
+
+def create_and_save_appointment(ar, client_data, appointment_data):
+    user = get_user_by_email(client_data['email'])
+    appointment = Appointment.objects.create(
+        client=user, appointment_request=ar,
+        **appointment_data
+    )
+    appointment.save()
+    logger.info(f"New appointment created: {appointment}")
+    return appointment
+
+
+def create_payment_info_and_get_url(appointment):
+    payment_info = PaymentInfo(appointment=appointment)
+    payment_info.save()
+    payment_url = reverse(
+        APPOINTMENT_PAYMENT_URL,
+        kwargs={'object_id': payment_info.id, 'id_request': payment_info.get_id_request()}
+    )
+    return payment_url

appointment/operations/database_operations.py

@@ -0,0 +1,38 @@
+# appointment/operations/email_operations.py
+
+import datetime
+
+from appointment import email_messages
+from appointment.email_sender import send_email
+from appointment.models import EmailVerificationCode
+from appointment.settings import APPOINTMENT_PAYMENT_URL
+from appointment.utils import Utility
+
+
+def get_email_message(ar):
+    if APPOINTMENT_PAYMENT_URL is None:
+        message = email_messages.thank_you_no_payment
+    elif ar.accepts_down_payment():
+        message = email_messages.thank_you_payment_plus_down
+    else:
+        message = email_messages.thank_you_payment
+    return message
+
+
+def send_email_to_client(ar, first_name, email):
+    email_context = {
+        'first_name': first_name,
+        'message': get_email_message(ar),
+        'current_year': datetime.datetime.now().year,
+        'company': Utility.get_website_name(),
+    }
+    send_email(
+        recipient_list=[email], subject="Thank you for booking us.",
+        template_url='email_sender/thank_you_email.html', context=email_context
+    )
+
+
+def send_verification_email(user, email):
+    code = EmailVerificationCode.generate_code(user=user)
+    message = f"Your verification code is {code}."
+    send_email(recipient_list=[email], subject="Email Verification", message=message)

appointment/operations/email_operations.py

@@ -0,0 +1,47 @@
+# appointment/operations/session_operations.py
+
+from django.contrib import messages
+from django.shortcuts import redirect
+
+from appointment.operations.database_operations import get_user_by_email
+from appointment.operations.email_operations import send_verification_email
+from logger_config import logger
+from appointment.settings import APPOINTMENT_BASE_TEMPLATE
+
+
+def handle_existing_email(request, client_data, appointment_data, appointment_request_id, id_request):
+    logger.info("Email already in database, saving info in session and redirecting to enter verification code")
+    user = get_user_by_email(client_data['email'])
+    send_verification_email(user=user, email=client_data['email'])
+
+    # clean the session variables
+    session_keys = ['email', 'phone', 'want_reminder', 'address', 'additional_info']
+    for key in session_keys:
+        if key in request.session:
+            del request.session[key]
+
+    request.session['email'] = client_data['email']
+    request.session['phone'] = appointment_data['phone']
+    request.session['want_reminder'] = appointment_data['want_reminder']
+    request.session['address'] = appointment_data['address']
+    request.session['additional_info'] = appointment_data['additional_info']
+
+    request.session['APPOINTMENT_BASE_TEMPLATE'] = APPOINTMENT_BASE_TEMPLATE
+
+    messages.error(request, f"Email '{client_data['email']}' already exists. Login to your account.")
+    return redirect('appointment:enter_verification_code', appointment_request_id=appointment_request_id,
+                    id_request=id_request)
+
+
+def get_appointment_data_from_session(request):
+    phone = request.session.get('phone')
+    want_reminder = request.session.get('want_reminder') == 'on'
+    address = request.session.get('address')
+    additional_info = request.session.get('additional_info')
+
+    return {
+        'phone': phone,
+        'want_reminder': want_reminder,
+        'address': address,
+        'additional_info': additional_info,
+    }

appointment/operations/session_operations.py

@@ -7,7 +7,8 @@
 APPOINTMENT_PAYMENT_URL = getattr(settings, 'APPOINTMENT_PAYMENT_URL', None)
 APPOINTMENT_THANK_YOU_URL = getattr(settings, 'APPOINTMENT_THANK_YOU_URL', None)
 APPOINTMENT_SLOT_DURATION = getattr(settings, 'APPOINTMENT_SLOT_DURATION', 30)
+APPOINTMENT_BUFFER_TIME = getattr(settings, 'APPOINTMENT_BUFFER_TIME', 0)
 APPOINTMENT_LEAD_TIME = getattr(settings, 'APPOINTMENT_LEAD_TIME', (9, 0))
-APPOINTMENT_FINISH_TIME = getattr(settings, 'APPOINTMENT_FINISH_TIME', (16, 30))
+APPOINTMENT_FINISH_TIME = getattr(settings, 'APPOINTMENT_FINISH_TIME', (18, 30))
 APP_DEFAULT_FROM_EMAIL = getattr(settings, 'DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL)
-APP_TIME_ZONE = getattr(settings, 'TIME_ZONE', 'UTC')
+APP_TIME_ZONE = getattr(settings, 'TIME_ZONE', 'America/New_York')