Merge pull request #138 from adamspd/137-send-email-to-staff-admin-when-a-profile-is-created-for-him-to-set-password

Send email to staff member upon account creation

Author: adamspd

appointment/__init__.py

@@ -5,5 +5,5 @@
 __package_name__ = "django-appointment"
 __url__ = "https://github.com/adamspd/django-appointment"
 __package_website__ = "https://django-appt.adamspierredavid.com/"
-__version__ = "3.3.4"
+__version__ = "3.3.5"
 __test_version__ = False

appointment/services.py

@@ -29,6 +29,7 @@
     get_staff_member_from_user_id_or_logged_in, get_times_from_config, get_user_by_email,
     get_weekday_num_from_date, get_working_hours_for_staff_and_day, parse_name, update_appointment_reminder,
     working_hours_exist)
+from appointment.utils.email_ops import send_reset_link_to_staff_member
 from appointment.utils.error_codes import ErrorCode
 from appointment.utils.json_context import convert_appointment_to_json, get_generic_context, json_response
 from appointment.utils.permissions import check_entity_ownership
@@ -513,7 +514,7 @@ def email_change_verification_service(code, email, old_email):
     return False
 
 
-def create_staff_member_service(post_data):
+def create_staff_member_service(post_data, request):
     form = PersonalInformationForm(post_data)
     if form.is_valid():
         first_name = form.cleaned_data['first_name']
@@ -533,6 +534,7 @@ def create_staff_member_service(post_data):
         if not user.is_superuser:
             user.is_staff = True
             user.save()
+        send_reset_link_to_staff_member(user, request, user.email)
         return user, True, None
     else:
         return None, False, get_error_message_in_form(form=form)

appointment/templates/appointment/thank_you.html

@@ -3,7 +3,6 @@
 {% load static %}
 {% block customCSS %}
     <style>
-        /* Add your custom CSS here */
         body {
             font-family: 'Nunito', sans-serif;
             background-color: #f7f7f7;

appointment/tests/test_services.py

@@ -4,6 +4,7 @@
 import datetime
 import json
 from _decimal import Decimal
+from unittest.mock import patch
 
 from django.core.cache import cache
 from django.test import Client
@@ -589,6 +590,10 @@ class CreateStaffMemberServiceTest(BaseTest):
 
     def setUp(self):
         super().setUp()
+        self.factory = RequestFactory()
+
+        # Setup request object
+        self.request = self.factory.post('/')
 
     def test_valid_data(self):
         """Test if a staff member can be created with valid data."""
@@ -597,7 +602,7 @@ def test_valid_data(self):
             'last_name': 'Doe',
             'email': '[email protected]'
         }
-        user, success, error_message = create_staff_member_service(post_data)
+        user, success, error_message = create_staff_member_service(post_data, self.request)
 
         self.assertTrue(success)
         self.assertIsNotNone(user)
@@ -613,7 +618,7 @@ def test_invalid_data(self):
             'last_name': 'Doe',
             'email': '[email protected]'
         }
-        user, success, error_message = create_staff_member_service(post_data)
+        user, success, error_message = create_staff_member_service(post_data, self.request)
 
         self.assertFalse(success)
         self.assertIsNone(user)
@@ -627,12 +632,27 @@ def test_email_already_exists(self):
             'last_name': 'Doe',
             'email': '[email protected]'  # Using an email that already exists
         }
-        user, success, error_message = create_staff_member_service(post_data)
+        user, success, error_message = create_staff_member_service(post_data, self.request)
 
         self.assertFalse(success)
         self.assertIsNone(user)
         self.assertEqual(error_message, "email: This email is already taken.")
 
+    @patch('appointment.services.send_reset_link_to_staff_member')
+    def test_send_reset_link_to_new_staff_member(self, mock_send_reset_link):
+        """Test if a reset password link is sent to a new staff member."""
+        post_data = {
+            'first_name': 'Jane',
+            'last_name': 'Smith',
+            'email': '[email protected]'
+        }
+        user, success, _ = create_staff_member_service(post_data, self.request)
+        self.assertTrue(success)
+        self.assertIsNotNone(user)
+
+        # Check that the mock_send_reset_link function was called once
+        mock_send_reset_link.assert_called_once_with(user, self.request, user.email)
+
 
 class HandleServiceManagementRequestTest(BaseTest):
 

appointment/tests/utils/test_email_ops.py

@@ -1,7 +1,6 @@
 from unittest import mock
 from unittest.mock import MagicMock, patch
 
-from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import timezone
 from django.utils.translation import gettext as _
