QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-20 08:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(dao): Organize DAOs according to SIP-92 (#24331)

Browse Source 
Co-authored-by: JUST.in DO IT <justin.park@airbnb.com>
This commit is contained in:
John Bodley
2023-06-18 18:32:32 -07:00
committed by GitHub
parent 1bc7d63cab
commit 3e76736874
149 changed files with 426 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/annotation_layers/annotations/commands/bulk_delete.py
View File

@@ -21,9 +21,9 @@ from superset.annotation_layers.annotations.commands.exceptions import (
AnnotationBulkDeleteFailedError,
AnnotationNotFoundError,
)
from superset.annotation_layers.annotations.dao import AnnotationDAO
from superset.commands.base import BaseCommand
from superset.dao.exceptions import DAODeleteFailedError
from superset.daos.annotation import AnnotationDAO
from superset.daos.exceptions import DAODeleteFailedError
from superset.models.annotations import Annotation
logger = logging.getLogger(__name__)

5
superset/annotation_layers/annotations/commands/create.py
View File

@@ -27,11 +27,10 @@ from superset.annotation_layers.annotations.commands.exceptions import (
AnnotationInvalidError,
AnnotationUniquenessValidationError,
)
from superset.annotation_layers.annotations.dao import AnnotationDAO
from superset.annotation_layers.commands.exceptions import AnnotationLayerNotFoundError
from superset.annotation_layers.dao import AnnotationLayerDAO
from superset.commands.base import BaseCommand
from superset.dao.exceptions import DAOCreateFailedError
from superset.daos.annotation import AnnotationDAO, AnnotationLayerDAO
from superset.daos.exceptions import DAOCreateFailedError
logger = logging.getLogger(__name__)

4
superset/annotation_layers/annotations/commands/delete.py
View File

@@ -23,9 +23,9 @@ from superset.annotation_layers.annotations.commands.exceptions import (
AnnotationDeleteFailedError,
AnnotationNotFoundError,
)
from superset.annotation_layers.annotations.dao import AnnotationDAO
from superset.commands.base import BaseCommand
from superset.dao.exceptions import DAODeleteFailedError
from superset.daos.annotation import AnnotationDAO
from superset.daos.exceptions import DAODeleteFailedError
from superset.models.annotations import Annotation
logger = logging.getLogger(__name__)

5
superset/annotation_layers/annotations/commands/update.py
View File

@@ -28,11 +28,10 @@ from superset.annotation_layers.annotations.commands.exceptions import (
AnnotationUniquenessValidationError,
AnnotationUpdateFailedError,
)
from superset.annotation_layers.annotations.dao import AnnotationDAO
from superset.annotation_layers.commands.exceptions import AnnotationLayerNotFoundError
from superset.annotation_layers.dao import AnnotationLayerDAO
from superset.commands.base import BaseCommand
from superset.dao.exceptions import DAOUpdateFailedError
from superset.daos.annotation import AnnotationDAO, AnnotationLayerDAO
from superset.daos.exceptions import DAOUpdateFailedError
from superset.models.annotations import Annotation
logger = logging.getLogger(__name__)

64
superset/annotation_layers/annotations/dao.py
View File

@@ -1,64 +0,0 @@
# 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.
import logging
from typing import Optional
from sqlalchemy.exc import SQLAlchemyError
from superset.dao.base import BaseDAO
from superset.dao.exceptions import DAODeleteFailedError
from superset.extensions import db
from superset.models.annotations import Annotation
logger = logging.getLogger(__name__)
class AnnotationDAO(BaseDAO):
model_cls = Annotation
@staticmethod
def bulk_delete(models: Optional[list[Annotation]], commit: bool = True) -> None:
item_ids = [model.id for model in models] if models else []
try:
db.session.query(Annotation).filter(Annotation.id.in_(item_ids)).delete(
synchronize_session="fetch"
)
if commit:
db.session.commit()
except SQLAlchemyError as ex:
db.session.rollback()
raise DAODeleteFailedError() from ex
@staticmethod
def validate_update_uniqueness(
layer_id: int, short_descr: str, annotation_id: Optional[int] = None
) -> bool:
"""
Validate if this annotation short description is unique. `id` is optional
and serves for validating on updates
:param short_descr: The annotation short description
:param layer_id: The annotation layer current id
:param annotation_id: This annotation is (only for validating on updates)
:return: bool
"""
query = db.session.query(Annotation).filter(
Annotation.short_descr == short_descr, Annotation.layer_id == layer_id
)
if annotation_id:
query = query.filter(Annotation.id != annotation_id)
return not db.session.query(query.exists()).scalar()