Merge pull request #32 from stat-kwon/master

Add strip method to string values and change validation logic of cost and usage_quantity

Author: stat-kwon

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -36,6 +36,7 @@ def _make_cost_data(self, results):
         costs_data = []
         for result in results:
             result = self._apply_strip_to_dict_keys(result)
+            result = self._apply_strip_to_dict_values(result)
 
             if self.http_file_connector.field_mapper:
                 result = self._change_result_by_field_mapper(result)
@@ -89,6 +90,13 @@ def _apply_strip_to_dict_keys(result):
                 del result[key]
         return result
 
+    @staticmethod
+    def _apply_strip_to_dict_values(result):
+        for key, value in result.items():
+            if isinstance(value, str):
+                result[key] = value.strip()
+        return result
+
     def _change_result_by_field_mapper(self, result):
         for origin_field, actual_field in self.http_file_connector.field_mapper.items():
             if isinstance(actual_field, str):
@@ -141,17 +149,20 @@ def _convert_cost_and_usage_quantity_types(result):
             result['cost'] = float(result['cost'])
             result['usage_quantity'] = float(result.get('usage_quantity', 0))
         except Exception as e:
-            _LOGGER.debug(f'[_convert_cost_and_usage_quantity_types] convert cost and usage quantity types error: {e}',
-                          exc_info=True)
+            _LOGGER.error(
+                f'[_convert_cost_and_usage_quantity_types] convert cost and usage quantity types error: {e} (data={result})',
+                exc_info=True)
             return False
         return True
 
     @staticmethod
     def _exist_cost_and_usage_quantity(result):
-        if result['cost'] and result.get('usage_quantity'):
+        if result['cost'] or result['cost'] == float(0):
+            return True
+        elif result['usage_quantity'] or result['usage_quantity'] == float(0):
             return True
         else:
-            _LOGGER.debug(f'[_exist_cost_and_usage_quantity] cost or usage quantity are empty: {result}')
+            _LOGGER.error(f'[_exist_cost_and_usage_quantity] cost or usage quantity are empty: {result}')
             return False
 
     @staticmethod