fix: resolve issues in alteration sum for the applicant (hl-1504 cont…

….) (#3446) * fix: expose calculated_benefit_amount for old ahjo path as well * fix: there was never a calculation object in applicant side
City-of-Helsinki · Oct 21, 2024 · 09ff6c0 · 09ff6c0
1 parent 4bbee48
commit 09ff6c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/backend/benefit/applications/api/v1/serializers/application.py b/backend/benefit/applications/api/v1/serializers/application.py
@@ -399,13 +399,16 @@ class Meta:
     calculated_benefit_amount = serializers.SerializerMethodField()
 
     def get_calculated_benefit_amount(self, obj):
-        # Check if ahjo_status is None or does not have any related objects
-        if obj.ahjo_status is None or not obj.ahjo_status.exists():
-            return None
+        if obj.handled_by_ahjo_automation:
+            # Check if ahjo_status is None or does not have any related objects
+            if obj.ahjo_status is None or not obj.ahjo_status.exists():
+                return None
 
-        latest_status = obj.ahjo_status.latest().status
+            latest_status = obj.ahjo_status.latest().status
 
-        if latest_status != AhjoStatusEnum.DETAILS_RECEIVED_FROM_AHJO:
+            if latest_status != AhjoStatusEnum.DETAILS_RECEIVED_FROM_AHJO:
+                return None
+        elif obj.batch is None:
             return None
         return obj.calculated_benefit_amount
 

diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx
@@ -105,8 +105,7 @@ const PageContent: React.FC = () => {
         key: 'status',
       },
       {
-        accessor: (app) =>
-          formatFloatToCurrency(app?.calculation?.calculatedBenefitAmount),
+        accessor: (app) => formatFloatToCurrency(app?.calculatedBenefitAmount),
         key: 'benefitAmount',
         showIf: () => showMonetaryFields,
       },