[dashboard] Refactor API using SIP-35

superset/app.py

@@ -152,7 +152,7 @@ def init_views(self) -> None:
         )
         from superset.views.chart.api import ChartRestApi
         from superset.views.chart.views import SliceModelView, SliceAsync
-        from superset.views.dashboard.api import DashboardRestApi
+        from superset.dashboards.api import DashboardRestApi
         from superset.views.dashboard.views import (
             DashboardModelView,
             Dashboard,

superset/commands/exceptions.py

@@ -16,6 +16,7 @@
 # under the License.
 from typing import List, Optional
 
+from flask_babel import lazy_gettext as _
 from marshmallow import ValidationError
 
 
@@ -69,3 +70,8 @@ class DeleteFailedError(CommandException):
 
 class ForbiddenError(CommandException):
     message = "Action is forbidden"
+
+
+class OwnersNotFoundValidationError(ValidationError):
+    def __init__(self):
+        super().__init__(_("Owners are invalid"), field_names=["owners"])

superset/datasets/commands/base.py → superset/commands/utils.py

@@ -18,15 +18,14 @@
 
 from flask_appbuilder.security.sqla.models import User
 
-from superset.datasets.commands.exceptions import OwnersNotFoundValidationError
-from superset.datasets.dao import DatasetDAO
+from superset.commands.exceptions import OwnersNotFoundValidationError
+from superset.extensions import security_manager
 
 
 def populate_owners(user: User, owners_ids: Optional[List[int]] = None) -> List[User]:
     """
     Helper function for commands, will fetch all users from owners id's
     Can raise ValidationError
-
     :param user: The current user
     :param owners_ids: A List of owners by id's
     """
@@ -36,7 +35,7 @@ def populate_owners(user: User, owners_ids: Optional[List[int]] = None) -> List[
     if user.id not in owners_ids:
         owners.append(user)
     for owner_id in owners_ids:
-        owner = DatasetDAO.get_owner_by_id(owner_id)
+        owner = security_manager.get_user_by_id(owner_id)
         if not owner:
             raise OwnersNotFoundValidationError()
         owners.append(owner)

superset/dao/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

superset/dao/base.py

@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from typing import Dict, Optional
+
+from flask_appbuilder.models.sqla import Model
+from sqlalchemy.exc import SQLAlchemyError
+
+from superset.commands.exceptions import (
+    CreateFailedError,
+    DeleteFailedError,
+    UpdateFailedError,
+)
+from superset.extensions import db
+
+
+def generic_create(model_cls: Model, properties: Dict, commit=True) -> Optional[Model]:
+    """
+        Generic for creating models
+    """
+    model = model_cls()
+    for key, value in properties.items():
+        setattr(model, key, value)
+    try:
+        db.session.add(model)
+        if commit:
+            db.session.commit()
+    except SQLAlchemyError as e:  # pragma: no cover
+        db.session.rollback()
+        raise CreateFailedError(exception=e)
+    return model
+
+
+def generic_update(model: Model, properties: Dict, commit=True) -> Optional[Model]:
+    """
+        Generic update a model
+    """
+    for key, value in properties.items():
+        setattr(model, key, value)
+    try:
+        db.session.merge(model)
+        if commit:
+            db.session.commit()
+    except SQLAlchemyError as e:  # pragma: no cover
+        db.session.rollback()
+        raise UpdateFailedError(exception=e)
+    return model
+
+
+def generic_delete(model: Model, commit=True):
+    try:
+        db.session.delete(model)
+        if commit:
+            db.session.commit()
+    except SQLAlchemyError as e:  # pragma: no cover
+        db.session.rollback()
+        raise DeleteFailedError(exception=e)
+    return model

superset/dashboards/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.