Merge pull request #179 from yjinjo/master

Add exchange currency function

Author: yjinjo

src/spaceone/cost_analysis/connector/currency_connector.py

@@ -9,7 +9,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-EXCHANGE_CURRENCY_LIST = ["KRW", "USD", "JPY"]
+FROM_EXCHANGE_CURRENCIES = ["KRW", "USD", "JPY"]
 
 
 class CurrencyConnector(BaseConnector):
@@ -18,34 +18,26 @@ def __init__(self, *args, **kwargs):
         self.today = datetime.utcnow()
         self.today_date = self.today.strftime("%Y-%m-%d")
         self.two_weeks_ago = (self.today - timedelta(days=14)).strftime("%Y-%m-%d")
+        self.currency_date = None
 
-    def add_exchange_rate(self, aggregated_cost_report: dict) -> dict:
-        current_currency_dict = aggregated_cost_report.get("cost")
-        cost = {}
+    def add_currency_map_date(self, to_currency: str) -> tuple[dict, str]:
+        currency_map = {}
+        _currency_date = ""
 
-        for current_currency, current_cost in current_currency_dict.items():
-            exchange_rate_cost = self._calculate_exchange_rate(
-                current_currency, current_cost
-            )
-            cost.update({current_currency: exchange_rate_cost})
-
-        aggregated_cost_report.update({"cost": cost})
-        return aggregated_cost_report
-
-    def _calculate_exchange_rate(self, from_currency: str, amount: float) -> float:
-        exchange_rates = {}
-
-        for to_currency in EXCHANGE_CURRENCY_LIST:
+        for from_currency in FROM_EXCHANGE_CURRENCIES:
             if from_currency == to_currency:
                 exchange_rate = 1.0
             else:
-                pair = f"{from_currency}/{to_currency}"
-                exchange_rate_info = fdr.DataReader(
-                    pair, self.two_weeks_ago, self.today_date
-                )["Close"].dropna()
-                exchange_rate = exchange_rate_info.iloc[-1]
-
-            exchange_rates[to_currency] = exchange_rate
-
-        exchange_rate_cost = amount * exchange_rates[from_currency]
-        return exchange_rate_cost
+                pair = f"{to_currency}/{from_currency}"
+                exchange_rate_info = (
+                    fdr.DataReader(pair, self.two_weeks_ago, self.today_date)
+                    .dropna()
+                    .reset_index()[["Date", "Close"]]
+                )
+                _currency_date, exchange_rate = exchange_rate_info.iloc[-1]
+            currency_map[from_currency] = exchange_rate
+
+        if self.currency_date is None:
+            self.currency_date = _currency_date
+
+        return currency_map, self.currency_date

src/spaceone/cost_analysis/manager/cost_report_manager.py

@@ -45,3 +45,20 @@ def list_cost_reports(self, query: dict) -> Tuple[QuerySet, int]:
 
     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
+
+        return cost
+
+    @staticmethod
+    def get_currency_date(currency_date: str) -> str:
+        currency_date = str(currency_date).split()[0]
+
+        return currency_date

src/spaceone/cost_analysis/manager/currency_manager.py

@@ -10,6 +10,11 @@ class CurrencyManager(BaseManager):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.currency_connector: CurrencyConnector = CurrencyConnector()
+        self.currency_mapper = {}
 
-    def convert_exchange_rate(self, aggregated_cost_report: dict) -> dict:
-        return self.currency_connector.add_exchange_rate(aggregated_cost_report)
+    def get_currency_map_date(self, to_currency: str) -> tuple[dict, str]:
+        currency_map, currency_date = self.currency_connector.add_currency_map_date(
+            to_currency
+        )
+
+        return currency_map, currency_date

src/spaceone/cost_analysis/service/cost_report_config_service.py

@@ -7,6 +7,7 @@
 from spaceone.cost_analysis.manager.cost_report_config_manager import (
     CostReportConfigManager,
 )
