Merge pull request #194 from ImMin5/feature-cost-report

Modify delete cost_reports_data location

Author: ImMin5

src/spaceone/cost_analysis/service/cost_report_data_service.py

@@ -132,10 +132,6 @@ def create_cost_report_data(self, cost_report_vo: CostReport):
         workspace_name = self._get_workspace_name(domain_id, workspace_id)
         is_confirmed = True if cost_report_vo.status == "SUCCESS" else False
 
-        self._delete_old_is_confirmed_cost_report_data(
-            domain_id, cost_report_config_id, report_month, is_confirmed
-        )
-
         cost_report_config_vo = cost_report_config_mgr.get_cost_report_config(
             domain_id=domain_id, cost_report_config_id=cost_report_config_id
         )
@@ -293,25 +289,6 @@ def _get_service_account_name_map(self, workspace_id: str, domain_id: str) -> di
             ] = service_account["name"]
         return service_account_name_map
 
-    def _delete_old_is_confirmed_cost_report_data(
-        self,
-        domain_id: str,
-        cost_report_config_id,
-        report_month: str,
-        is_confirmed: bool,
-    ):
-        if is_confirmed:
-            cost_report_data_vos = self.cost_report_data_mgr.filter_cost_reports_data(
-                domain_id=domain_id,
-                cost_report_config_id=cost_report_config_id,
-                report_month=report_month,
-                is_confirmed=is_confirmed,
-            )
-            _LOGGER.debug(
-                f"[delete_cost_report_data] delete is_confirmed cost report data ({cost_report_config_id, report_month}) {cost_report_data_vos.count()}"
-            )
-            cost_report_data_vos.delete()
-
     @staticmethod
     def _get_data_source_currency_map(
         data_source_filter: dict, workspace_id: str, domain_id: str

src/spaceone/cost_analysis/service/cost_report_serivce.py

@@ -18,6 +18,9 @@
 )
 from spaceone.cost_analysis.manager.cost_manager import CostManager
 from spaceone.cost_analysis.manager.cost_report_manager import CostReportManager
+from spaceone.cost_analysis.manager.cost_report_data_manager import (
+    CostReportDataManager,
+)
 from spaceone.cost_analysis.manager.currency_manager import CurrencyManager
 from spaceone.cost_analysis.manager.data_source_manager import DataSourceManager
 from spaceone.cost_analysis.manager.email_manager import EmailManager
@@ -41,6 +44,7 @@ def __init__(self, *args, **kwargs):
         self.cost_mgr = CostManager()
         self.cost_report_config_mgr = CostReportConfigManager()
         self.cost_report_mgr = CostReportManager()
+        self.cost_report_data_mgr = CostReportDataManager()
         self.currency_map: Union[dict, None] = None
         self.currency_date: Union[str, None] = None
 
@@ -247,10 +251,13 @@ def _aggregate_monthly_cost_report(
     ) -> None:
         report_year = report_month.split("-")[0]
 
-        # delete old cost_reports
+        # delete old cost_reports and cost_reports_data
         self._delete_old_cost_reports(
             report_month, domain_id, cost_report_config_id, status
         )
+        self._delete_old_is_confirmed_cost_report_data(
+            domain_id, cost_report_config_id, report_month, status
+        )
 
         # collect enabled data sources
         query = {
@@ -353,6 +360,25 @@ def _delete_old_cost_reports(
         )
         cost_reports_vos.delete()
 
+    def _delete_old_is_confirmed_cost_report_data(
+        self,
+        domain_id: str,
+        cost_report_config_id,
+        report_month: str,
+        status: str,
+    ):
+        if status == "SUCCESS":
+            cost_report_data_vos = self.cost_report_data_mgr.filter_cost_reports_data(
+                domain_id=domain_id,
+                cost_report_config_id=cost_report_config_id,
+                report_month=report_month,
+                is_confirmed=True,
+            )
+            _LOGGER.debug(
+                f"[delete_cost_report_data] delete is_confirmed cost report data ({cost_report_config_id, report_month}) {cost_report_data_vos.count()}"
+            )
+            cost_report_data_vos.delete()
+
     def send_cost_report(self, cost_report_vo: CostReport) -> None:
         domain_id = cost_report_vo.domain_id
         workspace_id = cost_report_vo.workspace_id