opensource/dify
3
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-24 23:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(types): replace Account/Tenant status string literals with enum values (#35267)

Browse Source 
Co-authored-by: xr843 <xianren843@protonmail.com>
This commit is contained in:
Tim Ren
2026-04-15 15:52:38 +00:00
committed by GitHub
co-authored by xr843
parent 538093855b
commit e6b5923ff1
14 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/tests/unit_tests/controllers/console/test_workspace_account.py
+2 -2
View File
@@ -11,7 +11,7 @@ from controllers.console.workspace.account import (
ChangeEmailSendEmailApi,
CheckEmailUnique,
)
from models import Account
from models import Account, AccountStatus
from services.account_service import AccountService
@@ -33,7 +33,7 @@ def _build_account(email: str, account_id: str = "acc", tenant: object | None =
account = Account(name=account_id, email=email)
account.email = email
account.id = account_id
account.status = "active"
account.status = AccountStatus.ACTIVE
account._current_tenant = tenant_obj
return account
api/tests/unit_tests/controllers/inner_api/app/test_dsl.py
+3 -2
View File
@@ -18,6 +18,7 @@ from controllers.inner_api.app.dsl import (
InnerAppDSLImportPayload,
_get_active_account,
)
from models.account import AccountStatus
from services.app_dsl_service import ImportStatus
@@ -63,7 +64,7 @@ class TestGetActiveAccount:
@patch("controllers.inner_api.app.dsl.db")
def test_returns_active_account(self, mock_db):
mock_account = MagicMock()
mock_account.status = "active"
mock_account.status = AccountStatus.ACTIVE
mock_db.session.scalar.return_value = mock_account
result = _get_active_account("user@example.com")
@@ -74,7 +75,7 @@ class TestGetActiveAccount:
@patch("controllers.inner_api.app.dsl.db")
def test_returns_none_for_inactive_account(self, mock_db):
mock_account = MagicMock()
mock_account.status = "banned"
mock_account.status = AccountStatus.BANNED
mock_db.session.scalar.return_value = mock_account
result = _get_active_account("banned@example.com")
api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py
+3 -2
View File
@@ -20,6 +20,7 @@ from controllers.inner_api.workspace.workspace import (
WorkspaceCreatePayload,
WorkspaceOwnerlessPayload,
)
from models.account import TenantStatus
class TestWorkspaceCreatePayload:
@@ -98,7 +99,7 @@ class TestEnterpriseWorkspace:
mock_tenant.id = "tenant-id"
mock_tenant.name = "My Workspace"
mock_tenant.plan = "sandbox"
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_tenant.created_at = now
mock_tenant.updated_at = now
mock_tenant_svc.create_tenant.return_value = mock_tenant
@@ -162,7 +163,7 @@ class TestEnterpriseWorkspaceNoOwnerEmail:
mock_tenant.name = "My Workspace"
mock_tenant.encrypt_public_key = "pub-key"
mock_tenant.plan = "sandbox"
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_tenant.custom_config = None
mock_tenant.created_at = now
mock_tenant.updated_at = now
api/tests/unit_tests/controllers/service_api/app/test_app.py
+10 -9
View File
@@ -10,6 +10,7 @@ from flask import Flask
from controllers.service_api.app.app import AppInfoApi, AppMetaApi, AppParameterApi
from controllers.service_api.app.error import AppUnavailableError
from models.account import TenantStatus
from models.model import App, AppMode
from tests.unit_tests.conftest import setup_mock_tenant_account_query
@@ -62,7 +63,7 @@ class TestAppParameterApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
# Mock DB queries for app and tenant
mock_db.session.get.side_effect = [
@@ -110,7 +111,7 @@ class TestAppParameterApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app_model,
@@ -151,7 +152,7 @@ class TestAppParameterApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app_model,
@@ -190,7 +191,7 @@ class TestAppParameterApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app_model,
@@ -253,7 +254,7 @@ class TestAppMetaApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app_model,
@@ -321,7 +322,7 @@ class TestAppInfoApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app_model,
@@ -378,7 +379,7 @@ class TestAppInfoApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app,
@@ -424,7 +425,7 @@ class TestAppInfoApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app,
@@ -476,7 +477,7 @@ class TestAppInfoApi:
mock_validate_token.return_value = mock_api_token
mock_tenant = Mock()
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_db.session.get.side_effect = [
mock_app,
api/tests/unit_tests/services/test_account_service.py
+4 -4
View File
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
import pytest
from configs import dify_config
from models.account import Account, AccountStatus
from models.account import Account, AccountStatus, TenantStatus
from services.account_service import AccountService, RegisterService, TenantService
from services.errors.account import (
AccountAlreadyInTenantError,
@@ -1697,7 +1697,7 @@ class TestRegisterService:
# Setup test data
mock_tenant = MagicMock()
mock_tenant.id = "tenant-456"
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_account = TestAccountAssociatedDataFactory.create_account_mock(
account_id="user-123", email="test@example.com"
)
@@ -1759,7 +1759,7 @@ class TestRegisterService:
# Setup test data
mock_tenant = MagicMock()
mock_tenant.id = "tenant-456"
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
# Mock Redis data
invitation_data = {
@@ -1784,7 +1784,7 @@ class TestRegisterService:
# Setup test data
mock_tenant = MagicMock()
mock_tenant.id = "tenant-456"
mock_tenant.status = "normal"
mock_tenant.status = TenantStatus.NORMAL
mock_account = TestAccountAssociatedDataFactory.create_account_mock(
account_id="different-user-456", email="test@example.com"
)