@@ -10,12 +9,48 @@
 from appointment.models import AppointmentRescheduleHistory
 from appointment.tests.base.base_test import BaseTest
 from appointment.utils.email_ops import (
-    get_thank_you_message, notify_admin_about_appointment, send_reschedule_confirmation_email, send_thank_you_email,
+    get_thank_you_message, notify_admin_about_appointment, send_reschedule_confirmation_email,
+    send_reset_link_to_staff_member, send_thank_you_email,
     send_verification_email
 )
 
 
-class GetThankYouMessageTests(TestCase):
+class SendResetLinkToStaffMemberTests(BaseTest):
+
+    def setUp(self):
+        super().setUp()
+        self.user = self.user1
+        self.user.is_staff = True
+        self.user.save()
+        self.factory = RequestFactory()
+        self.request = self.factory.get('/')
+        self.email = '[email protected]'
+
+    @mock.patch('appointment.utils.email_ops.send_email')
+    @mock.patch('appointment.models.PasswordResetToken.create_token')
+    def test_send_reset_link(self, mock_create_token, mock_send_email):
+        # Setup the token
+        mock_token = mock.Mock()
+        mock_token.token = 'token123'
+        mock_create_token.return_value = mock_token
+
+        # Assume get_absolute_url_ and get_website_name are utility functions you've defined somewhere
+        with mock.patch('appointment.utils.email_ops.get_absolute_url_') as mock_get_absolute_url:
+            with mock.patch('appointment.utils.email_ops.get_website_name') as mock_get_website_name:
+                mock_get_absolute_url.return_value = 'http://testserver/reset_password'
+                mock_get_website_name.return_value = 'TestCompany'
+
+                send_reset_link_to_staff_member(self.user, self.request, self.email)
+
+                # Check send_email was called with correct parameters
+                mock_send_email.assert_called_once()
+                args, kwargs = mock_send_email.call_args
+                self.assertEqual(kwargs['recipient_list'], [self.email])
+                self.assertIn('TestCompany', kwargs['message'])
+                self.assertIn('http://testserver/reset_password', kwargs['message'])
+
+
+class GetThankYouMessageTests(BaseTest):
     def test_thank_you_no_payment(self):
         with patch('appointment.utils.email_ops.APPOINTMENT_PAYMENT_URL', None):
             ar = MagicMock()

appointment/utils/email_ops.py

@@ -88,6 +88,54 @@ def send_thank_you_email(ar: AppointmentRequest, user, request, email: str, appo
     )
 
 
+def send_reset_link_to_staff_member(user, request, email: str, account_details=None):
+    """Email the staff member to set a password.
+
+    :param user: The user who booked the appointment.
+    :param email: The email address of the client.
+    :param account_details: Additional details about the account (default None).
+    :param request: The request object.
+    :return: None
+    """
+    # Month and year like "J A N 2 0 2 1"
+    token = PasswordResetToken.create_token(user=user, expiration_minutes=10080)  # 7 days expiration
+    ui_db64 = urlsafe_base64_encode(force_bytes(user.pk))
+    relative_set_passwd_link = reverse('appointment:set_passwd', args=[ui_db64, token.token])
+    set_passwd_link = get_absolute_url_(relative_set_passwd_link, request=request)
+
+    message = _("""
+        Hello {first_name},
+
+        A request has been received to set a password for your staff account for the year {current_year} at {company}.
+
+        Please click the link below to set up your new password:
+        {activation_link}
+        
+        To login, if ask for a username, use '{username}', otherwise use your email address.
+
+        If you did not request this, please ignore this email.
+
+        {account_details}
+
+        Regards,
+        {company}
+        """).format(
+        first_name=user.first_name,
+        current_year=datetime.datetime.now().year,
+        company=get_website_name(),
+        activation_link=set_passwd_link,
+        account_details=account_details if account_details else _("No additional details provided."),
+        username=user.username
+    )
+
+    # Assuming send_email is a method you have that sends an email
+    send_email(
+        recipient_list=[email],
+        subject=_("Set Your Password for {company}").format(company=get_website_name()),
+        message=message,
+    )
+
+
 def notify_admin_about_appointment(appointment, client_name: str):
     """Notify the admin and the staff member about a new appointment request."""
     email_context = {

appointment/views_admin.py

@@ -379,7 +379,7 @@ def email_change_verification_code(request):
 @require_superuser
 def create_new_staff_member(request):
     if request.method == 'POST':
-        user, is_valid, error_message = create_staff_member_service(request.POST)
+        user, is_valid, error_message = create_staff_member_service(request.POST, request)
         if is_valid:
             return redirect('appointment:user_profile', staff_user_id=user.pk)
         else: