rebasing

Author: adamspd

.gitignore

@@ -4,7 +4,7 @@
 *.pyc
 __pycache__/
 local_settings.py
-db.sqlite3
+db.sqlite3*
 db.sqlite3-journal
 db.sqlite3.init
 media

appointment/email_sender/email_sender.py

@@ -2,7 +2,8 @@
 # Path: appointment/email_sender/email_sender.py
 import os
 
-from django.core.mail import mail_admins, send_mail
+from django.conf import settings
+from django.core.mail import send_mail
 from django.template import loader
 
 from appointment.logger_config import get_logger
@@ -53,49 +54,70 @@ def render_email_template(template_url, context):
 
 
 def send_email(recipient_list, subject: str, template_url: str = None, context: dict = None, from_email=None,
-               message: str = None):
+               message: str = None, attachments=None):
     if not has_required_email_settings():
         return
 
     from_email = from_email or APP_DEFAULT_FROM_EMAIL
     html_message = render_email_template(template_url, context)
 
     if get_use_django_q_for_emails() and check_q_cluster() and DJANGO_Q_AVAILABLE:
-        # Asynchronously send the email using Django-Q
+        # Pass only the necessary data to construct the email
         async_task(
-                "appointment.tasks.send_email_task", recipient_list=recipient_list, subject=subject,
-                message=message, html_message=html_message if template_url else None, from_email=from_email
+                'appointment.tasks.send_email_task',
+                recipient_list=recipient_list,
+                subject=subject,
+                message=message,
+                html_message=html_message,
+                from_email=from_email,
+                attachments=attachments
         )
     else:
         # Synchronously send the email
         try:
             send_mail(
-                    subject=subject, message=message if not template_url else "",
-                    html_message=html_message if template_url else None, from_email=from_email,
-                    recipient_list=recipient_list, fail_silently=False,
+                    subject=subject,
+                    message=message if not template_url else "",
+                    html_message=html_message if template_url else None,
+                    from_email=from_email,
+                    recipient_list=recipient_list,
+                    fail_silently=False,
             )
         except Exception as e:
             logger.error(f"Error sending email: {e}")
 
 
-def notify_admin(subject: str, template_url: str = None, context: dict = None, message: str = None):
+def notify_admin(subject: str, template_url: str = None, context: dict = None, message: str = None,
+                 recipient_email: str = None, attachments=None):
     if not has_required_email_settings():
         return
 
     html_message = render_email_template(template_url, context)
 
+    recipients = [recipient_email] if recipient_email else [email for name, email in settings.ADMINS]
+
     if get_use_django_q_for_emails() and check_q_cluster() and DJANGO_Q_AVAILABLE:
-        # Enqueue the task to send admin email asynchronously
-        async_task('appointment.tasks.notify_admin_task', subject=subject, message=message, html_message=html_message)
+        # Asynchronously send the email using Django-Q
+        async_task("appointment.tasks.send_email_task",
+                   subject=subject,
+                   message=message,
+                   html_message=html_message,
+                   from_email=settings.DEFAULT_FROM_EMAIL,
+                   recipient_list=recipients,
+                   attachments=attachments)
     else:
-        # Synchronously send admin email
+        # Synchronously send the email
         try:
