mr main and rebuild migration

This commit is contained in:
Yansong Zhang 2025-10-23 11:14:17 +08:00
parent cd9e28dbf4
commit b22c28b099
2 changed files with 2 additions and 3 deletions

View File

@ -24,7 +24,6 @@ def _load_app_model(app_id: str) -> App | None:
def _load_app_model_with_trial(app_id: str) -> App | None:
assert isinstance(current_user, Account)
app_model = db.session.query(App).where(App.id == app_id, App.status == "normal").first()
return app_model

View File

@ -76,6 +76,8 @@ def trial_app_required(view: Callable[Concatenate[App, P], R] | None = None):
def decorator(view: Callable[Concatenate[App, P], R]):
@wraps(view)
def decorated(app_id: str, *args: P.args, **kwargs: P.kwargs):
current_user, _ = current_account_with_tenant()
trial_app = db.session.query(TrialApp).where(TrialApp.app_id == str(app_id)).first()
if trial_app is None:
@ -85,8 +87,6 @@ def trial_app_required(view: Callable[Concatenate[App, P], R] | None = None):
if app is None:
raise TrialAppNotAllowed()
assert isinstance(current_user, Account)
account_trial_app_record = (
db.session.query(AccountTrialAppRecord)
.where(AccountTrialAppRecord.account_id == current_user.id, AccountTrialAppRecord.app_id == app_id)