From 4de16c250c1f1d1d18f29dd3017bad381e2c5e95 Mon Sep 17 00:00:00 2001
From: ch-liuzhide <liuzhide.lzd@antgroup.com>
Date: Tue, 26 Nov 2024 18:53:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(deploy):=20=E6=94=AF=E6=8C=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=83=A8=E7=BD=B2issue=E5=9C=B0=E5=9D=80=20&=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A1=E6=89=B9=E6=83=85=E5=86=B5=E6=97=B6?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=20issue=20=E7=8A=B6=E6=80=81=E5=B9=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit/components/DeployBotModal/index.tsx  | 41 ++++++++++++++++---
 client/app/hooks/useBot.ts                    |  4 +-
 client/app/market/page.tsx                    |  2 -
 server/bot/router.py                          | 21 +++++++++-
 server/core/dao/botApprovalDAO.py             | 19 ++++++++-
 server/github_app/router.py                   |  3 +-
 server/github_app/utils.py                    | 13 ++++++
 server/requirements.txt                       |  2 +-
 8 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/client/app/factory/edit/components/DeployBotModal/index.tsx b/client/app/factory/edit/components/DeployBotModal/index.tsx
index d69ae244..249498b4 100644
--- a/client/app/factory/edit/components/DeployBotModal/index.tsx
+++ b/client/app/factory/edit/components/DeployBotModal/index.tsx
@@ -41,6 +41,7 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
   } = useBindBotToRepo();
   const {
     publicBot,
+    data: publicBotResult,
     isLoading: isPublicBotLoading,
     isSuccess: isPublicBotSuccess,
   } = usePublicBot();
@@ -51,6 +52,7 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
   } = useUnPublicBot();
   const {
     deployWebsite,
+    data: deployWebsiteResult,
     isLoading: isDeployWebsiteLoading,
     isSuccess: isDeployWebsiteSuccess,
   } = useDeployWebsite();
@@ -75,10 +77,11 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
         checked: !!botProfile.domain_whitelist[0],
         targetUrl: botProfile.domain_whitelist[0],
       },
-      appInstalledRepo: peterCatBotRepos?.map((item: any) => ({
-        repo_id: item.repo_id,
-        checked: item.robot_id === botProfile.id,
-      }))??[],
+      appInstalledRepo:
+        peterCatBotRepos?.map((item: any) => ({
+          repo_id: item.repo_id,
+          checked: item.robot_id === botProfile.id,
+        })) ?? [],
     };
   }, [botProfile, peterCatBotRepos]);
 
@@ -148,6 +151,24 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
     isDeployWebsiteSuccess ||
     isBindBotSuccess;
 
