Merge pull request #291 from whdalsrnt/master

Refactor Job Process
cloudforet-io · Sep 30, 2024 · 0505b49 · 0505b49
2 parents 002fa1b + ed78413
commit 0505b49
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/spaceone/cost_analysis/service/job_service.py b/src/spaceone/cost_analysis/service/job_service.py
@@ -291,6 +291,16 @@ def get_cost_data(self, params):
                         )
 
                 if not is_canceled:
+                    self._aggregate_cost_data_with_job_task_id(
+                        data_source_id,
+                        domain_id,
+                        job_id,
+                        job_task_id,
+                        data_keys,
+                        additional_info_keys,
+                        tag_keys,
+                    )
+
                     end_dt = datetime.utcnow()
                     _LOGGER.debug(f"[get_cost_data] end job ({job_task_id}): {count}")
                     _LOGGER.debug(
@@ -305,16 +315,6 @@ def get_cost_data(self, params):
             except Exception as e:
                 self.job_task_mgr.change_error_status(job_task_vo, e, secret_type)
 
-        self._aggregate_cost_data_with_job_task_id(
-            data_source_id,
-            domain_id,
-            job_id,
-            job_task_id,
-            data_source_vo.cost_data_keys,
-            data_source_vo.cost_additional_info_keys,
-            data_source_vo.cost_tag_keys,
-        )
-
         self._close_job(
             job_id,
             data_source_id,