CM-210: addres review comments

openimis · Jul 20, 2023 · dc648d7 · dc648d7
1 parent 33427d3
commit dc648d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/calcrule_social_protection/converters/string_to_python_values.py b/calcrule_social_protection/converters/string_to_python_values.py
diff --git a/calcrule_social_protection/strategies/benefit_package_base_strategy.py b/calcrule_social_protection/strategies/benefit_package_base_strategy.py
@@ -1,5 +1,5 @@
-from calcrule_social_protection.converters.string_to_python_values import convert_to_python_value
 from core.models import User
+from core.utils import convert_to_python_value
 from invoice.services import BillService
 from social_protection.models import BeneficiaryStatus
 
@@ -24,15 +24,15 @@ def calculate(cls, calculation, payment_plan, **kwargs):
             calculation.get_payment_cycle_parameters(**kwargs)
         user = User.objects.filter(i_user__id=audit_user_id).first()
 
-        #  ticket - at this stage use fixed amount, also skip ceiling part
+        #  :TODO ticket - at this stage use fixed amount, also skip ceiling part
         payment = payment_plan_parameters['calculation_rule']['fixed_batch']
         advanced_filters_criteria = payment_plan_parameters['advanced_criteria']
         for beneficiary in beneficiares:
             for criterion in advanced_filters_criteria:
                 condition = criterion['custom_filter_condition']
-                calculated_amount = criterion['amount']
+                calculated_amount = float(criterion['amount'])
                 does_amount_apply_for_limitations = criterion['count_to_max']
-                if cls._does_beneficiary_meet_advanced_filter_condition(beneficiary, condition):
+                if cls._does_beneficiary_meet_condition(beneficiary, condition):
                     if does_amount_apply_for_limitations:
                         # TODO: ceiling part
                         continue
@@ -51,7 +51,7 @@ def calculate(cls, calculation, payment_plan, **kwargs):
         return "Calculation and transformation into bills completed successfully."
 
     @classmethod
-    def _does_beneficiary_meet_advanced_filter_condition(cls, beneficiary, condition):
+    def _does_beneficiary_meet_condition(cls, beneficiary, condition):
         condition_key, condition_value = condition.split("=")
         json_key, lookup = condition_key.split('__')[0:2]
         parsed_condition_value = convert_to_python_value(condition_value)