fix dashboard models (#28)

Signed-off-by: mgorsk1 <[email protected]>
dwarszawski · May 12, 2021 · 6b4b4db · 6b4b4db
1 parent a954aa6
commit 6b4b4db
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 44 deletions.
diff --git a/amundsenatlastypes/__init__.py b/amundsenatlastypes/__init__.py
@@ -129,6 +129,6 @@ def create_required_entities(self, fix_existing_data=False):
         self.create_data_owner_relation()
         self.create_dashboard_group_schema()
         self.create_dashboard_schema()
-        self.create_dashboard_chart_schema()
         self.create_dashboard_query_schema()
+        self.create_dashboard_chart_schema()
         self.create_dashboard_execution_schema()
diff --git a/...atlastypes/schema/dashboard/04_query.json → ...atlastypes/schema/dashboard/03_query.json b/...atlastypes/schema/dashboard/04_query.json → ...atlastypes/schema/dashboard/03_query.json
@@ -42,20 +42,20 @@
   ],
   "relationshipDefs": [
     {
-      "name": "DashboardChart__DashboardQuery",
+      "name": "Dashboard__DashboardQuery",
       "typeVersion": "2.0",
       "relationshipCategory": "COMPOSITION",
-      "relationshipLabel": "_DashboardChart.DashboardQuery",
+      "relationshipLabel": "_Dashboard.DashboardQuery",
       "endDef1": {
-        "type": "DashboardChart",
+        "type": "Dashboard",
         "name": "queries",
         "isContainer": true,
         "cardinality": "SET",
         "isLegacyAttribute": true
       },
       "endDef2": {
         "type": "DashboardQuery",
-        "name": "chart",
+        "name": "dashboard",
         "isContainer": false,
         "cardinality": "SINGLE",
         "isLegacyAttribute": true

diff --git a/...atlastypes/schema/dashboard/03_chart.json → ...atlastypes/schema/dashboard/04_chart.json b/...atlastypes/schema/dashboard/03_chart.json → ...atlastypes/schema/dashboard/04_chart.json
@@ -32,20 +32,20 @@
   ],
   "relationshipDefs": [
     {
-      "name": "Dashboard__DashboardChart",
+      "name": "DashboardQuery__DashboardChart",
       "typeVersion": "2.0",
       "relationshipCategory": "COMPOSITION",
-      "relationshipLabel": "_Dashboard.DashboardChart",
+      "relationshipLabel": "_DashboardQuery.DashboardChart",
       "endDef1": {
-        "type": "Dashboard",
+        "type": "DashboardQuery",
         "name": "charts",
         "isContainer": true,
         "cardinality": "SET",
         "isLegacyAttribute": true
       },
       "endDef2": {
         "type": "DashboardChart",
-        "name": "dashboard",
+        "name": "query",
         "isContainer": false,
         "cardinality": "SINGLE",
         "isLegacyAttribute": true

diff --git a/amundsenatlastypes/schema/dashboard/sample_data.py b/amundsenatlastypes/schema/dashboard/sample_data.py
@@ -22,8 +22,8 @@ def __init__(self, table_guid, user_guid):
     def _initialize(self):
         self.initializer.create_dashboard_group_schema()
         self.initializer.create_dashboard_schema()
-        self.initializer.create_dashboard_chart_schema()
         self.initializer.create_dashboard_query_schema()
+        self.initializer.create_dashboard_chart_schema()
         self.initializer.create_dashboard_execution_schema()
 
     def _create(self, *args, **kwargs):
@@ -69,59 +69,59 @@ def _create(self, *args, **kwargs):
             }
         }
 
-        dashboard_chart_guid_1 = '-3'
-        dashboard_chart_1_dict = {
-            'guid': dashboard_chart_guid_1,
-            'typeName': 'DashboardChart',
+        dashboard_query_guid_1 = '-3'
+        dashboard_query_1_dict = {
+            'guid': dashboard_query_guid_1,
+            'typeName': 'DashboardQuery',
             'attributes': {
-                'qualifiedName': 'superset_dashboard://datalab.prod/1/chart/1',
+                'qualifiedName': 'superset_dashboard://datalab.prod/1/query/1',
                 'name': 'Total Count',
-                'type': 'metric',
-                'url': 'https://prod.superset/dashboards/1/chart/1',
+                'id': 'total_count',
+                'url': 'https://prod.superset/dashboards/1/query/1',
+                'queryText': 'SELECT COUNT(1) FROM db.table',
                 'dashboard': {'guid': dashboard_guid}
             }
         }
 
-        dashboard_chart_guid_2 = '-4'
-        dashboard_chart_2_dict = {
-            'guid': dashboard_chart_guid_2,
-            'typeName': 'DashboardChart',
+        dashboard_query_guid_2 = '-4'
+        dashboard_query_2_dict = {
+            'guid': dashboard_query_guid_2,
+            'typeName': 'DashboardQuery',
             'attributes': {
-                'qualifiedName': 'superset_dashboard://datalab.prod/1/chart/2',
-                'name': 'Count Users by Time',
-                'type': 'horizontal_bar',
-                'url': 'https://prod.superset/dashboards/1/chart/2',
+                'qualifiedName': 'superset_dashboard://datalab.prod/1/query/2',
+                'name': 'User Count By Time',
+                'id': 'user_count_by_time',
+                'url': 'https://prod.superset/dashboards/1/query/2',
+                'queryText': 'SELECT date, COUNT(1) FROM db.table GROUP BY 1',
                 'dashboard': {'guid': dashboard_guid}
             }
         }
 
-        dashboard_query_1_dict = {
-            'typeName': 'DashboardQuery',
+        dashboard_chart_1_dict = {
+            'typeName': 'DashboardChart',
             'attributes': {
-                'qualifiedName': 'superset_dashboard://datalab.prod/1/chart/1/query/1',
+                'qualifiedName': 'superset_dashboard://datalab.prod/1/query/1/chart/1',
                 'name': 'Total Count',
-                'id': 'total_count',
-                'url': 'https://prod.superset/dashboards/1/chart/1/query/1',
-                'queryText': 'SELECT COUNT(1) FROM db.table',
-                'chart': {'guid': dashboard_chart_guid_1}
+                'type': 'metric',
+                'url': 'https://prod.superset/dashboards/1/query/1/chart/1',
+                'query': {'guid': dashboard_query_guid_1}
             }
         }
 
-        dashboard_query_2_dict = {
-            'typeName': 'DashboardQuery',
+        dashboard_chart_2_dict = {
+            'typeName': 'DashboardChart',
             'attributes': {
-                'qualifiedName': 'superset_dashboard://datalab.prod/1/chart/2/query/1',
-                'name': 'User Count By Time',
-                'id': 'user_count_by_time',
-                'url': 'https://prod.superset/dashboards/1/chart/2/query/1',
-                'queryText': 'SELECT date, COUNT(1) FROM db.table GROUP BY 1',
-                'chart': {'guid': dashboard_chart_guid_2}
+                'qualifiedName': 'superset_dashboard://datalab.prod/1/query/2/chart/1',
+                'name': 'Count Users by Time',
+                'type': 'horizontal_bar',
+                'url': 'https://prod.superset/dashboards/1/query/2/chart/1',
+                'query': {'guid': dashboard_query_guid_2}
             }
         }
 
         entities = [dashboard_group_dict,
                     dashboard_dict, dashboard_execution_dict,
-                    dashboard_chart_1_dict, dashboard_query_1_dict,
-                    dashboard_chart_2_dict, dashboard_query_2_dict]
+                    dashboard_query_1_dict, dashboard_query_2_dict,
+                    dashboard_chart_1_dict, dashboard_chart_2_dict]
 
         driver.entity_bulk.create(data={'entities': entities})
diff --git a/amundsenatlastypes/types_def.py b/amundsenatlastypes/types_def.py
@@ -21,6 +21,6 @@ def get_schema(schema):
 
 dashboard_group_schema = get_schema("schema/dashboard/01_group.json")
 dashboard_schema = get_schema("schema/dashboard/02_dashboard.json")
-dashboard_chart_schema = get_schema("schema/dashboard/03_chart.json")
-dashboard_query_schema = get_schema("schema/dashboard/04_query.json")
+dashboard_query_schema = get_schema("schema/dashboard/03_query.json")
+dashboard_chart_schema = get_schema("schema/dashboard/04_chart.json")
 dashboard_execution_schema = get_schema("schema/dashboard/05_execution.json")