Add week and status filtering for bulk approval and merge handlers; enhance PR field retrieval

Author: DaleSeo

handlers/approve_prs.js

@@ -4,6 +4,7 @@ import {
   parsePrActionPayload,
   fetchOpenPullRequests,
   filterTargetPrs,
+  filterByWeekAndStatus,
   getSkipReason,
   formatResult,
   safeJson,
@@ -25,10 +26,15 @@ export async function approvePrs(request, env) {
       return payload.response;
     }
 
-    const { repoOwner, repoName, excludes } = payload.data;
+    const { repoOwner, repoName, week, excludes } = payload.data;
     const appToken = await generateGitHubAppToken(env);
     const openPrs = await fetchOpenPullRequests(repoOwner, repoName, appToken);
-    const targetPrs = filterTargetPrs(openPrs, excludes);
+
+    // Week와 Status 필터링
+    const { filtered: weekFilteredPrs, weekMismatched, solvingExcluded } =
+      await filterByWeekAndStatus(openPrs, week, repoOwner, repoName, appToken);
+
+    const targetPrs = filterTargetPrs(weekFilteredPrs, excludes);
 
     const results = [];
     let approved = 0;
@@ -74,7 +80,11 @@ export async function approvePrs(request, env) {
       success: true,
       action: "approve",
       repo: `${repoOwner}/${repoName}`,
+      week_filter: week,
       total_open_prs: openPrs.length,
+      week_matched: weekFilteredPrs.length,
+      week_mismatched: weekMismatched,
+      solving_excluded: solvingExcluded,
       processed: targetPrs.length,
       approved,
       skipped,

handlers/merge_prs.js

@@ -4,6 +4,7 @@ import {
   parsePrActionPayload,
   fetchOpenPullRequests,
   filterTargetPrs,
+  filterByWeekAndStatus,
   getSkipReason,
   formatResult,
   safeJson,
@@ -26,7 +27,7 @@ export async function mergePrs(request, env) {
       return payload.response;
     }
 
-    const { repoOwner, repoName, excludes, rawPayload } = payload.data;
+    const { repoOwner, repoName, week, excludes, rawPayload } = payload.data;
     const mergeMethod = (rawPayload.merge_method || "merge").toLowerCase();
 
     if (!ALLOWED_MERGE_METHODS.has(mergeMethod)) {
@@ -40,7 +41,12 @@ export async function mergePrs(request, env) {
 
     const appToken = await generateGitHubAppToken(env);
     const openPrs = await fetchOpenPullRequests(repoOwner, repoName, appToken);
-    const targetPrs = filterTargetPrs(openPrs, excludes);
+
+    // Week와 Status 필터링
+    const { filtered: weekFilteredPrs, weekMismatched, solvingExcluded } =
+      await filterByWeekAndStatus(openPrs, week, repoOwner, repoName, appToken);
+
+    const targetPrs = filterTargetPrs(weekFilteredPrs, excludes);
 
     const results = [];
     let merged = 0;
@@ -120,7 +126,11 @@ export async function mergePrs(request, env) {
       success: true,
       action: "merge",
       repo: `${repoOwner}/${repoName}`,
+      week_filter: week,
       total_open_prs: openPrs.length,
+      week_matched: weekFilteredPrs.length,
+      week_mismatched: weekMismatched,
+      solving_excluded: solvingExcluded,
       processed: targetPrs.length,
       merged,
       skipped,

utils/prActions.js

@@ -5,6 +5,7 @@
 import { errorResponse } from "./cors.js";
 import { getGitHubHeaders } from "./github.js";
 import { validateOrganization, hasMaintenanceLabel } from "./validation.js";
+import { getProjectFields } from "./prWeeks.js";
 
 /**
  * 공통 payload 파서
@@ -14,6 +15,7 @@ export async function parsePrActionPayload(request) {
     const data = await request.json();
     const repoOwner = data.repo_owner || "DaleStudy";
     const repoName = data.repo_name;
+    const week = data.week;
 
     if (!repoName) {
       return {
@@ -25,6 +27,17 @@ export async function parsePrActionPayload(request) {
       };
     }
 
+    // week 필수 검증
+    if (!week) {
+      return {
+        valid: false,
+        response: errorResponse(
+          "Missing required field: week (e.g., 'Week 8')",
+          400
+        ),
+      };
+    }
+
     if (!validateOrganization(repoOwner)) {
       return {
         valid: false,
@@ -39,6 +52,7 @@ export async function parsePrActionPayload(request) {
       data: {
         repoOwner,
         repoName,
+        week,
         excludes,
         rawPayload: data,
       },
@@ -110,6 +124,8 @@ export function formatResult(pr, result) {
   return {
     pr: pr.number,
     title: pr.title,
+    week: pr.week || null,
+    status: pr.status || null,
     ...result,
   };
 }
@@ -158,3 +174,61 @@ function parseNumberArray(value) {
     .map((n) => parseInt(n, 10))
     .filter((n) => Number.isInteger(n));
 }
+
+/**
+ * Week 값 매칭 (Week 8 == Week 8(current))
+ */
+export function matchesWeek(actualWeek, expectedWeek) {
+  if (!actualWeek) return false;
+
+  // 정확히 일치
+  if (actualWeek === expectedWeek) return true;
+
+  // "Week 8(current)" 형태도 매칭
+  if (actualWeek.startsWith(expectedWeek + "(")) return true;
+  if (expectedWeek.startsWith(actualWeek.replace(/\(current\)$/, "").trim())) return true;
+
+  return false;
+}
+
+/**
+ * Week와 Status로 PR 필터링
+ * - Week 필터링: 지정된 Week만
+ * - Status 필터링: "Solving" 상태 제외
+ *
+ * @returns {Promise<{filtered: Array, weekMismatched: number, solvingExcluded: number}>}
+ */
+export async function filterByWeekAndStatus(pullRequests, weekFilter, repoOwner, repoName, appToken) {
+  const filtered = [];
+  let weekMismatched = 0;
+  let solvingExcluded = 0;
+
+  for (const pr of pullRequests) {
+    // 프로젝트 필드 조회 (Week, Status)
+    const fields = await getProjectFields(repoOwner, repoName, pr.number, appToken);
+
+    // PR 객체에 Week와 Status 메타데이터 추가
+    pr.week = fields.week;
+    pr.status = fields.status;
+
+    // Week 필터링
+    if (!matchesWeek(fields.week, weekFilter)) {
+      weekMismatched++;
+      continue;
+    }
+
+    // Status "Solving" 제외
+    if (fields.status === "Solving") {
+      solvingExcluded++;
+      continue;
+    }
+
+    filtered.push(pr);
+  }
+
+  return {
+    filtered,
+    weekMismatched,
+    solvingExcluded,
+  };
+}

utils/prWeeks.js

@@ -5,10 +5,11 @@
 import { generateGitHubAppToken, getGitHubHeaders } from "./github.js";
 
 /**
- * PR의 Week 값 조회 (GraphQL)
+ * PR의 프로젝트 필드 값 조회 (Week, Status 등)
+ * @returns {Promise<{week: string|null, status: string|null}>}
  */
-export async function getWeekValue(repoOwner, repoName, prNumber, appToken) {
-  const weekQuery = `
+export async function getProjectFields(repoOwner, repoName, prNumber, appToken) {
+  const query = `
     query {
       repository(owner: "${repoOwner}", name: "${repoName}") {
         pullRequest(number: ${prNumber}) {
@@ -25,6 +26,14 @@ export async function getWeekValue(repoOwner, repoName, prNumber, appToken) {
                       }
                     }
                   }
+                  ... on ProjectV2ItemFieldSingleSelectValue {
+                    name
+                    field {
+                      ... on ProjectV2FieldCommon {
+                        name
+                      }
+                    }
+                  }
                 }
               }
             }
@@ -37,26 +46,45 @@ export async function getWeekValue(repoOwner, repoName, prNumber, appToken) {
   const response = await fetch("https://api.github.com/graphql", {
     method: "POST",
     headers: { ...getGitHubHeaders(appToken), "Content-Type": "application/json" },
-    body: JSON.stringify({ query: weekQuery }),
+    body: JSON.stringify({ query }),
   });
 
   const data = await response.json();
   const projectItems =
     data.data?.repository?.pullRequest?.projectItems?.nodes || [];
 
+  const result = { week: null, status: null };
+
   for (const item of projectItems) {
     const fieldValues = item.fieldValues?.nodes || [];
     for (const field of fieldValues) {
+      // Week 필드 (Iteration 타입)
       if (
         field.__typename === "ProjectV2ItemFieldIterationValue" &&
         field.field?.name === "Week"
       ) {
-        return field.title;
+        result.week = field.title;
+      }
+      // Status 필드 (SingleSelect 타입)
+      if (
+        field.__typename === "ProjectV2ItemFieldSingleSelectValue" &&
+        field.field?.name === "Status"
+      ) {
+        result.status = field.name;
       }
     }
   }
 
-  return null;
+  return result;
+}
+
+/**
+ * PR의 Week 값 조회 (GraphQL)
+ * @deprecated Use getProjectFields() for better performance
+ */
+export async function getWeekValue(repoOwner, repoName, prNumber, appToken) {
+  const fields = await getProjectFields(repoOwner, repoName, prNumber, appToken);
+  return fields.week;
 }
 
 /**
@@ -172,7 +200,8 @@ export async function removeWarningComment(repoOwner, repoName, prNumber, env) {
  * @returns {Promise<string|null>} Week 값 또는 null
  */
 export async function handleWeekComment(repoOwner, repoName, prNumber, env, appToken) {
-  const weekValue = await getWeekValue(repoOwner, repoName, prNumber, appToken);
+  const fields = await getProjectFields(repoOwner, repoName, prNumber, appToken);
+  const weekValue = fields.week;
 
   if (!weekValue) {
     await ensureWarningComment(repoOwner, repoName, prNumber, env);