test: add aggregated dataset to testing ldm

risk: nonprod

Author: fiedlr

gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/logical_model/dataset/dataset.py

@@ -42,6 +42,7 @@ class CatalogDeclarativeDataset(Base):
     attributes: Optional[list[CatalogDeclarativeAttribute]] = None
     facts: Optional[list[CatalogDeclarativeFact]] = None
     aggregated_facts: Optional[list[CatalogDeclarativeAggregatedFact]] = None
+    precedence: Optional[int] = None
     data_source_table_id: Optional[CatalogDataSourceTableIdentifier] = None
     sql: Optional[CatalogDeclarativeDatasetSql] = None
     tags: Optional[list[str]] = None

gooddata-sdk/gooddata_sdk/catalog/workspace/entity_model/content_objects/dataset.py

@@ -145,6 +145,13 @@ def generate_facts_from_api(self) -> list[CatalogFact]:
         default=attr.Factory(lambda self: self.generate_facts_from_api(), takes_self=True),
     )
 
+    aggregated_facts: Optional[list[CatalogAggregatedFact]] = attr.field(
+        default=attr.Factory(lambda self: self.json_api_attributes.get("aggregatedFacts"), takes_self=True),
+    )
+    precedence: Optional[int] = attr.field(
+        default=attr.Factory(lambda self: self.json_api_attributes.get("precedence"), takes_self=True)
+    )
+
     grain: Optional[list] = attr.field(
         default=attr.Factory(lambda self: self.json_api_attributes.get("grain"), takes_self=True)
     )

gooddata-sdk/tests/catalog/test_catalog_workspace.py

@@ -700,8 +700,8 @@ def test_clone_workspace(test_config):
         default_cloned_decl_ws = sdk.catalog_workspace.get_declarative_workspace(default_cloned_ws_id)
         assert default_cloned_decl_ws.ldm.datasets[0].data_source_table_id.data_source_id == test_config["data_source2"]
         assert default_cloned_decl_ws.ldm.datasets[0].facts[0].source_column == "BUDGET"
-        # TODO: Add a nontrivial test for agg facts here
-        assert default_cloned_decl_ws.ldm.datasets[0].aggregated_facts == []
+        print(default_cloned_decl_ws.ldm.datasets[2])
+        assert default_cloned_decl_ws.ldm.datasets[1].aggregated_facts[0].source_column == "BUDGET"
 
         sdk.catalog_workspace.clone_workspace(
             source_ws_id, target_workspace_id=custom_cloned_ws_id, target_workspace_name=custom_cloned_ws_name
@@ -755,7 +755,7 @@ def test_translate_workspace(test_config):
                 for fact in dataset.facts:
                     if fact.id == "budget":
                         assert fact.title == "Rozpočet"
-            # TODO: Add agg facts here for descriptions?
+            # TODO: Do for aggregated facts descriptions
 
             # Run second time without translation function. Previous execution created translation file, which is used.
             sdk.catalog_workspace.generate_localized_workspaces(

gooddata-sdk/tests/catalog/test_catalog_workspace_content.py

@@ -62,8 +62,7 @@ def test_catalog_list_facts(test_config):
 def test_catalog_list_aggregated_facts(test_config):
     sdk = GoodDataSdk.create(host_=test_config["host"], token_=test_config["token"])
     agg_facts_list = sdk.catalog_workspace_content.get_aggregated_facts_catalog(test_config["workspace"])
-    # TODO: Add a non-trivial test
-    assert len(agg_facts_list) == 0
+    assert len(agg_facts_list) == 1
 
 
 @gd_vcr.use_cassette(str(_fixtures_dir / "demo_catalog_list_attributes.yaml"))
@@ -165,7 +164,7 @@ def test_load_ldm_and_modify_tables_columns_case(test_config):
     assert ldm_e.ldm.datasets[0].data_source_table_id.id == table_id.upper()
     assert ldm_e.ldm.datasets[0].attributes[0].source_column == attribute_column.upper()
     assert ldm_e.ldm.datasets[0].facts[0].source_column == fact_column.upper()
-    # TODO: Add agg facts here
+    assert ldm_e.ldm.datasets[1].aggregated_facts[0].source_column == fact_column.upper()
     assert ldm_e.ldm.datasets[0].references[0].source_columns is None
     assert ldm_e.ldm.datasets[0].references[0].sources[0].column == reference_column.upper()
     # Test chaining approach as well
@@ -177,7 +176,7 @@ def test_load_ldm_and_modify_tables_columns_case(test_config):
     assert ldm_o.ldm.datasets[0].data_source_table_id.id == table_id
     assert ldm_o.ldm.datasets[0].attributes[0].source_column == attribute_column
     assert ldm_o.ldm.datasets[0].facts[0].source_column == fact_column
-    # TODO: Add agg facts here
+    assert ldm_o.ldm.datasets[1].aggregated_facts[0].source_column == fact_column
     assert ldm_o.ldm.datasets[0].references[0].source_columns is None
     assert ldm_e.ldm.datasets[0].references[0].sources[0].column == reference_column
 

tests-support/fixtures/demo_declarative_hierarchy.json

@@ -2346,6 +2346,70 @@
               ],
               "title": "Campaign channels"
             },
+            {
+              "attributes": [
+                {
+                  "description": "Category Agg",
+                  "id": "campaign_channels.category_agg",
+                  "sourceColumn": "category",
+                  "sourceColumnDataType": "STRING",
+                  "labels": [],
+                  "tags": [
+                    "Campaign channels"
+                  ],
+                  "title": "Category"
+                }
+              ],
+              "description": "Campaign channels per categories",
+              "facts": [],
+              "aggregatedFacts": [
+                {
+                  "description": "Budget Agg",
+                  "id": "budget_agg",
+                  "sourceColumn": "budget",
+                  "sourceColumnDataType": "INT",
+                  "tags": [
+                    "Campaign channels per category"
+                  ],
+                  "sourceFactReference": {
+                    "reference": {
+                      "id": "budget",
+                      "type": "fact"
+                    },
+                    "operation": "SUM"
+                  }
+                }
+              ],
+              "grain": [
+                {
+                  "id": "campaign_channels.category_agg",
+                  "type": "attribute"
+                }
+              ],
+              "id": "campaign_channels_per_category",
+              "precedence":  1,
+              "references": [
+                {
+                  "identifier": {
+                    "id": "campaign_channels",
+                    "type": "dataset"
+                  },
+                  "multivalue": false,
+                  "sourceColumns": [
+                    "campaign_channel_category"
+                  ],
+                  "sourceColumnDataTypes": [ "STRING" ]
+                }
+              ],
+              "tags": [
+                "Campaign channels per category"
+              ],
+              "sql": {
+                "statement": "SELECT category, SUM(budget) FROM campaign_channels GROUP BY category",
+                "dataSourceId": "demo-test-ds"
+              },
+              "title": "Campaign channels per category"
+            },
             {
               "attributes": [
                 {

tests-support/upload_demo_layout.py

@@ -35,7 +35,7 @@ def rest_op(op, url_path, data=None, raise_ex=True):
 
     if response.status_code < 200 or response.status_code > 299:
         if raise_ex:
-            raise Exception(f"Call to {url} failed - {str(response)}")
+            raise Exception(f"Call to {url} failed - {str(response.text)}")
         else:
             return None