IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases 45 Wiki Activity

# 342 Fix

Browse Source 
* fixes bug where rounding error on aggregated db SUM() would occur
* simplifies code base
This commit is contained in:
mpeltriaux
2023-08-25 09:13:46 +02:00
parent 6de3fab800
commit 1c50d66551
7 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compensation/models/compensation.py
View File

@@ -199,7 +199,9 @@ class AbstractCompensation(BaseObject,
Returns:
"""
return qs.aggregate(Sum("surface"))["surface__sum"] or 0
val = qs.aggregate(Sum("surface"))["surface__sum"] or 0
val = float('{:0.2f}'.format(val))
return val
def quality_check(self) -> CompensationQualityChecker:
""" Performs data quality check

19
compensation/models/eco_account.py
View File

@@ -57,7 +57,7 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
def clean(self):
# Deductable surface can not be larger than added states after surface
after_state_sum = self.get_state_after_surface_sum()
after_state_sum = self.get_surface_after_states()
if self.deductable_surface > after_state_sum:
raise ValidationError(_("Deductable surface can not be larger than existing surfaces in after states"))
@@ -96,15 +96,9 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
Returns:
sum_surface (float)
"""
return self.deductions.all().aggregate(Sum("surface"))["surface__sum"] or 0
def get_state_after_surface_sum(self) -> float:
""" Calculates the account's after state surface sum
Returns:
sum_surface (float)
"""
return self.after_states.all().aggregate(Sum("surface"))["surface__sum"] or 0
val = self.deductions.all().aggregate(Sum("surface"))["surface__sum"] or 0
val = float('{:0.2f}'.format(val))
return val
def __calculate_deductable_rest(self):
""" Calculates available rest surface of the eco account
@@ -114,10 +108,7 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
Returns:
ret_val_total (float): Total amount
"""
deductions = self.deductions.filter(
intervention__deleted=None,
)
deductions_surfaces = deductions.aggregate(Sum("surface"))["surface__sum"] or 0
deductions_surfaces = self.get_deductions_surface()
available_surface = self.deductable_surface
if available_surface is None: