Merge pull request #136 from whdalsrnt/master

refactor: change db indexes
cloudforet-io · Jan 6, 2024 · 55fcc20 · 55fcc20
2 parents 9b0d466 + 9163a0d
commit 55fcc20
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/spaceone/cost_analysis/model/budget_model.py b/src/spaceone/cost_analysis/model/budget_model.py
@@ -71,8 +71,9 @@ class Budget(MongoModel):
         "ordering": ["name"],
         "indexes": [
             "name",
-            "project_id",
             "data_source_id",
+            "project_id",
+            "workspace_id",
             "domain_id",
         ],
     }
diff --git a/src/spaceone/cost_analysis/model/cost_model.py b/src/spaceone/cost_analysis/model/cost_model.py
@@ -61,13 +61,14 @@ class Cost(MongoModel):
                     "domain_id",
                     "data_source_id",
                     "-billed_date",
+                    "workspace_id",
                     "project_id",
                     "cost",
                 ],
                 "name": "COMPOUND_INDEX_FOR_SEARCH",
             },
             {
-                "fields": ["domain_id", "cost_id", "project_id"],
+                "fields": ["domain_id", "cost_id", "workspace_id", "project_id"],
                 "name": "COMPOUND_INDEX_FOR_DELETE",
             },
         ],
@@ -109,6 +110,7 @@ class MonthlyCost(MongoModel):
                     "domain_id",
                     "data_source_id",
                     "-billed_month",
+                    "workspace_id",
                     "project_id",
                     "cost",
                 ],
@@ -119,6 +121,7 @@ class MonthlyCost(MongoModel):
                     "domain_id",
                     "data_source_id",
                     "-billed_year",
+                    "workspace_id",
                     "project_id",
                     "cost",
                 ],

diff --git a/src/spaceone/cost_analysis/model/cost_query_set_model.py b/src/spaceone/cost_analysis/model/cost_query_set_model.py
@@ -25,5 +25,5 @@ class CostQuerySet(MongoModel):
             "workspace_id",
         ],
         "ordering": ["name"],
-        "indexes": ["name", "user_id", "data_source_id", "domain_id"],
+        "indexes": ["name", "user_id", "data_source_id", "workspace_id", "domain_id"],
     }
diff --git a/src/spaceone/cost_analysis/model/data_source_model.py b/src/spaceone/cost_analysis/model/data_source_model.py
@@ -81,5 +81,5 @@ class DataSource(MongoModel):
             "provider",
         ],
         "ordering": ["name"],
-        "indexes": ["name", "state", "data_source_type", "provider", "domain_id"],
+        "indexes": ["state", "data_source_type", "provider", "workspace_id", "domain_id"],
     }
diff --git a/src/spaceone/cost_analysis/model/data_source_rule_model.py b/src/spaceone/cost_analysis/model/data_source_rule_model.py
@@ -57,6 +57,7 @@ class DataSourceRule(MongoModel):
             "order",
             "conditions_policy",
             "data_source_id",
+            "workspace_id",
             "domain_id",
         ],
     }