+from spaceone.cost_analysis.manager.currency_manager import CurrencyManager
 from spaceone.cost_analysis.service.cost_report_serivce import CostReportService
 from spaceone.cost_analysis.service.cost_report_data_service import (
     CostReportDataService,
@@ -205,11 +206,22 @@ def delete(self, params: CostReportConfigDeleteRequest) -> None:
     def run(self, params: CostReportConfigRunRequest) -> None:
         """RUN cost report config"""
 
-        # todo : apply currency manager
         cost_report_config_vo = self.cost_report_mgr.get_cost_report_config(
             params.domain_id, params.cost_report_config_id
         )
+
+        currency_mgr = CurrencyManager()
+
+        (
+            currency_map,
+            currency_date,
+        ) = currency_mgr.get_currency_map_date(cost_report_config_vo.currency)
+
         cost_report_service = CostReportService()
+
+        cost_report_service.currency_map = currency_map
+        cost_report_service.currency_date = currency_date
+
         cost_report_service.create_cost_report(cost_report_config_vo)
 
     @transaction(

src/spaceone/cost_analysis/service/cost_report_data_service.py

@@ -11,6 +11,7 @@
 from spaceone.cost_analysis.manager.cost_report_config_manager import (
     CostReportConfigManager,
 )
+from spaceone.cost_analysis.manager.cost_report_manager import CostReportManager
 from spaceone.cost_analysis.manager.currency_manager import CurrencyManager
 from spaceone.cost_analysis.manager.data_source_manager import DataSourceManager
 from spaceone.cost_analysis.manager.identity_manager import IdentityManager
@@ -32,6 +33,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.cost_mgr = CostManager()
         self.cost_report_data_mgr = CostReportDataManager()
+        self.currency_map: Union[dict, None] = None
+        self.currency_date: Union[str, None] = None
 
     @transaction(
         permission="cost-analysis:CostReportData.read",
@@ -238,9 +241,14 @@ 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"] = currency_mgr.convert_exchange_rate(
-                aggregated_cost_report_data
-            ).get("cost")
+            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

@@ -43,14 +43,23 @@ def __init__(self, *args, **kwargs):
         self.cost_mgr = CostManager()
         self.cost_report_config_mgr = CostReportConfigManager()
         self.cost_report_mgr = CostReportManager()
+        self.currency_map: Union[dict, None] = None
+        self.currency_date: Union[str, None] = None
 
     @transaction(exclude=["authentication", "authorization", "mutation"])
     def create_cost_report_by_cost_report_config(self, params: dict):
         """Create cost report by cost report config"""
 
-        # todo: apply currency_manager
-
+        currency_mgr = CurrencyManager()
         for cost_report_config_vo in self._get_all_cost_report_configs():
+            (
+                currency_map,
+                currency_date,
+            ) = currency_mgr.get_currency_map_date(cost_report_config_vo.currency)
+
+            self.currency_map = currency_map
+            self.currency_date = currency_date
+
             self.create_cost_report(cost_report_config_vo)
 
     def send_cost_report_by_cost_report_config(self, params: dict):
@@ -302,15 +311,21 @@ def _aggregate_monthly_cost_report(
 
         aggregated_cost_report_results = self._aggregate_result_by_currency(results)
 
-        currency_mgr = CurrencyManager()
         for aggregated_cost_report in aggregated_cost_report_results:
-            aggregated_cost_report = currency_mgr.convert_exchange_rate(
-                aggregated_cost_report
+            aggregated_cost_report["cost"] = CostReportManager.get_exchange_currency(
+                aggregated_cost_report["cost"], self.currency_map
             )
+
+            aggregated_cost_report[
+                "currency_date"
+            ] = CostReportManager.get_currency_date(self.currency_date)
+
             cost_report_vo = self.cost_report_mgr.create_cost_report(
                 aggregated_cost_report
             )
             cost_report_data_svc = CostReportDataService()
+            cost_report_data_svc.currency_map = self.currency_map
+            cost_report_data_svc.currency_date = self.currency_date
             cost_report_data_svc.create_cost_report_data(cost_report_vo)
 
         _LOGGER.debug(