Merge branch 'sujin' of https://github.com/planet-devo-k/solveit into sujin

Author: pappaya109

.github/INFRASTRUCTURE.md

@@ -0,0 +1,13 @@
+# Infrastructure
+
+## Commit Convention
+
+이 레포의 인프라/자동화 작업에 사용하는 커밋 타입입니다.
+
+| Type       | Description                                    | Example                                       |
+| ---------- | ---------------------------------------------- | --------------------------------------------- |
+| `feat`     | 새로운 스크립트, 워크플로우, 자동화 기능 추가  | `feat: add goal track automation`             |
+| `refactor` | 기존 스크립트/워크플로우 구조 변경 (동작 동일) | `refactor: move milestone_id to session data` |
+| `fix`      | 스크립트/워크플로우 버그 수정                  | `fix: correct template placeholder mismatch`  |
+| `chore`    | 설정, 의존성, 환경 변수 등 단순 변경           | `chore: update secrets config`                |
+| `docs`     | 문서 추가/수정 (README, 템플릿 등)             | `docs: add infrastructure guide`              |

.github/ISSUE_TEMPLATE/goal_track_session.md

@@ -1,5 +1,5 @@
 ---
-name: "goal track"
+name: "Goal Track"
 about: "Use this template for using issues as goal tracking items."
 duration: "10 weeks"
 title: "`Session: Week ~ Week` Programmers level0 / level1"
@@ -15,9 +15,7 @@ labels:
 # Goal
 
 **Duration**: {{duration}} weeks {{start_date}} ~ {{end_date}}
-
 **Description**: Solve 3 coding challenges from Programmers Level {{levels}} every week.
-
 **Deadline**: {{end_date}} SUN
 
 ## This Session Challenges

.github/ISSUE_TEMPLATE/goal_track_week.md

@@ -1,5 +1,5 @@
 ---
-name: "goal track week"
+name: "Goal Track Week"
 about: "Use this template for using issues as weekly goal tracking items."
 title: "`Week`"
 assignees: "sgoldenbird"
@@ -12,10 +12,8 @@ labels:
 
 # Goal
 
-**Week**: {{start_date}} ~ {{end_date}}
-
+**Period**: {{start_date}} ~ {{end_date}}
 **Description**: Solve 3 coding challenges from Programmers Level {{levels}}.
