fix pylint issues

Author: wschoonveld

decoimpact/business/entities/rules/time_aggregation_rule.py

@@ -69,6 +69,20 @@ def validate(self, logger: ILogger) -> bool:
         """
         return self.settings.validate(self.name, logger)
 
+    def filter_years(
+        self, time_dim_name: str, value_array: _xr.DataArray
+    ) -> _xr.DataArray:
+        """Filters the values for the specified start and end year
+
+        Args:
+            value_array (DataArray): value to filter
+        """
+        start = str(self._start_year) if self._start_year is not None else None
+        end = str(self._end_year) if self._end_year is not None else None
+        slice_obj = slice(start, end)
+        # filtered_array = value_array.sel({time_dim_name: slice_obj})
+        return value_array.sel({time_dim_name: slice_obj})
+
     def execute(self, value_array: _xr.DataArray, logger: ILogger) -> _xr.DataArray:
         """Aggregates the values for the specified start and end date
 
@@ -99,11 +113,8 @@ def execute(self, value_array: _xr.DataArray, logger: ILogger) -> _xr.DataArray:
 
         # perform aggregations in case of multi-year monthly average
         if TimeOperationType.MULTI_YEAR_MONTHLY_AVERAGE == settings.operation_type:
-            start = str(self._start_year) if self._start_year is not None else None
-            end = str(self._end_year) if self._end_year is not None else None
-            slice_obj = slice(start, end)
-            value_array = value_array.sel({time_dim_name: slice_obj})
-            grouped_values = value_array.groupby(f"{time_dim_name}.month")
+            filtered_values = self.filter_years(time_dim_name, value_array)
+            grouped_values = filtered_values.groupby(f"{time_dim_name}.month")
             result = self._perform_grouping_operation(
                 grouped_values, settings.operation_type
             )

decoimpact/data/entities/time_aggregation_rule_data.py

@@ -25,27 +25,29 @@ class TimeAggregationRuleData(TimeOperationRuleData, ITimeAggregationRuleData):
     def __init__(
         self,
         name: str,
-        operation: TimeOperationType,
         input_variable: str,
+        operation: TimeOperationType,
         start_year: Optional[int] = None,
         end_year: Optional[int] = None,
     ):
         super().__init__(name, operation)
+        self._name = name
+        self._operation = operation
         self._input_variable = input_variable
         self._start_year = start_year
         self._end_year = end_year
 
-    @property
-    def input_variable(self) -> str:
-        """Name of the input variable"""
-        return self._input_variable
+    # @property
+    # def input_variable(self) -> str:
+    #     """Name of the input variable"""
+    #     return self._input_variable
 
-    @property
-    def start_year(self) -> Optional[int]:
-        """Start year for aggregation"""
-        return self._start_year
+    # @property
+    # def start_year(self) -> Optional[int]:
+    #     """Start year for aggregation"""
+    #     return self._start_year
 
-    @property
-    def end_year(self) -> Optional[int]:
-        """End year for aggregation"""
-        return self._end_year
+    # @property
+    # def end_year(self) -> Optional[int]:
+    #     """End year for aggregation"""
+    #     return self._end_year