MPT-10795 fix trial calculation and exchange rates client

Author: ffaraone

ffc/billing/process_billing.py

@@ -567,7 +567,7 @@ def generate_refunds(
         refund_lines = []
         trial_days: set[int] = set()
         trial_start_date, trial_end_date = get_trial_dates(agreement=agreement)
-        if trial_start_date and trial_end_date:
+        if trial_start_date and trial_end_date and trial_end_date >= self.billing_start_date.date():
             trial_info = self.get_trial_info(
                 trial_start_date,
                 trial_end_date,
@@ -664,18 +664,11 @@ async def generate_refund_lines(
                     f"{linked_datasource_id}-{idx:02d}",
                     datasource_id,
                     organization_id,
-                    date(
-                        self.billing_start_date.year,
-                        self.billing_start_date.month,
-                        min(daily_expenses.keys()),
-                    ),
-                    date(
-                        self.billing_start_date.year,
-                        self.billing_start_date.month,
-                        max(daily_expenses.keys()),
-                    ),
+                    refund.start_date,
+                    refund.end_date,
                     -refund_in_target_currency,
                     datasource_name,
+                    refund.description,
                 )
             )
 

ffc/clients/exchage_rates.py

@@ -21,7 +21,7 @@ async def fetch_exchange_rates(self, currency) -> dict[str, Any]:
         if currency in self.exchage_rates_cache:
             return self.exchage_rates_cache[currency]
         response = await self.httpx_client.get(
-            f"{settings.EXTENSION_CONFIG["EXCHANGE_RATES_BASE_URL"]}/latest/{currency}"
+            f"{settings.EXTENSION_CONFIG["EXCHANGE_RATES_API_TOKEN"]}/latest/{currency}"
         )
         response.raise_for_status()
         exchange_rates = response.json()

tests/ffc/test_exchange_rates_client.py

@@ -5,7 +5,10 @@
 
 @pytest.fixture()
 def exchange_rates_client_settings(settings):
-    settings.EXTENSION_CONFIG = {"EXCHANGE_RATES_BASE_URL": "https://local.local"}
+    settings.EXTENSION_CONFIG = {
+        "EXCHANGE_RATES_BASE_URL": "https://local.local",
+        "EXCHANGE_RATES_API_TOKEN": "api-token"
+    }
     return settings
 
 
@@ -25,7 +28,9 @@ async def test_fetch_exchange_rates_cached(mocked_exchange_rates_client, exchang
 async def test_fetch_exchange_rates_no_cached(
     httpx_mock, mocked_exchange_rates_client, exchange_rates, exchange_rates_client_settings
 ):
-    httpx_mock.add_response(method="GET", url="https://local.local/latest/USD", json=exchange_rates)
+    httpx_mock.add_response(
+        method="GET", url="https://local.local/api-token/latest/USD", json=exchange_rates,
+    )
     response = await mocked_exchange_rates_client.fetch_exchange_rates(currency="USD")
     assert response == exchange_rates
     assert mocked_exchange_rates_client.exchage_rates_cache["USD"] == exchange_rates

tests/ffc/test_process_billing.py

@@ -477,8 +477,9 @@ async def test_generate_datasource_charges_with_daily_expenses(
         '"34654563488"}, "search": {"subscription": {"criteria": '
         '"subscription.externalIds.vendor", "value": "FORG-4801-6958-2949"}, "item": '
         '{"criteria": "item.externalIds.vendor", "value": ""}}, "period": {"start": '
-        '"2025-06-01", "end": "2025-06-30"}, "price": {"unitPP": "-39.1447", "PPx1": '
-        '"-39.1447"}, "quantity": 1, "description": {"value1": "Test", "value2": ""}, '
+        '"2025-06-01", "end": "2025-06-15"}, "price": {"unitPP": "-39.1447", "PPx1": '
+        '"-39.1447"}, "quantity": 1, "description": {"value1": "Test", "value2": '
+        '"Refund due to trial period (from 01 Jun 2025 to 15 Jun 2025)"}, '
         '"segment": "COM"}\n'
     )
     assert (
@@ -588,8 +589,9 @@ async def test_generate_datasource_charges_with_no_entitlement(
         '"34654563488"}, "search": {"subscription": {"criteria": '
         '"subscription.externalIds.vendor", "value": "FORG-4801-6958-2949"}, "item": '
         '{"criteria": "item.externalIds.vendor", "value": ""}}, "period": {"start": '
-        '"2025-06-01", "end": "2025-06-30"}, "price": {"unitPP": "-39.1447", "PPx1": '
-        '"-39.1447"}, "quantity": 1, "description": {"value1": "Test", "value2": ""}, '
+        '"2025-06-01", "end": "2025-06-15"}, "price": {"unitPP": "-39.1447", "PPx1": '
+        '"-39.1447"}, "quantity": 1, "description": {"value1": "Test", "value2": '
+        '"Refund due to trial period (from 01 Jun 2025 to 15 Jun 2025)"}, '
         '"segment": "COM"}\n'
     )