Staging

CHANGES.rst

@@ -96,6 +96,8 @@ Changelog
 - Update the min booking type length value to 5min.
   [folix-01]
 
+- Improve manager mail notification subject to include also name and date.
+  [cekk]
 - Fix: hidden attribute in tipologia
   [mamico]
 
@@ -110,6 +112,8 @@ Changelog
 
 - Remove duplicated method in booker: create. Now there is only `book`.
   [cekk]
+- Add flag `auto_confirm_manager` that allows to automatically confirm bookings created by Booking Managers.
+  [cekk]
 
 - Hide PrenotazioniYear in add menu for restapi.
   [cekk]

src/redturtle/prenotazioni/behaviors/booking_folder/notifications/email/notification_email_message.py

@@ -299,3 +299,4 @@ def message_text(self) -> MIMEText:
             return MIMEText(text, "html", cs)
         else:
             return MIMEText(text, "html")
+

src/redturtle/prenotazioni/restapi/serializers/adapters/prenotazione.py

@@ -59,6 +59,7 @@ def __call__(self, *args, **kwargs):
             booking_expiration_date = booking_expiration_date.replace(
                 booking_date.year, booking_date.month, booking_date.day
             )
+
         return {
             "@id": self.prenotazione.absolute_url(),
             "UID": self.prenotazione.UID(),

src/redturtle/prenotazioni/restapi/services/types/get.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
+from redturtle.prenotazioni.content.prenotazioni_folder import IPrenotazioniFolder
 from plone.restapi.interfaces import IExpandableElement
 from plone.restapi.services.types.get import TypesInfo
 from zope.component import adapter
-from zope.interface import Interface
 from zope.interface import implementer
-
-from redturtle.prenotazioni.content.prenotazioni_folder import IPrenotazioniFolder
+from zope.interface import Interface
 
 
 @implementer(IExpandableElement)

src/redturtle/prenotazioni/tests/test_add_booking.py

@@ -423,6 +423,9 @@ def setUp(self):
             row["morning_end"] = "1000"
         self.folder_prenotazioni.week_table = week_table
 
+        api.content.transition(obj=self.folder_prenotazioni, transition="publish")
+        api.content.transition(obj=type_a, transition="publish")
+
     def create_booking(self, data: dict):
         booker = IBooker(self.folder_prenotazioni)
         return booker.book(data)
@@ -463,6 +466,64 @@ def test_booking_code_uniqueness(self):
 
         self.assertNotEqual(booking_1.getBookingCode(), booking_2.getBookingCode())
 
+    @freeze_time(DATE_STR)  # far from holidays
+    def test_booker_disallow_anon_creation_if_futureDays_is_set_and_passed(self):
+        today = date.today()
+        self.folder_prenotazioni.daData = today
+        self.folder_prenotazioni.futureDays = 6
+
+        logout()
+
+        with self.assertRaises(BookerException) as cm:
+            self.create_booking(
+                data={
+                    "booking_date": datetime.fromisoformat(today.isoformat())
+                    + timedelta(hours=8, days=8),
+                    "booking_type": "Type A",
+                    "title": "foo",
+                    "email": "[email protected]",
+                }
+            )
+        self.assertEqual(
+            "Sorry, you can not book this slot for now.", str(cm.exception)
+        )
+
+        # but can create a book inside range
+        future_date = datetime.fromisoformat(today.isoformat()) + timedelta(
+            hours=8, days=5
+        )
+        book = self.create_booking(
+            data={
+                "booking_date": future_date,
+                "booking_type": "Type A",
+                "title": "foo",
+                "email": "[email protected]",
+            }
+        )
+        self.assertEqual(book.booking_date.date(), future_date.date())
+
+    @freeze_time(DATE_STR)  # far from holidays
+    def test_booker_bypass_futureDays_check_if_manager(self):
+        today = date.today()
+        self.folder_prenotazioni.daData = today
+        self.folder_prenotazioni.futureDays = 6
+
+        logout()
+        login(self.portal, "jdoe")
+
+        future_date = datetime.fromisoformat(today.isoformat()) + timedelta(
+            hours=8, days=8
+        )
+        book = self.create_booking(
+            data={
+                "booking_date": future_date,
+                "booking_type": "Type A",
+                "title": "foo",
+                "email": "[email protected]",
+            }
+        )
+        self.assertEqual(book.booking_date.date(), future_date.date())
+
     def test_booker_auto_confirm_manager_true_by_default(self):
         folder_prenotazioni = api.content.create(
             container=self.portal,
@@ -650,61 +711,3 @@ def test_booker_auto_confirm_manager_called_by_anon_does_nothing(self):
         )
 
         self.assertEqual(api.content.get_state(obj=booking), "pending")
-
-    @freeze_time(DATE_STR)  # far from holidays
-    def test_booker_disallow_anon_creation_if_futureDays_is_set_and_passed(self):
-        today = date.today()
-        self.folder_prenotazioni.daData = today
-        self.folder_prenotazioni.futureDays = 6
-
-        logout()
-
-        with self.assertRaises(BookerException) as cm:
-            self.create_booking(
-                data={
-                    "booking_date": datetime.fromisoformat(today.isoformat())
-                    + timedelta(hours=8, days=8),
-                    "booking_type": "Type A",
-                    "title": "foo",
-                    "email": "[email protected]",
-                }
-            )
-        self.assertEqual(
-            "Sorry, you can not book this slot for now.", str(cm.exception)
-        )
-
-        # but can create a book inside range
-        future_date = datetime.fromisoformat(today.isoformat()) + timedelta(
-            hours=8, days=5
-        )
-        book = self.create_booking(
-            data={
-                "booking_date": future_date,
-                "booking_type": "Type A",
-                "title": "foo",
-                "email": "[email protected]",
-            }
-        )
-        self.assertEqual(book.booking_date.date(), future_date.date())
-
-    @freeze_time(DATE_STR)  # far from holidays
-    def test_booker_bypass_futureDays_check_if_manager(self):
-        today = date.today()
-        self.folder_prenotazioni.daData = today
-        self.folder_prenotazioni.futureDays = 6
-
-        logout()
-        login(self.portal, "jdoe")
-
-        future_date = datetime.fromisoformat(today.isoformat()) + timedelta(
-            hours=8, days=8
-        )
-        book = self.create_booking(
-            data={
-                "booking_date": future_date,
-                "booking_type": "Type A",
-                "title": "foo",
-                "email": "[email protected]",
-            }
-        )
-        self.assertEqual(book.booking_date.date(), future_date.date())

src/redturtle/prenotazioni/tests/test_behaviors_booking_folder_BookingNotificationSupervisorUtility.py

@@ -0,0 +1,174 @@
+# -*- coding: UTF-8 -*-
+import unittest
+from datetime import date
+from datetime import datetime
+from datetime import timedelta
+
+import pytz
+from plone import api
+from plone.app.testing import TEST_USER_ID
+from plone.app.testing import setRoles
+
+from redturtle.prenotazioni.adapters.booker import IBooker
+from redturtle.prenotazioni.behaviors.booking_folder import (
+    BookingNotificationSupervisorUtility,
+)
+from redturtle.prenotazioni.testing import (
+    REDTURTLE_PRENOTAZIONI_API_INTEGRATION_TESTING,
+)
+
+
+class TestBookingNotificationSupervisorUtility(unittest.TestCase):
+    layer = REDTURTLE_PRENOTAZIONI_API_INTEGRATION_TESTING
+    timezone = "Europe/Rome"
+
+    def setUp(self):
+        self.app = self.layer["app"]
+        self.portal = self.layer["portal"]
+        self.mailhost = self.portal.MailHost
+        self.email_subject = "Testing subject"
+        self.email_message = "Testing message"
+        self.supervisor = BookingNotificationSupervisorUtility()
+
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+
+        self.folder_prenotazioni = api.content.create(
+            container=self.portal,
+            type="PrenotazioniFolder",
+            title="Prenota foo",
+            description="",
+            daData=date.today(),
+            gates=["Gate A"],
+        )
+
+        api.content.create(
+            type="PrenotazioneType",
+            title="Type A",
+            duration=30,
+            container=self.folder_prenotazioni,
+            gates=["all"],
+        )
+
+        self.today_8_0 = self.dt_local_to_utc(
+            datetime.now().replace(hour=8, minute=0, second=0, microsecond=0)
+        )
+        self.tomorrow_8_0 = self.today_8_0 + timedelta(1)
+        week_table = self.folder_prenotazioni.week_table
+        for data in week_table:
+            data["morning_start"] = "0700"
+            data["morning_end"] = "1000"
+        self.folder_prenotazioni.week_table = week_table
+
+        api.portal.set_registry_record(
+            "plone.portal_timezone",
+            self.timezone,
+        )
+
+        self.booking = self.create_booking()
+
+    def dt_local_to_utc(self, value):
+        return pytz.timezone(self.timezone).localize(value).astimezone(pytz.utc)
+
+    def create_booking(self, booking_date=None):
+        booker = IBooker(self.folder_prenotazioni)
+        if booking_date is None:
+            booking_date = self.tomorrow_8_0
+        return booker.book(
+            {
+                "booking_date": booking_date,
+                "booking_type": "Type A",
+                "title": "foo",
+                "email": "[email protected]",
+                "fiscalcode": "FISCALCODE",
+                "phone": "1111111111",
+            }
+        )
+
+    def test_is_email_message_allowed_positive(self):
+        self.folder_prenotazioni.notifications_email_enabled = True
+
+        self.assertTrue(self.supervisor.is_email_message_allowed(self.booking))
+
+    def test_is_email_message_allowed_positive_negative(self):
+        self.folder_prenotazioni.notifications_email_enabled = False
+
+        self.assertFalse(self.supervisor.is_email_message_allowed(self.booking))
+
+        # No email provided
+
+        self.folder_prenotazioni.notifications_email_enabled = True
+        self.booking.email = None
+
+        self.assertFalse(self.supervisor.is_appio_message_allowed(self.booking))
+
+    def test_is_appio_message_allowed_positive(self):
+        self.folder_prenotazioni.notifications_appio_enabled = True
+
+        # Mock the AppIo subscription check
+        self.supervisor._check_user_appio_subscription_to_booking_type = (
+            lambda booking: True
+        )
+
+        self.assertTrue(self.supervisor.is_appio_message_allowed(self.booking))
+
+    def test_is_appio_message_allowed_negative(self):
+        # Mock the AppIO subscription check
+        self.supervisor._check_user_appio_subscription_to_booking_type = (
+            lambda booking: True
+        )
+
+        self.folder_prenotazioni.notifications_appio_enabled = False
+
+        self.assertFalse(self.supervisor.is_appio_message_allowed(self.booking))
+
+        # No fiscalcode provided
+        self.folder_prenotazioni.notifications_appio_enabled = True
+        self.booking.fiscalcode = None
+
+        self.assertFalse(self.supervisor.is_appio_message_allowed(self.booking))
+
+        # User has no AppIO service subscription
+        self.supervisor._check_user_appio_subscription_to_booking_type = (
+            lambda booking: False
+        )
+        self.booking.fiscalcode = "FISCALCODE"
+
+        self.assertFalse(self.supervisor.is_appio_message_allowed(self.booking))
+
+    def test_is_sms_message_allowed_positive(self):
+        self.supervisor.is_email_message_allowed = lambda booking: False
+        self.supervisor.is_appio_message_allowed = lambda booking: False
+        self.folder_prenotazioni.notifications_sms_enabled = True
+
+        self.assertTrue(self.supervisor.is_sms_message_allowed(self.booking))
+
+    def test_is_sms_message_allowed_negative(self):
+        # Flag is False
+        self.supervisor.is_email_message_allowed = lambda booking: True
+        self.supervisor.is_appio_message_allowed = lambda booking: True
+        self.folder_prenotazioni.notifications_sms_enabled = False
+
+        self.assertFalse(self.supervisor.is_sms_message_allowed(self.booking))
+
+        # Email notification is allowed
+        self.supervisor.is_email_message_allowed = lambda booking: True
+        self.supervisor.is_appio_message_allowed = lambda booking: False
+        self.folder_prenotazioni.notifications_sms_enabled = True
+
+        self.assertFalse(self.supervisor.is_sms_message_allowed(self.booking))
+
+        # AppIO notification is allowed
+        self.supervisor.is_email_message_allowed = lambda booking: False
+        self.supervisor.is_appio_message_allowed = lambda booking: True
+        self.folder_prenotazioni.notifications_sms_enabled = True
+
+        self.assertFalse(self.supervisor.is_sms_message_allowed(self.booking))
+
+        # No phone number was provided
+        self.supervisor.is_email_message_allowed = lambda booking: True
+        self.supervisor.is_appio_message_allowed = lambda booking: True
+        self.folder_prenotazioni.notifications_sms_enabled = True
+
+        self.booking.phone = None
+
+        self.assertFalse(self.supervisor.is_sms_message_allowed(self.booking))