luqmanAA · Shirlyne20 · Jul 21, 2024 · Jul 21, 2024 · Jul 21, 2024 · Jul 21, 2024
diff --git a/README.md b/README.md
diff --git a/images/Screenshot 2024-07-20 181055.png b/images/Screenshot 2024-07-20 181055.png
diff --git a/images/Screenshot 2024-07-20 181326.png b/images/Screenshot 2024-07-20 181326.png
diff --git a/images/alpha bot.png b/images/alpha bot.png
diff --git a/images/alpha-bot.png b/images/alpha-bot.png
diff --git a/images/bot install.png b/images/bot install.png
diff --git a/images/closed-pr.png b/images/closed-pr.png
diff --git a/images/create-pr.png b/images/create-pr.png
diff --git a/images/deployment-complete.png b/images/deployment-complete.png
diff --git a/images/dev settings.png b/images/dev settings.png
diff --git a/images/downloaded pvt keys.png b/images/downloaded pvt keys.png
diff --git a/images/events subscription.png b/images/events subscription.png
diff --git a/images/github app.png b/images/github app.png
diff --git a/images/github webhook.png b/images/github webhook.png
diff --git a/images/install on repo.png b/images/install on repo.png
diff --git a/images/installing the app.png b/images/installing the app.png
diff --git a/images/new bot.png b/images/new bot.png
diff --git a/images/ngrok.png b/images/ngrok.png
diff --git a/images/permissions.png b/images/permissions.png
diff --git a/images/pr-being-deployed.png b/images/pr-being-deployed.png
diff --git a/images/private key.png b/images/private key.png
diff --git a/images/public page.png b/images/public page.png
diff --git a/images/read and write.png b/images/read and write.png
diff --git a/images/realstepa.PNG b/images/realstepa.PNG
diff --git a/images/realstepb.PNG b/images/realstepb.PNG
diff --git a/images/realstepc.PNG b/images/realstepc.PNG
diff --git a/images/repo perm.png b/images/repo perm.png
diff --git a/images/stepa.PNG b/images/stepa.PNG
diff --git a/images/stepb.PNG b/images/stepb.PNG
diff --git a/images/stepd.png b/images/stepd.png
diff --git a/index.js b/index.js
@@ -27,20 +27,23 @@ app.post('/webhook', async (req, res) => {
         const prNumber = req.body.number;
         const branchName = req.body.pull_request.head.ref;
         const repoName = req.body.repository.full_name;
+        const forkName = req.body.pull_request.head.repo.full_name;
+        const installationId = req.body.installation.id
 
         const repoUrl = `https://github.com/${repoName}.git`;
         const repoBranchName = `${repoName.replace('/', '_')}_${branchName.replace('/', '_')}`;
         console.log(repoBranchName)
         const imageName = repoBranchName.toLowerCase();
         const containerName = `${imageName}_pr_${prNumber}`.toLowerCase();
+        const forkRepoUrl = `https://github.com/${forkName}.git`;
 
         if (action === 'opened' || action === 'reopened' || action === 'synchronize') {
             try {
                 const preDeployMessage = 'The PR is currently being deployed...'
-                await addPRComment(repoName, prNumber, preDeployMessage);
+                await addPRComment(repoName, prNumber, preDeployMessage, installationId);
 
-                const postDeployMessage = await triggerDeployment(repoUrl, branchName, prNumber, imageName, containerName);
-                await addPRComment(repoName, prNumber, postDeployMessage);
+                const postDeployMessage = await triggerDeployment(repoUrl, branchName, prNumber, imageName, containerName, forkRepoUrl);
+                await addPRComment(repoName, prNumber, postDeployMessage, installationId);
 
                 console.log("Deployment completed and comment added!")
             } catch (error) {
@@ -51,7 +54,7 @@ app.post('/webhook', async (req, res) => {
         else if (action === 'closed') {
             try {
                 const message = await removeDeployedContainer(containerName, imageName);
-                await addPRComment(repoName, prNumber, message);
+                await addPRComment(repoName, prNumber, message, installationId);
                 console.log('Container removed and comment added')
             } catch (error) {
                 console.error('Error during deployment:', error);

diff --git a/services/deploymentService.js b/services/deploymentService.js
@@ -25,7 +25,7 @@ function runCommand(command, args, cwd) {
 }
 
 
-export async function triggerDeployment(repoUrl, branchName, prNumber, imageName, containerName) {
+export async function triggerDeployment(repoUrl, branchName, prNumber, imageName, containerName, forkRepoUrl) {
     const containerPort = process.env.containerPort || 5000
     const hostPort = 9000 + (prNumber % 1000);
     const folderName = imageName
@@ -37,18 +37,39 @@ export async function triggerDeployment(repoUrl, branchName, prNumber, imageName
 
         if (folderExists) {
             console.log('Repository folder exists. Changing directory and checking out branch...');
-            await runCommand(`cd ${folderName} && git checkout`, [branchName]);
-
+            await runCommand(`cd ${folderName} && git fetch --all`);
+            await runCommand(`cd ${folderName} && git branch -a`); // List all branches for debugging
+
+            // Check if the branch exists locally
+            try {
+                await runCommand(`cd ${folderName} && git checkout ${branchName}`);
+            } catch (error) {
+                console.log(`Branch ${branchName} not found locally. Fetching from remote...`);
+                if (forkRepoUrl !== repoUrl) {
+                    await runCommand(`cd ${folderName} && git fetch ${forkRepoUrl} ${branchName}:${branchName}`);
+                    await runCommand(`cd ${folderName} && git checkout ${branchName}`);
+                } else {
+                    throw new Error(`Branch ${branchName} not found and forkRepoUrl is not provided`);
+                }
+            }
+
             console.log('Pulling the remote branch for updates')
-            await runCommand(`git pull origin`, [branchName]);
-        } else {
+            await runCommand(`cd ${folderName} && git checkout ${branchName} && git pull origin ${branchName}`);
+
+            } else {
+
             console.log('Repository folder does not exist. Cloning repository...');
             await runCommand(`git clone`, [repoUrl, `${folderName}`], '.');
-
             console.log('Checking out branch...');
-            await runCommand('git checkout', [branchName], `${folderName}`);
-        }
-
+
+            if (forkRepoUrl !== repoUrl) {
+                    await runCommand(`cd ${folderName} && git fetch ${forkRepoUrl} ${branchName}:${branchName}`);
+                    await runCommand(`cd ${folderName} && git checkout ${branchName}`);
+                } else {
+                    await runCommand('git checkout', [branchName], `${folderName}`);
+                }
+            }
+
         console.log('Building Docker image...');
         await runCommand('docker build -t', [imageName, '.'], `${folderName}`);
 
@@ -59,7 +80,7 @@ export async function triggerDeployment(repoUrl, branchName, prNumber, imageName
         await runCommand('docker run -d --name', [containerName, `-p ${hostPort}:${containerPort}`, imageName]);
 
         // build the URL of the deployed app and return as part of a message
-        const deploymentLink = await getNgrokUrl(hostPort);
+        const deploymentLink = `${process.env.DEPLOYMENT_BASE_URL}:${hostPort}`;
         return `Deployment completed! View it here: ${deploymentLink}`;
 
     } catch (error) {

diff --git a/services/repositoryService.js b/services/repositoryService.js
@@ -7,11 +7,10 @@ import path from "path";
 const WEBHOOK_SECRET = process.env.WEBHOOK_SECRET;
 const APP_ID = process.env.APP_ID;
 const PRIVATE_KEY_PATH = process.env.PRIVATE_KEY_PATH;
-const INSTALLATION_ID = process.env.INSTALLATION_ID;
 
 let encoder = new TextEncoder();
 
-export async function addPRComment(repoName, prNumber, message) {
+export async function addPRComment(repoName, prNumber, message, installationId) {
 
     const privateKeyPath = path.resolve(PRIVATE_KEY_PATH);
     const privateKey = fs.readFileSync(privateKeyPath, "utf8");
@@ -21,7 +20,7 @@ export async function addPRComment(repoName, prNumber, message) {
         auth: {
           appId: APP_ID,
           privateKey: privateKey,
-          installationId: INSTALLATION_ID,
+          installationId,
         },
       });
     const url = `/repos/${repoName}/issues/${prNumber}/comments`;