Fix depreciation multiplier not showing full decimals

City-of-Helsinki · Aug 30, 2024 · 22925c8 · 22925c8
1 parent 9dbb453
commit 22925c8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/backend/hitas/calculations/max_prices/rules_pre_2011.py b/backend/hitas/calculations/max_prices/rules_pre_2011.py
@@ -171,7 +171,7 @@ def calculate_construction_price_index_max_price(
                 completion_date_index=apartment.completion_date_cpi,
                 calculation_date=calculation_date,
                 calculation_date_index=apartment.calculation_date_cpi,
-                depreciation_multiplier=depreciation_multiplier_for_apartment,
+                depreciation_multiplier=str(depreciation_multiplier_for_apartment),
             ),
         )
 

diff --git a/backend/hitas/calculations/max_prices/types.py b/backend/hitas/calculations/max_prices/types.py
@@ -56,7 +56,7 @@ class CalculationVarsConstructionPriceIndexBefore2011(CommonCalculationVars):
         additional_work_during_construction: Decimal
         index_adjusted_additional_work_during_construction: Decimal
         apartment_improvements: MaxPriceImprovements
-        depreciation_multiplier: Decimal
+        depreciation_multiplier: str
 
     @dataclass
     class CalculationVarsMarketPriceIndexBefore2011(CommonCalculationVars):

diff --git a/backend/hitas/tests/apis/apartment_max_price/test_api_apartment_max_price_calc_examples.py b/backend/hitas/tests/apis/apartment_max_price/test_api_apartment_max_price_calc_examples.py
@@ -646,7 +646,7 @@ def test__api__apartment_max_price__market_price_index__pre_2011(api_client: Hit
             "completion_date_index": 244.9,
             "calculation_date": "2022-09-07",
             "calculation_date_index": 364.4,
-            "depreciation_multiplier": 0.93,
+            "depreciation_multiplier": "0.9324",
         },
         "maximum_price": 181294.97,
         "valid_until": "2022-12-07",
@@ -969,7 +969,7 @@ def test__api__apartment_max_price__construction_price_index__pre_2011(api_clien
             "completion_date_index": 296.10,
             "calculation_date": "2022-11-21",
             "calculation_date_index": 364.6,
-            "depreciation_multiplier": 0.99,
+            "depreciation_multiplier": "0.9892",
         },
         "maximum_price": 235432.37,
         "valid_until": "2023-02-21",
@@ -1114,7 +1114,7 @@ def test__api__apartment_max_price__construction_price_index__pre_2011(api_clien
             "completion_date_index": 1337.0,
             "calculation_date": "2022-11-21",
             "calculation_date_index": 364.6,
-            "depreciation_multiplier": 0.99,
+            "depreciation_multiplier": "0.9892",
         },
         "maximum_price": 66203.58,
         "valid_until": "2023-02-21",
@@ -1198,7 +1198,7 @@ def test__api__apartment_max_price__pre_2011__no_improvements(api_client: HitasA
             "completion_date_index": 100.0,
             "calculation_date": "2003-06-01",
             "calculation_date_index": 200.0,
-            "depreciation_multiplier": 1.0,
+            "depreciation_multiplier": "1",
         },
         "maximum_price": 200000.0,
         "valid_until": "2003-09-01",

diff --git a/backend/openapi.yaml b/backend/openapi.yaml
@@ -6791,10 +6791,8 @@ components:
           example: 146.4
         depreciation_multiplier:
           description: Depreciation multiplier for the apartment
-          type: number
-          minimum: 0
-          maximum: 1
-          example: 0.9
+          type: string
+          example: '0.9999'
 
     ApartmentMaximumPriceImprovements2011Onwards:
       description: Improvement information used in the calculation

diff --git a/frontend/src/common/schemas/apartment.ts b/frontend/src/common/schemas/apartment.ts
@@ -188,7 +188,7 @@ const IndexCalculationConstructionPriceIndexBefore2011Schema = IndexCalculationS
                 interest_during_construction: number(),
                 interest_during_construction_percentage: number(),
                 housing_company_acquisition_price: number(),
-                depreciation_multiplier: number(),
+                depreciation_multiplier: string(),
                 housing_company_assets: number(),
                 apartment_share_of_housing_company_assets: number(),
                 additional_work_during_construction: number(),

diff --git a/frontend/src/features/apartment/components/ApartmentMaximumPriceBreakdownModal.tsx b/frontend/src/features/apartment/components/ApartmentMaximumPriceBreakdownModal.tsx
@@ -241,11 +241,10 @@ const ConstructionPricePre2011Breakdown = ({
                 label="Yhtiön tarkistettu hankinta-arvo"
                 value={calculation.calculation_variables.housing_company_acquisition_price}
             />
-            <BreakdownValue
-                label="Poistokerroin"
-                value={calculation.calculation_variables.depreciation_multiplier}
-                unit=""
-            />
+            <div className="confirmation-modal__breakdown-row">
+                <label>Poistokerroin</label>
+                <p>{calculation.calculation_variables.depreciation_multiplier?.replace(".", ",")}</p>
+            </div>
             <BreakdownValue
                 label="+ Kiinteistön parannukset"
                 value={calculation.calculation_variables.housing_company_improvements.summary.value_for_apartment}