Fix flaky test and clone bug

backend/benefit/applications/services/clone_application.py

@@ -187,9 +187,6 @@ def _clone_handler_data(application_base, cloned_application):
         override_monthly_benefit_amount_comment=calculation_base.override_monthly_benefit_amount_comment,
     )
 
-    cloned_application.calculation.calculate(override_status=True)
-    cloned_application.calculation.save()
-
     for compensation in application_base.training_compensations.all():
         compensation.pk = None
         compensation.application = cloned_application
@@ -202,6 +199,9 @@ def _clone_handler_data(application_base, cloned_application):
         pay_subsidy.application = cloned_application
         pay_subsidy.save()
 
+    cloned_application.calculation.calculate(override_status=True)
+    cloned_application.calculation.save()
+
     cloned_application.status = ApplicationStatus.RECEIVED
     ApplicationLogEntry.objects.create(
         application=cloned_application,

backend/benefit/applications/tests/factories.py

@@ -338,7 +338,7 @@ class EmployeeFactory(factory.django.DjangoModelFactory):
     first_name = factory.Faker("first_name", locale="fi_FI")
     last_name = factory.Faker("last_name", locale="fi_FI")
     social_security_number = factory.Faker("ssn", locale="fi_FI")
-    phone_number = factory.Sequence(lambda n: f"050-10000{n}")
+    phone_number = factory.Sequence(lambda n: f"050-10{n + 1000}")
     email = factory.Faker("email", locale="fi_FI")
 
     employee_language = factory.Faker(

backend/benefit/applications/tests/test_ahjo_xml_builder.py

@@ -141,41 +141,43 @@ def test_secret_xml_decision_string(
         end_date=calculation.end_date,
     )
 
+    application_number = f"<td>{str(decided_application.application_number)}</td>"
+    company_name = f"<td>{decided_application.company.name}</td>"
+    business_id = f"<td>{decided_application.company.business_id}</td>"
+    employee_name = (
+        f"<td>{decided_application.employee.first_name} "
+        f"{decided_application.employee.last_name}</td>"
+    )
+    date_span = (
+        f"<td>{row.start_date.strftime('%d.%m.%Y')} -"
+        f" {row.end_date.strftime('%d.%m.%Y')}</td>"
+    )
+    row_amount = f">{str(int(row.amount))} €<"
+    benefit_amount = f">{str(int(calculation.calculated_benefit_amount))} €<"
+
     if application_status == ApplicationStatus.ACCEPTED:
         xml_string = secret_xml_builder.generate_xml()
 
         wanted_replacements = [
-            str(decided_application.application_number),
-            decided_application.company.name,
-            decided_application.company.business_id,
-            decided_application.employee.last_name,
-            decided_application.employee.first_name,
-            (
-                f"{row.start_date.strftime('%d.%m.%Y')} -"
-                f" {row.end_date.strftime('%d.%m.%Y')}"
-            ),
-            str(int(row.amount)),
-            str(int(calculation.calculated_benefit_amount)),
+            application_number,
+            company_name,
+            business_id,
+            employee_name,
+            date_span,
+            row_amount,
+            benefit_amount,
         ]
 
     elif application_status == ApplicationStatus.REJECTED:
         xml_string = secret_xml_builder.generate_xml()
 
         wanted_replacements = [
-            str(decided_application.application_number),
-            decided_application.company.name,
-            decided_application.company.business_id,
-            decided_application.employee.last_name,
-            decided_application.employee.first_name,
-        ]
-        unwanted_replacements = [
-            (
-                f"{row.start_date.strftime('%d.%m.%Y')} -"
-                f" {row.end_date.strftime('%d.%m.%Y')}"
-            ),
-            str(int(row.amount)),
-            str(int(calculation.calculated_benefit_amount)),
+            application_number,
+            company_name,
+            business_id,
+            employee_name,
         ]
+        unwanted_replacements = [date_span, row_amount, benefit_amount]
         assert all(
             [replacement not in xml_string for replacement in unwanted_replacements]
         )

backend/benefit/applications/tests/test_application_clone.py

@@ -196,6 +196,7 @@
 
 
 @pytest.mark.django_db
+@pytest.mark.freeze_time("2024-10-22")
 def test_application_full_clone(api_client, handler_api_client, settings):
     settings.PAYMENT_INSTALMENTS_ENABLED = True
     application = _set_up_decided_application()