Refactor GitHub stats handling and streamline issue fetching

- Renamed `refreshGithubStats` to `refreshGithub` for clarity.
- Consolidated issue fetching logic into the `refreshGithub` function, removing the now redundant `refreshRepositoryIssues` function.
- Updated the queue handling in `index.ts` to reflect the function name change and removed the call to the obsolete `refreshRepositoryIssues`.

These changes enhance the organization of the code and improve the efficiency of GitHub stats processing.

Author: shyim

src/handlers.ts

@@ -57,7 +57,7 @@ export const githubIssueWebhook = async (c: Context<{ Bindings: Env }>) => {
 };
 
 // Background refreshers
-export const refreshGithubStats = async (context: AppContext) => {
+export const refreshGithub = async (context: AppContext) => {
   console.log('Fetching repositories and queueing GitHub stats tasks');
   const githubService = new GitHubService(context);
   const cacheService = new CacheService(context.env);
@@ -84,6 +84,13 @@ export const refreshGithubStats = async (context: AppContext) => {
       repo: repo.name,
       timestamp: Date.now()
     } as GitHubTaskMessage);
+
+    await context.env.GITHUB_QUEUE.send({
+      type: 'fetch-repository-issues',
+      owner: repo.owner.login,
+      repo: repo.name,
+      timestamp: Date.now()
+    } as GitHubTaskMessage);
   }
 
   // Queue a task to process all contributor data after the individual tasks
@@ -102,25 +109,6 @@ export const refreshGithubStats = async (context: AppContext) => {
   console.log('Queued GitHub stats tasks for all repositories');
 };
 
-export const refreshRepositoryIssues = async (context: AppContext) => {
-  console.log('Queueing Repository Issues refresh tasks');
-  const cacheService = new CacheService(context.env);
-  
-  const repos = await cacheService.getRepositories();
-  
-  // Queue issue fetching for each repository
-  for (const repo of repos) {
-    await context.env.GITHUB_QUEUE.send({
-      type: 'fetch-repository-issues',
-      owner: repo.owner.login,
-      repo: repo.name,
-      timestamp: Date.now()
-    } as GitHubTaskMessage);
-  }
-  
-  console.log('Queued Repository Issues tasks');
-};
-
 export const refreshPackagistStats = async (context: AppContext) => {
   console.log('Refreshing Packagist Stats');
   const packagistService = new PackagistService();

src/index.ts

@@ -8,8 +8,7 @@ import {
   listRepositoryIssues,
   listPackages,
   githubIssueWebhook,
-  refreshGithubStats,
-  refreshRepositoryIssues,
+  refreshGithub,
   refreshPackagistStats
 } from './handlers';
 import { processGitHubTasks } from './queue';
@@ -51,7 +50,10 @@ export default {
 
   // Queue handler - must be declared as a function, not an object
   async queue(batch: MessageBatch<GitHubTaskMessage>, env: Env, ctx: ExecutionContext) {
-    await processGitHubTasks(batch, env);
+    // Get the queue name from the batch
+    if (batch.queue === 'github-tasks') {
+      await processGitHubTasks(batch, env);
+    }
   },
 
   // Handle scheduled events
@@ -67,10 +69,8 @@ export default {
     // Determine which refresh operation to perform based on cron schedule
     if (controller.cron === '0 * * * *') {
       console.log('Starting Github Stats hourly job');
-      // Hourly jobs
-      await refreshGithubStats(context);
+      await refreshGithub(context);
       await refreshPackagistStats(context);
-      await refreshRepositoryIssues(context);
     }
   }
 };