minor: remove useless data source status filter

TencentBlueKing · Mar 7, 2024 · b3c7d24 · b3c7d24
1 parent 699169c
commit b3c7d24
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/src/bk-user/bkuser/apis/web/data_source/mixins.py b/src/bk-user/bkuser/apis/web/data_source/mixins.py
@@ -9,7 +9,6 @@
 specific language governing permissions and limitations under the License.
 """
 from bkuser.apis.web.mixins import CurrentUserTenantMixin
-from bkuser.apps.data_source.constants import DataSourceStatus
 from bkuser.apps.data_source.models import DataSource
 
 
@@ -19,7 +18,4 @@ class CurrentUserTenantDataSourceMixin(CurrentUserTenantMixin):
     lookup_url_kwarg = "id"
 
     def get_queryset(self):
-        return DataSource.objects.filter(
-            owner_tenant_id=self.get_current_tenant_id(),
-            status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED],
-        )
+        return DataSource.objects.filter(owner_tenant_id=self.get_current_tenant_id())
diff --git a/src/bk-user/bkuser/apis/web/data_source/serializers.py b/src/bk-user/bkuser/apis/web/data_source/serializers.py
@@ -268,11 +268,7 @@ def validate(self, attrs: Dict[str, Any]) -> Dict[str, Any]:
 
         if data_source_id := attrs.get("data_source_id"):
             # 若是更新场景，前端可以通过提供数据源 ID，这里将检查提供的数据源是否属于当前用户所在租户
-            if not DataSource.objects.filter(
-                id=data_source_id,
-                owner_tenant_id=self.context["tenant_id"],
-                status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED],
-            ).exists():
+            if not DataSource.objects.filter(id=data_source_id, owner_tenant_id=self.context["tenant_id"]).exists():
                 raise ValidationError(
                     _("当前用户租户 {} 不存在 ID 为 {} 的数据源").format(self.context["tenant_id"], data_source_id),
                 )

diff --git a/src/bk-user/bkuser/apis/web/data_source/views.py b/src/bk-user/bkuser/apis/web/data_source/views.py
@@ -106,7 +106,6 @@ class DataSourceListCreateApi(CurrentUserTenantMixin, generics.ListCreateAPIView
     def get_serializer_context(self):
         tenant_user_ids = DataSource.objects.filter(
             owner_tenant_id=self.get_current_tenant_id(),
-            status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED],
         ).values_list("updater", flat=True)
         return {
             "data_source_plugin_map": dict(DataSourcePlugin.objects.values_list("id", "name")),
@@ -118,10 +117,7 @@ def get_queryset(self):
         slz.is_valid(raise_exception=True)
         data = slz.validated_data
 
-        queryset = DataSource.objects.filter(
-            owner_tenant_id=self.get_current_tenant_id(),
-            status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED],
-        )
+        queryset = DataSource.objects.filter(owner_tenant_id=self.get_current_tenant_id())
         if kw := data.get("keyword"):
             queryset = queryset.filter(name__icontains=kw)
 

diff --git a/src/bk-user/bkuser/apis/web/data_source_organization/views.py b/src/bk-user/bkuser/apis/web/data_source_organization/views.py
@@ -68,7 +68,6 @@ def get_queryset(self):
         data_source = DataSource.objects.filter(
             id=data_source_id,
             owner_tenant_id=self.get_current_tenant_id(),
-            status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED],
         ).first()
         if not data_source:
             raise error_codes.DATA_SOURCE_NOT_EXISTS

diff --git a/src/bk-user/bkuser/apis/web/organization/views.py b/src/bk-user/bkuser/apis/web/organization/views.py
@@ -28,7 +28,6 @@
     TenantUserSearchInputSLZ,
 )
 from bkuser.apis.web.tenant.serializers import TenantRetrieveOutputSLZ, TenantUpdateInputSLZ
-from bkuser.apps.data_source.constants import DataSourceStatus
 from bkuser.apps.data_source.models import DataSource, DataSourceDepartmentRelation, DataSourceDepartmentUserRelation
 from bkuser.apps.permission.constants import PermAction
 from bkuser.apps.permission.permissions import perm_class
@@ -197,9 +196,7 @@ def get(self, request, *args, **kwargs):
 
         data_source_id = tenant_dept.data_source_department.data_source_id
         # 即使数据源被停用，也是可以查看组织架构信息的
-        if not DataSource.objects.filter(
-            id=data_source_id, status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED]
-        ).exists():
+        if not DataSource.objects.filter(id=data_source_id).exists():
             raise error_codes.DATA_SOURCE_NOT_EXISTS
 
         tenant_dept_children_infos = TenantDepartmentHandler.get_tenant_dept_children_infos(tenant_dept)
@@ -230,9 +227,7 @@ def get(self, request, *args, **kwargs):
 
         data_source_id = tenant_dept.data_source_department.data_source_id
         # 即使数据源被停用，也是可以查看组织架构信息的
-        if not DataSource.objects.filter(
-            id=data_source_id, status__in=[DataSourceStatus.ENABLED, DataSourceStatus.DISABLED]
-        ).exists():
+        if not DataSource.objects.filter(id=data_source_id).exists():
             raise error_codes.DATA_SOURCE_NOT_EXISTS
 
         # 需要通过数据源部门 - 用户关系反查租户部门用户信息，且需要支持递归查询子孙部门用户