chore: Refactor ownership (#21938)

This commit is contained in:
John Bodley
2022-11-02 01:05:31 -07:00
committed by GitHub
parent 3a023392e6
commit 4a330a3630
2 changed files with 4 additions and 6 deletions

View File

@@ -22,7 +22,7 @@ from typing import Any
from zipfile import is_zipfile, ZipFile
import yaml
from flask import g, request, Response, send_file
from flask import request, Response, send_file
from flask_appbuilder.api import expose, protect, rison, safe
from flask_appbuilder.models.sqla.interface import SQLAInterface
from flask_babel import ngettext
@@ -585,7 +585,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
return self.response_400(message=error.messages)
try:
new_model = DuplicateDatasetCommand([g.user.id], item).run()
new_model = DuplicateDatasetCommand(item).run()
return self.response(201, id=new_model.id, result=item)
except DatasetInvalidError as ex:
return self.response_422(

View File

@@ -18,7 +18,6 @@ import logging
from typing import Any, Dict, List
from flask_appbuilder.models.sqla import Model
from flask_appbuilder.security.sqla.models import User
from flask_babel import gettext as __
from marshmallow import ValidationError
from sqlalchemy.exc import SQLAlchemyError
@@ -44,8 +43,7 @@ logger = logging.getLogger(__name__)
class DuplicateDatasetCommand(CreateMixin, BaseCommand):
def __init__(self, user: User, data: Dict[str, Any]):
self._actor = user
def __init__(self, data: Dict[str, Any]) -> None:
self._base_model: SqlaTable = SqlaTable()
self._properties = data.copy()
@@ -122,7 +120,7 @@ class DuplicateDatasetCommand(CreateMixin, BaseCommand):
exceptions.append(DatasetExistsValidationError(table_name=duplicate_name))
try:
owners = self.populate_owners(self._actor)
owners = self.populate_owners()
self._properties["owners"] = owners
except ValidationError as ex:
exceptions.append(ex)