-
 **Deadline**: {{end_date}}
 
 ## This Week Challenges

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,40 +1,41 @@
-### Source Link
+## Source
 
 [Programmers](https://school.programmers.co.kr/learn/challenges?order=recent&levels=0&languages=javascript&page=1)
 
-### Progress
-
-Check off the problems you solved this week.
+## Progress
 
 - [x] 문자열 출력하기
 - [x]
 - [x]
 
-### Related Issues
+## Related Issues & Questions
 
 <!--
-- [관련 이슈 번호, e.g., question #123]
+- [관련 이슈 번호, e.g. #123]
 - 없으면 none
 -->
 
 - none
 
-### Checklist before creating a PR
+## Checklist 
 
-- [ ] 제목이 `week1` 형식을 따르고 있나요?
-- [ ] 본인을 Assignee로 지정했나요?
-- [ ] Reviewers를 직접 지정하지 **마세요**. 커스텀 로직으로 자동 배정됩니다.
-- [ ] 관련 라벨(source, difficulty, category 등)을 모두 추가했나요?
+- [ ] PR 제목을 `week1` 형식에 맞춰 작성했습니다.
+- [ ] 본인을 Assignee로 지정했습니다.
+- [ ] Reviewers를 직접 지정하지 **마세요.** 커스텀 로직으로 자동 배정됩니다.
+- [ ] 관련 라벨(source, difficulty, category 등)을 모두 추가했습니다.
 - [ ] Projects에 연결하지 **마세요**.
 - [ ] Milestone에 연결하지 **마세요**.
-- [ ] Development의 해당 week(issue)에 연결했나요?
+- [ ] Development 항목에 해당 주차(week) 이슈를 연결했습니다.
+
 
 <!-- 영어
-- [ ] Is the PR title following the `week1` format?
-- [ ] Have you assigned yourself as the Assignee?
-- [ ] Have all relevant labels (source, difficulty, category, etc.) been added?
-- [ ] Do **NOT** link the PR to Projects.
-- [ ] Do **NOT** link the PR to a Milestone.
-- [ ] Is the appropriate week linked as a Milestone?
-- [ ] Is the appropriate week linked under Development?
+- [ ] The PR title follows the `week1` format.
+- [ ] I have assigned myself as the Assignee.
+- [ ] I did not manually assign Reviewers. (They will be auto-assigned with custom logic)
+- [ ] All relevant labels (source, difficulty, category, etc.) have been added.
+- [ ] I did **NOT** link the PR to Projects.
+- [ ] I did **NOT** link the PR to a Milestone.
+- [ ] I did not link the PR to Projects.
+- [ ] I did not link the PR to a Milestone.
+- [ ] The appropriate week is linked under the Development section.
 -->

.github/data/session/session_6.json

@@ -1,19 +1,25 @@
 {
   "id": 6,
   "levels": [0, 1],
+  "milestone_id": 1,
+  "parent_issue_number": 143,
+  "duration": 10,
   "weeks": [50, 51, 52, 53, 54, 55, 56, 57, 58, 59],
   "date": {
     "start": "2026-03-15",
     "end": "2026-05-29"
   },
+  "absentees": [
+    { "name": "홍길동", "status": "absent", "type": "medical" },
+    { "name": "김철수", "status": "late", "type": "authorized" }
+  ],
   "challenges": [
     {
       "week": 50,
       "date": {
-        "start": "2026-03-15",
+        "start": "2026-04-02",
         "end": "2026-04-19"
       },
-      "absentees": [],
       "list": [
         {
           "name": "두 수의 합",
@@ -35,7 +41,6 @@
         "start": "2026-04-20",
         "end": "2026-04-26"
       },
-      "absentees": [],
       "list": [
         {
           "name": "문제A",
@@ -57,7 +62,6 @@
         "start": "2026-04-20",
         "end": "2026-04-26"
       },
-      "absentees": [],
       "list": [
         {
           "name": "문제A",

.github/data/warnings.json

@@ -0,0 +1,8 @@
+{
+  "1483775665307389983": {
+    "count": 0,
+    "types": [],
+    "messages": [],
+    "isConfirmed": []
+  }
+}

.github/scripts/alert-deadline.js

@@ -0,0 +1,144 @@
+import { MEMBERS, STUDY_CONFIG } from "./utils/constants.js";
+import { getKSTDateString } from "./utils/date.js";
+import { getLatestSessionData } from "./utils/session.js";
+import { createDiscordTable } from "./utils/formatter.js";
+import { getThisWeekPRs } from "./utils/github.js";
+
+export default async ({ github, context, core, test }) => {
+  const { RULES } = STUDY_CONFIG;
+  const { MIN_REVIEWS_REQUIRED } = RULES;
+
+  try {
+    const sessionData = getLatestSessionData();
+
+    let currentWeekInfo;
+
+    if (test !== null) {
+      currentWeekInfo = sessionData.challenges.find((c) => c.week === test);
+      if (!currentWeekInfo) {
+        console.warn(`테스트 주차(${test})를 찾을 수 없습니다.`);
+        return;
+      }
+      console.log(`[테스트 모드] ${test}주차 강제 지정`);
+    } else {
+      const nowStr = getKSTDateString(new Date());
+      currentWeekInfo = sessionData.challenges.find(
+        (c) => nowStr >= c.date.start && nowStr <= c.date.end,
+      );
+      if (!currentWeekInfo) {
+        console.log(`(${nowStr})는 현재 스터디 진행 기간이 아닙니다.`);
+        return;
+      }
+    }
+
+    console.log(`${currentWeekInfo.week}주차 PR 마감 사전 경고 시작`);
+
+    const thisMonday = new Date(currentWeekInfo.date.start);
+    const thisSunday = new Date(currentWeekInfo.date.end);
+    const reviewDeadline = new Date(thisSunday.getTime() + 20 * 60 * 60 * 1000);
+
+    const thisWeekPRs = await getThisWeekPRs({
+      github,
+      context,
+      startDate: thisMonday,
+      endDate: thisSunday,
+    });
+
+    const memberStatus = {};
+    MEMBERS.forEach((member) => {
+      memberStatus[member.githubId] = {
+        name: member.name,
+        githubId: member.githubId,
+        discordId: member.discordId,
+        submitted: false,
+        reviewPrCount: 0,
+        hasMetReviewQuota: false,
+      };
+    });
+
+    // ─── PR 제출 + 리뷰 집계 ───
+    await Promise.all(
+      thisWeekPRs.map(async (pr) => {
+        const author = pr.user.login;
+
+        if (memberStatus[author]) {
+          memberStatus[author].submitted = true;
+        }
+
+        const { data: reviews } = await github.rest.pulls.listReviews({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          pull_number: pr.number,
+        });
+
+        const validReviews = reviews.filter((r) => {
+          const submittedAt = new Date(r.submitted_at);
+          return submittedAt >= thisMonday && submittedAt <= reviewDeadline;
+        });
+
+        const uniqueReviewersOnPr = new Set(
+          validReviews.map((r) => r.user.login),
+        );
+
+        uniqueReviewersOnPr.forEach((reviewerId) => {
+          const isStudyMember = memberStatus[reviewerId];
+          const isNotOwnPr = reviewerId !== author;
+          if (isStudyMember && isNotOwnPr) {
+            memberStatus[reviewerId].reviewPrCount++;
+          }
+        });
+      }),
+    );
+
+    const memberIds = MEMBERS.map((m) => m.githubId);
+    memberIds.forEach((id) => {
+      const status = memberStatus[id];
+      if (status.reviewPrCount >= MIN_REVIEWS_REQUIRED) {
+        status.hasMetReviewQuota = true;
+      }
+    });
+
+    // ─── 미수행자 필터링 (PR 미제출 또는 리뷰 미달) ───
+    const incompleteMembers = Object.values(memberStatus).filter(
+      (m) => !(m.submitted && m.hasMetReviewQuota),
+    );
+
+    const tableConfig = {
+      headers: ["이름", "PR 제출", "리뷰(PR 기준)"],
+      paddings: [6, 9, 6],
+      renderRow: (id) => {
+        const s = memberStatus[id];
+        return {
+          name: s.name || id,
+          prStatus: s.submitted ? `✅ [PR](${s.prUrl})` : "❌",
+          reviewStatus: `${s.reviewPrCount}/${MIN_REVIEWS_REQUIRED}`,
+        };
+      },
+    };
+
+    const incompleteTable =
+      incompleteMembers.length > 0
+        ? createDiscordTable(
+            incompleteMembers.map((m) => m.githubId),
+            tableConfig,
+          )
+        : null;
+
+    if (incompleteMembers.length === 0) {
+      console.log("모든 멤버가 과제를 완료했습니다.");
+    } else {
+      console.log(
+        `미수행자: ${incompleteMembers.map((m) => m.name).join(", ")}`,
+      );
+    }
+
+    return {
+      incompleteTable,
+      incompleteMembers,
+    };
+  } catch (error) {
+    console.error("PR 마감 경고 집계 실패:", error.message);
+    core.setFailed(error.message);
+    throw error;
+  }
+};

.github/scripts/assign_reviewers.js .github/scripts/assign-reviewers.js.github/scripts/assign_reviewers.js renamed to .github/scripts/assign-reviewers.js

@@ -1,10 +1,11 @@
-import sessionData from "../data/session/session_6.json" with { type: "json" };
 import { MEMBERS, STUDY_CONFIG } from "./utils/constants.js";
 import { getThisWeekPRs, requestReviewers } from "./utils/github.js";
 import { shuffleArray } from "./utils/math.js";
 import { getKSTDateString } from "./utils/date.js";
+import { getLatestSessionData } from "./utils/session.js";
 
 export default async ({ github, context, core }) => {
+  const sessionData = getLatestSessionData();
   const { RULES } = STUDY_CONFIG;
   const { MIN_REVIEWS_REQUIRED } = RULES;
   const repo = context.repo.repo;
@@ -14,14 +15,17 @@ export default async ({ github, context, core }) => {
   const prNumber = currentPR.number;
 
   try {
-    if (currentPR.requested_reviewers?.length > 0) {
-      const existingReviewers = currentPR.requested_reviewers
-        .map((r) => {
-          const member = MEMBERS.find((m) => m.githubId === r.login);
-          return member ? member.name : r.login;
-        })
-        .join(", ");
+    const { data: existingReviewers } = await github.rest.pulls.listReviews({
+      owner: repoOwner,
+      repo,
+      pull_number: prNumber,
+    });
+
+    const hasExternalReviewers = existingReviewers.some(
+      (r) => r.user.login !== prOwner,
+    );
 
+    if (currentPR.requested_reviewers?.length > 0 || hasExternalReviewers) {
       console.log("이미 리뷰어가 배정되어 있어 기존 목록을 유지합니다.");
       return null;
     }
@@ -39,8 +43,7 @@ export default async ({ github, context, core }) => {
     const thisWeekPRs = await getThisWeekPRs({
       github,
       context,
-      startDate: new Date(currentWeekInfo.date.start),
-      endDate: new Date(currentWeekInfo.date.end),
+      currentWeek: currentWeekInfo.week,
     });
 
     const reviewCounts = {};
@@ -81,12 +84,25 @@ export default async ({ github, context, core }) => {
 
     let candidates = MEMBERS.filter((m) => m.githubId !== prOwner);
 
-    candidates = shuffleArray(candidates);
-    candidates.sort(
-      (a, b) => reviewCounts[a.githubId] - reviewCounts[b.githubId],
-    );
+    const grouped = {};
+    candidates.forEach((c) => {
+      const count = reviewCounts[c.githubId];
+      if (!grouped[count]) grouped[count] = [];
+      grouped[count].push(c);
+    });
+
+    const sorted = Object.keys(grouped)
+      .sort((a, b) => a - b)
+      .flatMap((count) => {
+        const s = shuffleArray(grouped[count]);
+        console.log(
+          "shuffled:",
+          s.map((m) => m.name),
+        );
+        return s;
+      });
 
-    const selectedReviewers = candidates.slice(0, 2);
+    const selectedReviewers = sorted.slice(0, MIN_REVIEWS_REQUIRED);
 
     const selectedReviewersGithubId = selectedReviewers.map((m) => m.githubId);