update now fully work

Author: ZHallen122

…d/src/github/githubWebhook.controller.ts backend/src/github/github.controller.tsbackend/src/github/githubWebhook.controller.ts renamed to backend/src/github/github.controller.ts backend/src/github/githubWebhook.controller.ts renamed to backend/src/github/github.controller.ts

@@ -8,7 +8,7 @@ import { GetUserIdFromToken } from 'src/decorator/get-auth-token.decorator';
 import { UserService } from 'src/user/user.service';
 
 @Controller('github')
-export class GitHubWebhookController {
+export class GitHuController {
   private readonly webhookMiddleware;
 
   constructor(private readonly gitHubAppService: GitHubAppService, private readonly userService: UserService) {
@@ -27,10 +27,10 @@ export class GitHubWebhookController {
 
     return this.webhookMiddleware(req, res, (error?: any) => {
       if (error) {
-        console.error('⚠️ Webhook middleware error:', error);
+        console.error('Webhook middleware error:', error);
         return res.status(500).send('Internal Server Error');
       } else {
-        console.log('✅ Middleware processed request');
+        console.log('Middleware processed request');
         return res.sendStatus(200);
       }
     });

backend/src/github/github.module.ts

@@ -11,7 +11,7 @@ import { GitHubAppService } from './githubApp.service';
 import { GitHubService } from './github.service';
 import { Project } from 'src/project/project.model';
 import { ProjectPackages } from 'src/project/project-packages.model';
-import { GitHubWebhookController } from './githubWebhook.controller';
+import { GitHuController } from './github.controller';
 import { ProjectService } from 'src/project/project.service';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { UserService } from 'src/user/user.service';
@@ -24,7 +24,7 @@ import { UserService } from 'src/user/user.service';
     UploadModule,
     ConfigModule
   ],
-  controllers: [GitHubWebhookController],
+  controllers: [GitHuController],
   providers: [ProjectService, ProjectGuard, GitHubAppService, GitHubService, ConfigService, ChatService, UserService],
   exports: [GitHubService],
 })

backend/src/github/github.service.ts

@@ -6,15 +6,24 @@ import axios from 'axios';
 import * as fs from 'fs';
 import * as path from 'path';
 import { ConfigService } from '@nestjs/config';
+import { Project } from 'src/project/project.model';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
 
 @Injectable()
 export class GitHubService {
   private readonly logger = new Logger(GitHubService.name);
-
+  
   private readonly appId: string;
   private privateKey: string;
+  private ignored = ['node_modules', '.git', '.gitignore', '.env'];
+
+  constructor(
+    private configService: ConfigService,     
+    @InjectRepository(Project)
+    private projectsRepository: Repository<Project>,) 
+  {
 
-  constructor(private configService: ConfigService) {
     this.appId = this.configService.get<string>('GITHUB_APP_ID');
 
     const privateKeyPath = this.configService.get<string>('GITHUB_PRIVATE_KEY_PATH');
@@ -102,19 +111,16 @@ export class GitHubService {
    * If you need an org-level repo, use POST /orgs/{org}/repos.
   */
   async createUserRepo(
-    installationToken: string,
     repoName: string,
     isPublic: boolean,
-    githubCode: string,
+    userOAuthToken: string,
   ): Promise<{
     owner: string;
     repo: string;
     htmlUrl: string;
   }> {
     const url = `https://api.github.com/user/repos`;
 
-    const userOAuthToken = await this.exchangeOAuthCodeForToken(githubCode);
-
     const response = await axios.post(
       url,
       {
@@ -128,6 +134,7 @@ export class GitHubService {
         },
       },
     );
+
     // The response will have data about the new repo
     const data = response.data;
     return {
@@ -151,7 +158,7 @@ export class GitHubService {
     }
   }
 
-    /**
+  /**
    * Push a single file to the given path in the repo using GitHub Contents API.
    * 
    * @param relativePathInRepo e.g. "backend/index.js" or "frontend/package.json"
@@ -200,6 +207,12 @@ export class GitHubService {
       const entries = fs.readdirSync(folderPath, { withFileTypes: true });
 
       for (const entry of entries) {
+
+        // Skip unwanted files
+        if (this.ignored.includes(entry.name)) {
+          continue;
+        }
+
         const entryPath = path.join(folderPath, entry.name);
         if (entry.isDirectory()) {
           // Skip unwanted directories

backend/src/github/githubApp.service.ts

@@ -63,16 +63,15 @@ export class GitHubAppService {
 
       this.logger.log(`uninstall Created: installationId=${installationId}, GitHub Login=`);
 
+      // remove user github code and installationId 
       await this.userRepo.update(
         { githubInstallationId: installationId }, 
         { githubInstallationId: null,
           githubCode: null
         }
       );
-      this.logger.log(`Cleared installationId for user: ${installationId}`);
-      
 
-      // e.g. clear the installation ID in your DB
+      this.logger.log(`Cleared installationId for user: ${installationId}`);
     });
 
     // Handle errors
@@ -84,11 +83,10 @@ export class GitHubAppService {
       }
     });
 
+    // only for webhooks debugging 
     this.app.webhooks.onAny(async (event) => {
-      this.logger.log(`🔥 onAny: Received event='${event.name}' action='${event.payload}'`);
+      this.logger.log(`onAny: Received event='${event.name}' action='${event.payload}'`);
     });
-    
-    
   }
 
   /**

backend/src/project/project.service.ts

@@ -808,19 +808,21 @@ export class ProjectService {
       user.githubInstallationId,
     );
 
+    const githubCode = user.githubCode;
+    const userOAuthToken = await this.gitHubService.exchangeOAuthCodeForToken(githubCode);
+
     // 4) Create the repo if the project doesn’t have it yet
     if (!project.githubRepoName || !project.githubOwner) {
       // Use project.projectName or generate a safe name
       const repoName = project.projectName
         .replace(/\s+/g, '-')
         .toLowerCase() // e.g. "my-project"
-        + '-' + Date.now(); // to make it unique if needed
+        + '-' + project.githubOwner; // to make it unique if needed
 
       const { owner, repo, htmlUrl } = await this.gitHubService.createUserRepo(
-        installationToken,
         repoName,
         isPublic,
-        user.githubCode
+        userOAuthToken
       );
 
       project.githubRepoName = repo;
@@ -832,6 +834,8 @@ export class ProjectService {
     //    If your projectPath is something like "/path/to/myProject",
     //    we'll just push everything inside it, ignoring .git, node_modules, etc.
     const projectPath = getProjectPath(project.projectPath);
+
+    // delete await for now, To make it background running
     await this.gitHubService.pushFolderContent(
       installationToken,
       project.githubOwner,