Skip to content

Commit

Permalink
fix: solve the page of empty factory list (#657)
Browse files Browse the repository at this point in the history
  • Loading branch information
xingwanying authored Jan 7, 2025
1 parent 29056a5 commit b41a4c6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
12 changes: 7 additions & 5 deletions server/bot/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

from github import Github, Auth
from core.dao.repositoryConfigDAO import RepositoryConfigDAO
from core.models.user import User
from petercat_utils import get_client


def query_list(
name: Optional[str] = None,
user_id: Optional[str] = None,
access_token: Optional[str] = None,
user: Optional[User] = None,
personal: Optional[str] = None,
):

try:
supabase = get_client()
query = (
Expand All @@ -24,9 +25,10 @@ def query_list(
query = query.filter("name", "like", f"%{name}%")

if personal == "true":
if not access_token or not user_id:
return {"data": [], "personal": personal}

if not user:
return None
user_id = user.id
access_token = user.access_token
auth = Auth.Token(token=access_token)
github_user = Github(auth=auth).get_user()
orgs_ids = [org.id for org in github_user.get_orgs()]
Expand Down
3 changes: 2 additions & 1 deletion server/bot/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ def get_bot_list(
name: Optional[str] = Query(None, description="Filter bots by name"),
user: Annotated[User | None, Depends(get_user)] = None,
):

try:
data = query_list(name, user.id, user.access_token, personal)
data = query_list(name, user, personal)

return {"data": data if data else [], "personal": personal}

Expand Down

0 comments on commit b41a4c6

Please sign in to comment.