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

Modify calculate cost with currency when create cost_report and data

Author: ImMin5

src/spaceone/cost_analysis/interface/task/v1/data_source_sync_scheduler.py

@@ -59,7 +59,7 @@ def _create_data_source_sync_task(self):
             return []
 
     def _create_cost_report_run_task(self):
-        if datetime.utcnow().hour == self._data_source_sync_hour - 1:
+        if datetime.utcnow().hour == 0:
             stp = {
                 "name": "cost_report_data_sync_schedule",
                 "version": "v1",

src/spaceone/cost_analysis/manager/cost_report_manager.py

@@ -47,15 +47,19 @@ def stat_cost_reports(self, query: dict) -> dict:
         return self.cost_report_model.stat(**query)
 
     @staticmethod
-    def get_exchange_currency(cost_info: dict, currency_map: dict) -> dict:
-        from_currency = next(iter(cost_info.keys()))
-        from_cost = cost_info.get(from_currency)
-
-        cost = {}
-        for currency, ratio_cost in currency_map.items():
-            cost[currency] = from_cost * ratio_cost
+    def get_exchange_currency(cost: float, currency: str, currency_map: dict) -> dict:
+        cost_info = {}
+        for convert_currency in currency_map.keys():
+            cost_info.update(
+                {
+                    convert_currency: currency_map[currency][
+                        f"{currency}/{convert_currency}"
+                    ]
+                    * cost
+                }
+            )
 
-        return cost
+        return cost_info
 
     @staticmethod
     def get_currency_date(currency_date: str) -> str:

src/spaceone/cost_analysis/service/cost_report_data_service.py

@@ -208,12 +208,16 @@ def _aggregate_monthly_cost_report_data(
 
         results = response.get("results", [])
         for aggregated_cost_report_data in results:
+            ag_cost = aggregated_cost_report_data.pop("cost", 0.0)
             ag_cost_report_currency = data_source_currency_map.get(
                 aggregated_cost_report_data.get("data_source_id")
             )
-            aggregated_cost_report_data["cost"] = {
-                ag_cost_report_currency: aggregated_cost_report_data.pop("cost", 0.0)
-            }
+
+            aggregated_cost_report_data[
+                "cost"
+            ] = CostReportManager.get_exchange_currency(
+                ag_cost, ag_cost_report_currency, self.currency_map
+            )
             aggregated_cost_report_data["currency"] = currency
             aggregated_cost_report_data["issue_date"] = issue_date
             aggregated_cost_report_data["report_month"] = report_month
@@ -235,15 +239,6 @@ def _aggregate_monthly_cost_report_data(
             aggregated_cost_report_data["domain_id"] = domain_id
             aggregated_cost_report_data["is_confirmed"] = is_confirmed
 
-            aggregated_cost_report_data[
-                "cost"
-            ] = CostReportManager.get_exchange_currency(
-                aggregated_cost_report_data["cost"], self.currency_map
-            )
-            aggregated_cost_report_data[
-                "currency_date"
-            ] = CostReportManager.get_currency_date(self.currency_date)
-
             self.cost_report_data_mgr.create_cost_report_data(
                 aggregated_cost_report_data
             )

src/spaceone/cost_analysis/service/cost_report_serivce.py

@@ -272,17 +272,16 @@ def _aggregate_monthly_cost_report(
         response = self.cost_mgr.analyze_monthly_costs(query, domain_id)
         results = response.get("results", [])
         for aggregated_cost_report in results:
+            ag_cost = aggregated_cost_report.pop("cost", 0.0)
             ag_cost_report_currency = data_source_currency_map.get(
                 aggregated_cost_report.pop("data_source_id")
             )
-            aggregated_cost_report["cost"] = {
-                ag_cost_report_currency: aggregated_cost_report.pop("cost")
-            }
+
+            aggregated_cost_report["cost"] = CostReportManager.get_exchange_currency(
+                ag_cost, ag_cost_report_currency, self.currency_map
+            )
             aggregated_cost_report["status"] = status
             aggregated_cost_report["currency"] = currency
-            aggregated_cost_report["report_number"] = self.generate_report_number(
-                report_month, issue_day
-            )
             if issue_month:
                 aggregated_cost_report["issue_date"] = f"{issue_month}-{issue_day}"
             aggregated_cost_report["report_month"] = report_month
@@ -302,9 +301,15 @@ def _aggregate_monthly_cost_report(
         cost_report_data_svc.currency_map = self.currency_map
         cost_report_data_svc.currency_date = self.currency_date
 
-        for aggregated_cost_report in aggregated_cost_report_results:
-            aggregated_cost_report["cost"] = CostReportManager.get_exchange_currency(
-                aggregated_cost_report["cost"], self.currency_map
+        start_cost_report_number = self.get_start_cost_report_number(
+            domain_id, report_month, issue_day
+        )
+
+        for cost_report_idx, aggregated_cost_report in enumerate(
+            aggregated_cost_report_results, start=start_cost_report_number
+        ):
+            aggregated_cost_report["report_number"] = self.generate_report_number(
+                report_month, issue_day, cost_report_idx
             )
 
             aggregated_cost_report[
@@ -383,6 +388,41 @@ def send_cost_report(self, cost_report_vo: CostReport) -> None:
             f"[send_cost_report] send cost report ({workspace_id}/{cost_report_vo.cost_report_id}) to {len(users_info)} users"
         )
 
+    def get_email_verified_workspace_owner_users(
+        self, domain_id: str, workspace_id: str, role_types: list = None
+    ) -> list:
+        identity_mgr: IdentityManager = self.locator.get_manager("IdentityManager")
+
+        if "WORKSPACE_OWNER" not in role_types:
+            return []
+
+        # list users in workspace
+        users_info = identity_mgr.list_workspace_users(
+            params={
+                "workspace_id": workspace_id,
+                "state": "ENABLED",
+                "role_type": "WORKSPACE_OWNER",
+                "query": {
+                    "filter": [
+                        {"k": "email_verified", "v": True, "o": "eq"},
+                    ]
+                },
+            },
+            domain_id=domain_id,
+        ).get("results", [])
+
+        return users_info
+
+    def get_start_cost_report_number(
+        self, domain_id: str, report_month: str, issue_day: int
+    ) -> int:
+        return (
+            self.cost_report_mgr.filter_cost_reports(
+                domain_id=domain_id, issue_date=f"{report_month}-{issue_day}"
+            ).count()
+            + 1
+        )
+
     def _get_workspace_name_map(self, domain_id: str) -> Tuple[dict, list]:
         identity_mgr: IdentityManager = self.locator.get_manager("IdentityManager")
         workspace_name_map = {}
@@ -437,31 +477,6 @@ def _get_temporary_sso_access_token(self, domain_id: str, workspace_id: str) ->
         }
         return identity_mgr.grant_token(params)
 
-    def get_email_verified_workspace_owner_users(
-        self, domain_id: str, workspace_id: str, role_types: list = None
-    ) -> list:
-        identity_mgr: IdentityManager = self.locator.get_manager("IdentityManager")
-
-        if "WORKSPACE_OWNER" not in role_types:
-            return []
-
-        # list users in workspace
-        users_info = identity_mgr.list_workspace_users(
-            params={
-                "workspace_id": workspace_id,
-                "state": "ENABLED",
-                "role_type": "WORKSPACE_OWNER",
-                "query": {
-                    "filter": [
-                        {"k": "email_verified", "v": True, "o": "eq"},
-                    ]
-                },
-            },
-            domain_id=domain_id,
-        ).get("results", [])
-
-        return users_info
-
     @staticmethod
     def _get_current_and_last_month() -> Tuple[str, str]:
         current_month = datetime.utcnow().strftime("%Y-%m")
@@ -482,11 +497,13 @@ def _get_issue_day(is_last_day: bool, issue_day: int) -> int:
             return min(issue_day, last_day)
 
     @staticmethod
-    def generate_report_number(report_month: str, issue_day: int) -> str:
+    def generate_report_number(
+        report_month: str, issue_day: int, cost_report_idx: int
+    ) -> str:
         report_date = f"{report_month}-{issue_day}"
         date_object = datetime.strptime(report_date, "%Y-%m-%d")
 
-        return f"CostReport_{date_object.strftime('%y%m%d%H%M')}"
+        return f"CostReport_{date_object.strftime('%y%m%d')}{str(cost_report_idx).zfill(4)}"
 
     @staticmethod
     def _get_data_source_currency_map(