four sprint calc bug fix

nashahzad · Dec 13, 2021 · a42705e · a42705e
1 parent 978d07b
commit a42705e
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/app/managers/report_managers.py b/app/managers/report_managers.py
@@ -37,19 +37,24 @@ def create_or_update_report(self, sprint_metrics: List[SprintMetrics]) -> None:
 
         ordered_sprint_metrics = self._chronologically_order_metrics(sprint_metrics)
         for sprint_metric in ordered_sprint_metrics:
-            four_sprint_average = self._get_four_sprint_completed_average(
-                sprint_metric.completed
-            )
-            four_sprint_capacity_achieved_avg = (
-                self._get_four_sprint_capacity_achieved_average(
-                    sprint_metric.capacity_achieved
+            if len(self.df) < 3:
+                four_sprint_average = None
+                four_sprint_capacity_achieved_avg = None
+                four_sprint_smoothed_capacity_avg = None
+            else:
+                four_sprint_average = self._get_four_sprint_completed_average(
+                    sprint_metric.completed
+                )
+                four_sprint_capacity_achieved_avg = (
+                    self._get_four_sprint_capacity_achieved_average(
+                        sprint_metric.capacity_achieved
+                    )
                 )
-            )
-            four_sprint_smoothed_capacity_avg = (
-                self._get_four_sprint_smoothed_capacity_achieved_average(
-                    sprint_metric.completed, sprint_metric.planned_capacity
+                four_sprint_smoothed_capacity_avg = (
+                    self._get_four_sprint_smoothed_capacity_achieved_average(
+                        sprint_metric.completed, sprint_metric.planned_capacity
+                    )
                 )
-            )
             row = {
                 "Sprint": sprint_metric.sprint_name,
                 "Commitment": sprint_metric.commitment,
@@ -102,10 +107,7 @@ def _format_float_as_percent(self, value: float) -> str:
 
     def _get_four_sprint_smoothed_capacity_achieved_average(
         self, completed: int, planned_capacity: float
-    ) -> Optional[str]:
-        if len(self.df) < 4:
-            return None
-
+    ) -> str:
         completed_sum = self.df.Completed.iloc[-3:].sum() + completed
         planned_capacity_sum = (
             self.df["Planned Capacity"].iloc[-3:].sum() + planned_capacity
@@ -116,19 +118,13 @@ def _get_four_sprint_smoothed_capacity_achieved_average(
 
     def _get_four_sprint_capacity_achieved_average(
         self, capacity_achieved: float
-    ) -> Optional[str]:
-        if len(self.df) < 4:
-            return None
-
+    ) -> str:
         values = [float(ca[:-1]) for ca in self.df["Capacity Achieved"].iloc[-3:]]
         average = (sum(values) + capacity_achieved * 100) / 4 / 100
         formatted_average = self._format_float_as_percent(average)
         return formatted_average
 
-    def _get_four_sprint_completed_average(self, completed: int) -> Optional[str]:
-        if len(self.df) < 4:
-            return None
-
+    def _get_four_sprint_completed_average(self, completed: int) -> str:
         average = (self.df.Completed.iloc[-3:].sum() + completed) / 4
         return average