Add some missing information to generated reservations

Author: matti-lamppu

applications/tasks.py

@@ -111,7 +111,6 @@ def generate_reservation_series_from_allocations(application_round_id: int) -> N
 
             reservation_details = ReservationDetails(
                 name=recurring_reservation.name,
-                description=application.additional_information,
                 type=ReservationTypeChoice.SEASONAL,
                 state=ReservationStateChoice.CONFIRMED,
                 user=recurring_reservation.user,
@@ -126,6 +125,8 @@ def generate_reservation_series_from_allocations(application_round_id: int) -> N
                 billing_address_street=billing_address_street,
                 billing_address_city=billing_address_city,
                 billing_address_zip=billing_address_zip,
+                purpose=application_section.purpose,
+                home_city=application.home_city,
             )
 
             reservation_details["reservee_type"] = (
@@ -136,6 +137,16 @@ def generate_reservation_series_from_allocations(application_round_id: int) -> N
                 else CustomerTypeChoice.NONPROFIT
             )
 
+            reservation_details["description"] = (
+                application.additional_information
+                if reservation_details["reservee_type"] == CustomerTypeChoice.INDIVIDUAL
+                else (
+                    translate_for_user(_("Core business"), application.user)
+                    + ": "
+                    + application.organisation.core_business
+                )
+            )
+
             if reservation_details["reservee_type"] == CustomerTypeChoice.INDIVIDUAL:
                 reservation_details["reservee_address_street"] = billing_address_street
                 reservation_details["reservee_address_city"] = billing_address_city

locale/fi/LC_MESSAGES/django.po

@@ -502,6 +502,8 @@ msgstr "Teksti, joka näytetään hakijoille heidän täyttäessään hakemuksia
 msgid "Application this section is in."
 msgstr "Hakemus jolle tämä osa kuuluu."
 
+#: applications/admin/forms/application_section.py
+#, python-format
 msgid ""
 "%(unallocated)s: Section has been created, but application round is still "
 "open. <br>%(in_allocation)s: Application round has closed, but the section "
@@ -514,8 +516,8 @@ msgstr ""
 "on vielä auki. <br>%(in_allocation)s: Hakuaika on sulkeutunut, mutta osaa ei "
 "ole vielä kokonaan käsitelty. <br>%(handled)s: Kausivarauskierros on "
 "käsitelty, tai osan toistokerrat on täytetty, tai kaikki varausyksikkö-"
-"vaihtoehdot on hylätty tai lukittu. <br>%(rejected)s: Kaikki "
-"haetut toistokerrat tälle hakemuksen osalle ovat lukittu tai hylätty. <br>"
+"vaihtoehdot on hylätty tai lukittu. <br>%(rejected)s: Kaikki haetut "
+"toistokerrat tälle hakemuksen osalle ovat lukittu tai hylätty. <br>"
 
 #: applications/admin/forms/application_section.py reservations/admin.py
 #: reservations/models/reservation_statistic.py
@@ -1018,6 +1020,10 @@ msgstr "Sopivat aikavälit"
 msgid "Begin and end times must be a multiples of 60 minutes."
 msgstr "Alku- ja lopetusaikojen tulee olla 60 minuutin monikertoja."
 
+#: applications/tasks.py
+msgid "Core business"
+msgstr "Ydinliiketoiminta"
+
 #: applications/validators.py
 msgid "This field is required."
 msgstr "Tämä kenttä on pakollinen."

tests/test_helauth/test_pipeline_additions.py

@@ -1,3 +1,4 @@
+import re
 from datetime import date
 from typing import Any, NamedTuple
 
@@ -8,6 +9,7 @@
 from users.helauth.clients import HelsinkiProfileClient
 from users.helauth.parsers import ssn_to_date
 from users.helauth.pipeline import update_user_from_profile
+from utils.external_service.errors import ExternalServiceError
 from utils.sentry import SentryLogger
 
 from .helpers import mock_request
@@ -76,19 +78,13 @@ def test_update_user_from_profile_logs_to_sentry_if_unsuccessful():
 @patch_method(HelsinkiProfileClient.get_token, return_value="token")
 @patch_method(HelsinkiProfileClient.generic, return_value=ResponseMock(json_data={"errors": [{"message": "foo"}]}))
 def test_update_user_from_profile_logs_to_sentry_if_raises():
-    # given:
-    # - There is a user without profile info
     user = UserFactory.create(profile_id="", date_of_birth=None)
 
-    # when:
-    # - This user's info is updated from profile
-    update_user_from_profile(request=mock_request(user))
+    msg = "Helsinki profile: Response contains errors."
+    with pytest.raises(ExternalServiceError, match=re.escape(msg)):
+        update_user_from_profile(request=mock_request(user))
 
     assert SentryLogger.log_exception.call_count == 1
-    log_message = SentryLogger.log_exception.mock_calls[0][1][1]
-    assert log_message == "Helsinki profile: Failed to update user from profile"
-    log_message = SentryLogger.log_exception.mock_calls[0][1][0].args[0]
-    assert log_message == "Helsinki profile: Response contains errors."
 
 
 @pytest.mark.parametrize(

tests/test_utils/test_generate_reservations_from_allocations.py

@@ -1,4 +1,5 @@
 import datetime
+import re
 
 import freezegun
 import pytest
@@ -199,9 +200,10 @@ def test_generate_reservation_series_from_allocations__error_handling():
     slot = AllocatedTimeSlotFactory.create_ready_for_reservation()
     application_round = slot.reservation_unit_option.application_section.application.application_round
 
-    # Errors are not raised, but logged to Sentry.
-    generate_reservation_series_from_allocations(application_round_id=application_round.id)
+    with pytest.raises(ValueError, match=re.escape("Test error")):
+        generate_reservation_series_from_allocations(application_round_id=application_round.id)
 
+    # Errors are logged to Sentry.
     assert SentryLogger.log_exception.call_count == 1
 
 

tilavarauspalvelu/settings.py

@@ -491,6 +491,7 @@ def SEARCH_SETTINGS(cls):
     TPREK_UNIT_URL = values.URLValue()
     GRAPHQL_CODEGEN_ENABLED = False
     UPDATE_RESERVATION_UNIT_HIERARCHY = True
+    SENTRY_LOGGER_ALWAYS_RE_RAISE = False
 
     PRUNE_RESERVATIONS_OLDER_THAN_MINUTES = 20
     REMOVE_RESERVATION_STATS_OLDER_THAN_YEARS = 5
@@ -629,6 +630,7 @@ def SEARCH_SETTINGS(cls):
 
     # --- Misc settings-----------------------------------------------------------------------------------------------
 
+    SENTRY_LOGGER_ALWAYS_RE_RAISE = True
     GRAPHQL_CODEGEN_ENABLED = values.BooleanValue(default=False)
     ICAL_HASH_SECRET = values.StringValue(default="")  # nosec # NOSONAR
 
@@ -801,6 +803,7 @@ def SEARCH_SETTINGS(cls):
     # Turn off reservation unit hierarchy updates from signals during tests,
     # since they slow them down a lot in CI. Refresh should be called manually when needed.
     UPDATE_RESERVATION_UNIT_HIERARCHY = False
+    SENTRY_LOGGER_ALWAYS_RE_RAISE = True
 
 
 class Build(EmptyDefaults, Common, use_environ=True):

utils/sentry.py

@@ -2,6 +2,7 @@
 from functools import wraps
 from typing import Any, Literal
 
+from django.conf import settings
 from sentry_sdk import capture_exception, capture_message, push_scope
 
 LogLevelStr = Literal["fatal", "critical", "error", "warning", "info", "debug"]
@@ -47,7 +48,8 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> None:
                         raise
 
                     SentryLogger.log_exception(err, details)
-                    if re_raise:
+                    # For local development, we should always re-raise an error for better debugging.
+                    if re_raise or settings.SENTRY_LOGGER_ALWAYS_RE_RAISE:
                         raise
 
             return wrapper