+  const renderResultPath = (result: { approval_path: any }, text: string) => {
+    return (
+      <>
+        {result?.approval_path ? (
+          <div className="w-full flex flex-col gap-1 justify-center items-center">
+            <span>
+              {text}
+              {I18N.DeployBotModal.DeployContent.shenHeZhong}
+            </span>
+            <a href={result.approval_path} target="_blank" className="block max-w-full break-words">
+              {result.approval_path}
+            </a>
+          </div>
+        ) : null}
+      </>
+    );
+  };
+
   return (
     <>
       <Modal
@@ -169,6 +190,16 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
                       <span>{I18N.DeployBotModal.index.buShuChengGong}</span>
                     </div>
                   </ModalHeader>
+                  <ModalBody className="py-[0px] flex flex-col gap-2 justify-center items-center">
+                    {renderResultPath(
+                      publicBotResult,
+                      I18N.DeployBotModal.DeployContent.gongKaiDaoPE,
+                    )}
+                    {renderResultPath(
+                      deployWebsiteResult,
+                      I18N.DeployBotModal.DeployContent.buShuDaoWoDe,
+                    )}
+                  </ModalBody>
                   <ModalFooter className="flex justify-center items-center">
                     <Button
                       className="border-[1.5px] border-[#3F3F46] rounded-[46px] bg-[#3F3F46] text-white"
@@ -196,7 +227,7 @@ const MyBotDeployModal: React.FC<IModalProps> = ({ isOpen, onClose }) => {
                         deployInfo={deployInfo}
                         websiteApproval={websiteApproval}
                         marketApproval={marketApproval}
-                        peterCatBotRepos={peterCatBotRepos??[]}
+                        peterCatBotRepos={peterCatBotRepos ?? []}
                         onChange={handleDeployChange}
                       />
                     </Spinner>
diff --git a/client/app/hooks/useBot.ts b/client/app/hooks/useBot.ts
index a97184b6..83684e9e 100644
--- a/client/app/hooks/useBot.ts
+++ b/client/app/hooks/useBot.ts
@@ -153,7 +153,7 @@ export function usePublicBot() {
     mutationFn: publicBot,
   });
   return {
-    data: mutation.data,
+    data: mutation.data?.data,
     publicBot: mutation.mutate,
     isLoading: mutation.isPending,
     error: mutation.error,
@@ -178,7 +178,7 @@ export function useDeployWebsite() {
     mutationFn: deployWebsite,
   });
   return {
-    data: mutation.data,
+    data: mutation.data?.data,
     deployWebsite: mutation.mutate,
     isLoading: mutation.isPending,
     error: mutation.error,
diff --git a/client/app/market/page.tsx b/client/app/market/page.tsx
index cc9f800b..fd39acbf 100644
--- a/client/app/market/page.tsx
+++ b/client/app/market/page.tsx
@@ -8,7 +8,6 @@ import FullPageSkeleton from '@/components/FullPageSkeleton';
 import { useGlobal } from '@/app/contexts/GlobalContext';
 import { Assistant } from '@petercatai/assistant';
 import { useFingerprint } from '../hooks/useFingerprint';
-import PublishBotEntity from '@/components/PublishBotEntity';
 import Crash from '@/components/Crash';
 
 declare type Bot = Tables<'bots'>;
@@ -67,7 +66,6 @@ export default function Market() {
   return (
     <div>
       <div className="grid grid-flow-row-dense gap-8 justify-items-center px-[40px] grid-cols-2 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
-        {/* <PublishBotEntity area="list" /> */}
         {!isEmpty(bots) &&
           map(bots, (bot: Bot) => (
             <BotCard key={bot.id} bot={bot} handleCardClick={handleCardClick} />
diff --git a/server/bot/router.py b/server/bot/router.py
index 09d99298..49712f01 100644
--- a/server/bot/router.py
+++ b/server/bot/router.py
@@ -433,15 +433,32 @@ def get_bot_approval_config(
     status: Optional[ApprovalStatus] = Query(
         None, description="approval status ,open or closed"
     ),
+    user: Annotated[User | None, Depends(get_user)] = None,
 ):
     try:
         bot_approval_dao = BotApprovalDAO()
-        (success, data) = bot_approval_dao.query_by_bot_id(bot_id)
+        (success, data) = bot_approval_dao.query(bot_id, status.value)
         if not success:
             raise ValueError(data)
-        # filter data by status
         if status:
             data = list(filter(lambda x: x["approval_status"] == status.value, data))
+            auth = Auth.Token(token=user.access_token)
+            g = Github(auth=auth)
+            repo = g.get_repo(OFFICIAL_REPO)
+            for item in data:
+                if not item["approval_path"]:
+                    continue
+                issue_num = int(item["approval_path"].split("/")[-1])
+                issue = repo.get_issue(issue_num)
+                if issue.state == "closed":
+                    item["approval_status"] = ApprovalStatus.CLOSED
+                    # update approval status to closed
+                    bot_approval_dao.update_approval_status(
+                        item["id"], ApprovalStatus.CLOSED.value
+                    )
+        # filter again
+        data = list(filter(lambda x: x["approval_status"] == status.value, data))
+        # check data item issue is closed
         return {"data": data, "status": 200}
     except Exception as e:
         return JSONResponse(content={"success": False, "errorMessage": e})
diff --git a/server/core/dao/botApprovalDAO.py b/server/core/dao/botApprovalDAO.py
index 1f8c5e7b..47fb2660 100644
--- a/server/core/dao/botApprovalDAO.py
+++ b/server/core/dao/botApprovalDAO.py
@@ -27,12 +27,13 @@ def create(self, data: BotApproval):
             print("Error: ", e)
             return False, {"message": "approval creation failed"}
 
-    def query_by_bot_id(self, bot_id: str):
+    def query(self, bot_id: str, status: str):
         try:
             bot_approval = (
                 self.client.table("bot_approval")
                 .select("*")
                 .eq("bot_id", bot_id)
+                .eq("approval_status", status)
                 .execute()
             )
             if bot_approval:
@@ -42,3 +43,19 @@ def query_by_bot_id(self, bot_id: str):
         except Exception as e:
             print("Error: ", e)
             return False, {"message": "approval query failed"}
+
+    def update_approval_status(self, id: str, status: str):
+        try:
+            bot_approval = (
+                self.client.table("bot_approval")
+                .update({"approval_status": status})
+                .eq("id", id)
+                .execute()
+            )
+            if bot_approval:
+                return True, {"message": "approval updated successfully"}
+            else:
+                return False, {"message": "approval update failed"}
+        except Exception as e:
+            print("Error: ", e)
+            return False, {"message": "approval update failed"}
diff --git a/server/github_app/router.py b/server/github_app/router.py
index a2a35c1e..d91a2860 100644
--- a/server/github_app/router.py
+++ b/server/github_app/router.py
@@ -28,6 +28,7 @@
     get_installation_repositories,
     get_jwt,
     get_private_key,
+    get_user_orgs,
 )
 
 from petercat_utils import get_env_variable
@@ -145,7 +146,7 @@ def get_user_repos_installed_app_(
         auth = Auth.Token(token=user.access_token)
         g = Github(auth=auth)
         github_user = g.get_user()
-        orgs = github_user.get_orgs()
+        orgs = get_user_orgs(github_user.login, auth.token)
         repository_config_dao = RepositoryConfigDAO()
         installations = repository_config_dao.query_by_owners(
             [org.id for org in orgs] + [github_user.id]
diff --git a/server/github_app/utils.py b/server/github_app/utils.py
index 2b727fed..98e825eb 100644
--- a/server/github_app/utils.py
+++ b/server/github_app/utils.py
@@ -58,3 +58,16 @@ def get_installation_repositories(access_token: str):
         },
     )
     return resp.json()
+
+
+def get_user_orgs(username, access_token: str):
+    url = f"https://api.github.com/users/{username}/orgs"
+    resp = requests.get(
+        url,
+        headers={
+            "X-GitHub-Api-Version": "2022-11-28",
+            "Accept": "application/vnd.github+json",
+            "Authorization": f"Bearer {access_token}",
+        },
+    )
+    return resp.json()
diff --git a/server/requirements.txt b/server/requirements.txt
index 5473c65e..f8ba4458 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -7,7 +7,7 @@ langserve
 langchain_community>=0.2.11
 langchain>=0.2.12
 langchain_google_genai
-PyGithub==2.3.0
+PyGithub
 GitPython
 python-multipart
 httpx[socks]