feat: add cost_report_data apis

cloudforet-io · Jan 25, 2024 · eecbd35 · eecbd35
1 parent e2c8913
commit eecbd35
Show file tree

Hide file tree

Showing 8 changed files with 350 additions and 36 deletions.
diff --git a/src/spaceone/cost_analysis/interface/task/v1/data_source_sync_scheduler.py b/src/spaceone/cost_analysis/interface/task/v1/data_source_sync_scheduler.py
@@ -67,18 +67,31 @@ def _create_cost_report_run_task(self):
                 "stages": [
                     {
                         "locator": "SERVICE",
-                        "name": "CostReportConfigService",
+                        "name": "CostReportService",
                         "metadata": {"token": self._token},
                         "method": "create_cost_report_by_cost_report_config",
                         "params": {"params": {}},
-                    }
+                    },
+                    {
+                        "locator": "SERVICE",
+                        "name": "CostReportDataService",
+                        "metadata": {"token": self._token},
+                        "method": "create_cost_report_data_by_cost_report_config",
+                        "params": {"params": {}},
+                    },
                 ],
             }
+            print(
+                f"{utils.datetime_to_iso8601(datetime.utcnow())} [INFO] [create_task] create_cost_report_by_cost_report_config => START"
+            )
             print(
                 f"{utils.datetime_to_iso8601(datetime.utcnow())} [INFO] [create_task] create_cost_report_data_by_cost_report_config => START"
             )
             return [stp]
         else:
+            print(
+                f"{utils.datetime_to_iso8601(datetime.utcnow())} [INFO] [create_task] create_cost_report_by_cost_report_config => SKIP"
+            )
             print(
                 f"{utils.datetime_to_iso8601(datetime.utcnow())} [INFO] [create_task] create_cost_report_data_by_cost_report_config => SKIP"
             )

diff --git a/src/spaceone/cost_analysis/manager/cost_report_data_manager.py b/src/spaceone/cost_analysis/manager/cost_report_data_manager.py
@@ -47,7 +47,14 @@ def filter_data_sources(self, **conditions):
     def list_cost_reports_data(self, query: dict) -> Tuple[QuerySet, int]:
         return self.cost_report_data_model.query(**query)
 
-    def analyze_cost_reports_data(self, query: dict) -> dict:
+    def analyze_cost_reports_data(
+        self, query: dict, target="SECONDARY_PREFERRED"
+    ) -> dict:
+        query["target"] = target
+        query["date_field"] = "report_month"
+        query["date_field_format"] = "%Y-%m"
+        _LOGGER.debug(f"[analyze_cost_reports_data] query: {query}")
+
         return self.cost_report_data_model.analyze(**query)
 
     def stat_cost_reports_data(self, query) -> dict:

diff --git a/src/spaceone/cost_analysis/model/cost_report_data/database.py b/src/spaceone/cost_analysis/model/cost_report_data/database.py
@@ -24,18 +24,20 @@ class CostReportData(MongoModel):
         max_length=40, default=None, null=True
     )  # todo workspace_id required
     domain_id = StringField(max_length=40)
-    created_at = DateTimeField(auto_now_add=True)
 
     meta = {
-        "updatable_fields": [
-            "created_at",
-        ],
+        "updatable_fields": [],
         "minimal_fields": [
             "cost_report_config_id",
             "cost_report_data_id",
             "data_source_id",
             "workspace_id",
         ],
         "ordering": ["is_confirmed"],
-        "indexes": ["domain_id", "cost_report_data_id", "data_source_id"],
+        "indexes": [
+            "domain_id",
+            "-report_year",
+            "cost_report_data_id",
+            "data_source_id",
+        ],
     }
diff --git a/src/spaceone/cost_analysis/model/cost_report_data/request.py b/src/spaceone/cost_analysis/model/cost_report_data/request.py
@@ -25,12 +25,13 @@ class CostReportDataSearchQueryRequest(BaseModel):
 
 class CostReportDataAnalyzeQueryRequest(BaseModel):
     query: Union[dict, None] = None
-    cost_report_data_id: str
+    cost_report_data_id: Union[str, None] = None
     report_year: Union[str, None] = None
     report_month: Union[str, None] = None
     product: Union[str, None] = None
     provider: Union[str, None] = None
     data_source_id: Union[str, None] = None
+    cost_report_config_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
     domain_id: str
 

diff --git a/src/spaceone/cost_analysis/model/cost_report_data/response.py b/src/spaceone/cost_analysis/model/cost_report_data/response.py
@@ -26,12 +26,6 @@ class CostReportDataResponse(BaseModel):
     project_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
     domain_id: Union[str, None] = None
-    created_at: Union[datetime, None] = None
-
-    def dict(self, *args, **kwargs):
-        data = super().dict(*args, **kwargs)
-        data["created_at"] = utils.datetime_to_iso8601(data["created_at"])
-        return data
 
 
 class CostReportsDataResponse(BaseModel):

diff --git a/src/spaceone/cost_analysis/service/cost_report_config_service.py b/src/spaceone/cost_analysis/service/cost_report_config_service.py
@@ -8,6 +8,9 @@
     CostReportConfigManager,
 )
 from spaceone.cost_analysis.service.cost_report_serivce import CostReportService
+from spaceone.cost_analysis.service.cost_report_data_service import (
+    CostReportDataService,
+)
 from spaceone.cost_analysis.model.cost_report_config.request import *
 from spaceone.cost_analysis.model.cost_report_config.response import *
 
@@ -202,6 +205,9 @@ def run(self, params: CostReportConfigRunRequest) -> None:
         cost_report_service = CostReportService()
         cost_report_service.create_cost_report(cost_report_config_vo)
 
+        cost_report_data_service = CostReportDataService()
+        cost_report_data_service.create_cost_report_data(cost_report_config_vo)
+
     @transaction(
         permission="cost-analysis:CostReportConfig.read",
         role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER"],