-            mail_admins(
-                    subject=subject, message=message if not template_url else "",
-                    html_message=html_message if template_url else None
+            send_mail(
+                    subject=subject,
+                    message=message if not template_url else "",
+                    html_message=html_message if template_url else None,
+                    from_email=settings.DEFAULT_FROM_EMAIL,
+                    recipient_list=recipients,
+                    fail_silently=False,
             )
         except Exception as e:
-            logger.error(f"Error sending email to admin: {e}")
+            logger.error(f"Error sending email: {e}")
 
 
 def get_use_django_q_for_emails():

appointment/tasks.py

@@ -5,6 +5,7 @@
 Author: Adams Pierre David
 Since: 3.1.0
 """
+from django.core.mail import EmailMessage
 from django.utils.translation import gettext as _
 
 from appointment.email_sender import notify_admin, send_email
@@ -42,18 +43,23 @@ def send_email_reminder(to_email, first_name, reschedule_link, appointment_id):
     )
 
 
-def send_email_task(recipient_list, subject, message, html_message, from_email):
-    """
-   Task function to send an email asynchronously using Django's send_mail function.
-   This function tries to send an email and logs an error if it fails.
-   """
+def send_email_task(recipient_list, subject, message, html_message, from_email, attachments=None):
     try:
-        from django.core.mail import send_mail
-        logger.info(f"Sending email to {recipient_list} with subject: {subject}")
-        send_mail(
-                subject=subject, message=message, html_message=html_message, from_email=from_email,
-                recipient_list=recipient_list, fail_silently=False,
+        email = EmailMessage(
+                subject=subject,
+                body=message if not html_message else html_message,
+                from_email=from_email,
+                to=recipient_list
         )
+
+        if html_message:
+            email.content_subtype = "html"
+
+        if attachments:
+            for attachment in attachments:
+                email.attach(*attachment)
+
+        email.send(fail_silently=False)
     except Exception as e:
         logger.error(f"Error sending email from task: {e}")
 

appointment/utils/email_ops.py

@@ -21,6 +21,7 @@
 from appointment.settings import APPOINTMENT_PAYMENT_URL
 from appointment.utils.date_time import convert_24_hour_time_to_12_hour_time
 from appointment.utils.db_helpers import get_absolute_url_, get_website_name
+from appointment.utils.ics_utils import generate_ics_file
 
 logger = get_logger(__name__)
 
@@ -46,14 +47,15 @@ def get_thank_you_message(ar: AppointmentRequest) -> str:
 
 
 def send_thank_you_email(ar: AppointmentRequest, user, request, email: str, appointment_details=None,
-                         account_details=None):
+                         account_details=None, ics_file=None):
     """Send a thank-you email to the client for booking an appointment.
 
     :param ar: The appointment request associated with the booking.
     :param user: The user who booked the appointment.
     :param email: The email address of the client.
     :param appointment_details: Additional details about the appointment (default None).
     :param account_details: Additional details about the account (default None).
+    :param ics_file: The ICS file to attach to the email (default None).
     :param request: The request object.
     :return: None
     """
@@ -87,7 +89,8 @@ def send_thank_you_email(ar: AppointmentRequest, user, request, email: str, appo
     }
     send_email(
             recipient_list=[email], subject=_("Thank you for booking us."),
-            template_url='email_sender/thank_you_email.html', context=email_context
+            template_url='email_sender/thank_you_email.html', context=email_context,
+            attachments=[('appointment.ics', ics_file, 'text/calendar')]
     )
 
 
@@ -142,20 +145,64 @@ def send_reset_link_to_staff_member(user, request, email: str, account_details=N
 
 def notify_admin_about_appointment(appointment, client_name: str):
     """Notify the admin and the staff member about a new appointment request."""
-    logger.info(f"Sending admin notification for new appointment {appointment.id}")
-    email_context = {
+    logger.info(f"Sending notifications for new appointment {appointment.id}")
+
+    staff_member = appointment.get_staff_member()
+    ics_file = generate_ics_file(appointment)
+
+    # Create a set to keep track of notified email addresses
+    notified_emails = set()
+
+    # Prepare the staff member notification
+    staff_email = staff_member.user.email
+    staff_name = staff_member.user.get_full_name() or staff_member.user.username
+    staff_context = {
+        'recipient_name': staff_name,
         'client_name': client_name,
-        'appointment': appointment
+        'appointment': appointment,
+        'is_staff_member': True,
+        'staff_member_name': staff_name
     }
 
-    subject = _("New Appointment Request for ") + client_name
-    staff_member = appointment.get_staff_member()
-    notify_admin(subject=subject, template_url='email_sender/admin_new_appointment_email.html', context=email_context)
-    if staff_member.user.email not in settings.ADMINS:
-        logger.info(
-            f"Let's notify the staff member as well for new appointment {appointment.id} since they are not an admin.")
-        send_email(recipient_list=[staff_member.user.email], subject=subject,
-                   template_url='email_sender/admin_new_appointment_email.html', context=email_context)
+    # Notify admins
+    for admin_name, admin_email in settings.ADMINS:
+        if admin_email in notified_emails:
+            continue  # Skip if this email has already been notified
+
+        is_staff_admin = admin_email == staff_email
+        email_context = staff_context if is_staff_admin else {
+            'recipient_name': admin_name,
+            'client_name': client_name,
+            'appointment': appointment,
+            'is_staff_member': False,
+            'staff_member_name': staff_name
+        }
+
+        subject = _("New Appointment Request for ") + client_name
+        attachments = [('appointment.ics', ics_file, 'text/calendar')] if is_staff_admin else None
+
+        notify_admin(
+                subject=subject,
+                template_url='email_sender/admin_new_appointment_email.html',
+                context=email_context,
+                recipient_email=admin_email,
+                attachments=attachments
+        )
+
+        notified_emails.add(admin_email)
+
+    # Notify staff member if they haven't been notified as an admin
+    if staff_email not in notified_emails:
+        logger.info(f"Notifying the staff member for new appointment {appointment.id}")
+        send_email(
+                recipient_list=[staff_email],
+                subject=_("New Appointment Request for ") + client_name,
+                template_url='email_sender/admin_new_appointment_email.html',
+                context=staff_context,
+                attachments=[('appointment.ics', ics_file, 'text/calendar')]
+        )
+
+    logger.info(f"Notifications sent for appointment {appointment.id}")
 
 
 def send_verification_email(user, email: str):

appointment/utils/ics_utils.py

@@ -0,0 +1,32 @@
+# appointment/utils/ics_utils.py
+
+from datetime import datetime
+
+from icalendar import Calendar, Event
+
+from appointment.utils.db_helpers import Appointment, get_website_name
+
+
+def generate_ics_file(appointment: Appointment):
+    company_name = get_website_name()
+
+    cal = Calendar()
+    cal.add('prodid', f"-//{company_name}//DjangoAppointmentSystem//EN")
+    cal.add('version', '2.0')
+
+    event = Event()
+    event.add('summary', appointment.get_service_name())
+    event.add('dtstart', appointment.get_start_time())
+    event.add('dtend', appointment.get_end_time())
+    event.add('dtstamp', datetime.now())
+    event.add('location', appointment.address)
+    event.add('description', appointment.additional_info)
+
+    organizer = f"MAILTO:{appointment.appointment_request.staff_member.user.email}"
+    event.add('organizer', organizer)
+
+    attendee = f"MAILTO:{appointment.client.email}"
+    event.add('attendee', attendee)
+
+    cal.add_component(event)
+    return cal.to_ical()

appointment/views.py

@@ -8,7 +8,6 @@
 
 from datetime import date, timedelta
 
-from appointment.settings import check_q_cluster
 from django.contrib import messages
 from django.contrib.auth import login
 from django.contrib.auth.forms import SetPasswordForm
@@ -22,13 +21,14 @@
 from django.utils.timezone import get_current_timezone_name
 from django.utils.translation import gettext as _
 
-from appointment.forms import AppointmentForm, AppointmentRequestForm, SlotForm, ClientDataForm
+from appointment.forms import AppointmentForm, AppointmentRequestForm, ClientDataForm, SlotForm
 from appointment.logger_config import get_logger
 from appointment.models import (
     Appointment, AppointmentRequest, AppointmentRescheduleHistory, Config, DayOff, EmailVerificationCode,
     PasswordResetToken, Service,
     StaffMember
 )
+from appointment.settings import check_q_cluster
 from appointment.utils.db_helpers import (
     can_appointment_be_rescheduled, check_day_off_for_staff, create_and_save_appointment, create_new_user,
     create_payment_info_and_get_url, get_non_working_days_for_staff, get_user_by_email, get_user_model,
@@ -47,6 +47,7 @@
 from .settings import (APPOINTMENT_PAYMENT_URL, APPOINTMENT_THANK_YOU_URL)
 from .utils.date_time import convert_str_to_date
 from .utils.error_codes import ErrorCode
+from .utils.ics_utils import generate_ics_file
 from .utils.json_context import get_generic_context_with_extra, json_response
 
 CLIENT_MODEL = get_user_model()
@@ -395,8 +396,9 @@ def enter_verification_code(request, appointment_request_id, id_request):
                 'Appointment Time': appointment.appointment_request.start_time,
                 'Duration': appointment.get_service_duration()
             }
+            ics_file = generate_ics_file(appointment)
             send_thank_you_email(ar=appointment_request_object, user=user, email=email,
-                                 appointment_details=appointment_details, request=request)
+                                 appointment_details=appointment_details, request=request, ics_file=ics_file)
             return response
         else:
             messages.error(request, _("Invalid verification code."))
@@ -433,8 +435,9 @@ def default_thank_you(request, appointment_id):
     }
     if username_in_user_model():
         account_details[_('Username')] = appointment.client.username
+    ics_file = generate_ics_file(appointment)
     send_thank_you_email(ar=ar, user=appointment.client, email=email, appointment_details=appointment_details,
-                         account_details=account_details, request=request)
+                         account_details=account_details, request=request, ics_file=ics_file)
     extra_context = {
         'appointment': appointment,
     }

requirements.txt

@@ -8,3 +8,4 @@ requests~=2.32.3
 python-dotenv==1.0.1
 colorama~=0.4.6
 django-q2==1.7.3
+icalendar~=5.0.13