Skip to content

Commit 54125e6

Browse files
soobingsoobing
authored
Merge pull request #18 from DaleStudy/revert/pr-13
revert: PR #13 (๊ธฐ์ˆ˜ ํ”„๋กœ์ ํŠธ ๊ธฐ๋ฐ˜ ํ•™์Šต ํ˜„ํ™ฉ ์ง‘๊ณ„) ์›๋ณต
2 parents 39afce3 + fc038bf commit 54125e6

File tree

2 files changed

+4
-192
lines changed

2 files changed

+4
-192
lines changed

โ€Žhandlers/learning-status.jsโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import {
99
fetchProblemCategories,
10-
fetchCohortUserSolutions,
10+
fetchUserSolutions,
1111
fetchPRSubmissions,
1212
} from "../utils/learningData.js";
1313
import { generateApproachAnalysis } from "../utils/openai.js";
@@ -88,10 +88,10 @@ export async function postLearningStatus(
8888
return { skipped: "no-categories-file" };
8989
}
9090

91-
// 2. ์ด๋ฒˆ ๊ธฐ์ˆ˜์—์„œ ์‚ฌ์šฉ์ž๊ฐ€ ์ œ์ถœํ•œ ํ’€์ด ๋ชฉ๋ก ์กฐํšŒ
92-
const solvedProblems = await fetchCohortUserSolutions(repoOwner, repoName, username, appToken);
91+
// 2. ์‚ฌ์šฉ์ž์˜ ๋ˆ„์  ํ’€์ด ๋ชฉ๋ก ์กฐํšŒ
92+
const solvedProblems = await fetchUserSolutions(repoOwner, repoName, username, appToken);
9393
console.log(
94-
`[learningStatus] PR #${prNumber}: ${username} has ${solvedProblems.length} solutions in current cohort`
94+
`[learningStatus] PR #${prNumber}: ${username} has ${solvedProblems.length} cumulative solutions`
9595
);
9696

9797
// 3. ์ด๋ฒˆ PR ์ œ์ถœ ํŒŒ์ผ ๋ชฉ๋ก ์กฐํšŒ

โ€Žutils/learningData.jsโ€Ž

Lines changed: 0 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -4,194 +4,6 @@
44

55
import { getGitHubHeaders } from "./github.js";
66

7-
const GITHUB_GRAPHQL_URL = "https://api.github.com/graphql";
8-
const COHORT_PROJECT_PATTERN = /๋ฆฌํŠธ์ฝ”๋“œ ์Šคํ„ฐ๋””\s*\d+๊ธฐ/;
9-
10-
/**
11-
* GitHub GraphQL API ํ˜ธ์ถœ ํ—ฌํผ
12-
*
13-
* @param {string} query
14-
* @param {string} appToken
15-
* @returns {Promise<object>}
16-
*/
17-
async function graphql(query, appToken) {
18-
const response = await fetch(GITHUB_GRAPHQL_URL, {
19-
method: "POST",
20-
headers: {
21-
...getGitHubHeaders(appToken),
22-
"Content-Type": "application/json",
23-
},
24-
body: JSON.stringify({ query }),
25-
});
26-
27-
if (!response.ok) {
28-
throw new Error(`GraphQL request failed: ${response.status} ${response.statusText}`);
29-
}
30-
31-
const result = await response.json();
32-
if (result.errors) {
33-
throw new Error(`GraphQL error: ${JSON.stringify(result.errors)}`);
34-
}
35-
36-
return result.data;
37-
}
38-
39-
/**
40-
* ํ˜„์žฌ ์ง„ํ–‰ ์ค‘์ธ ๊ธฐ์ˆ˜ ํ”„๋กœ์ ํŠธ ID๋ฅผ ์กฐํšŒํ•œ๋‹ค.
41-
* "๋ฆฌํŠธ์ฝ”๋“œ ์Šคํ„ฐ๋””X๊ธฐ" ํŒจํ„ด์˜ ์—ด๋ฆฐ ํ”„๋กœ์ ํŠธ๋ฅผ ์ฐพ๋Š”๋‹ค.
42-
*
43-
* @param {string} repoOwner
44-
* @param {string} repoName
45-
* @param {string} appToken
46-
* @returns {Promise<string|null>} ํ”„๋กœ์ ํŠธ node ID, ์—†์œผ๋ฉด null
47-
*/
48-
async function fetchActiveCohortProjectId(repoOwner, repoName, appToken) {
49-
const data = await graphql(
50-
`{
51-
repository(owner: "${repoOwner}", name: "${repoName}") {
52-
projectsV2(first: 20) {
53-
nodes {
54-
id
55-
title
56-
closed
57-
}
58-
}
59-
}
60-
}`,
61-
appToken
62-
);
63-
64-
const projects = data.repository.projectsV2.nodes;
65-
const active = projects.find(
66-
(p) => !p.closed && COHORT_PROJECT_PATTERN.test(p.title)
67-
);
68-
69-
if (!active) {
70-
console.warn(
71-
`[fetchActiveCohortProjectId] No open cohort project found for ${repoOwner}/${repoName}`
72-
);
73-
return null;
74-
}
75-
76-
console.log(
77-
`[fetchActiveCohortProjectId] Active cohort project: "${active.title}" (${active.id})`
78-
);
79-
return active.id;
80-
}
81-
82-
/**
83-
* ๊ธฐ์ˆ˜ ํ”„๋กœ์ ํŠธ์—์„œ ํ•ด๋‹น ์œ ์ €๊ฐ€ ๋จธ์ง€ํ•œ PR ๋ฒˆํ˜ธ ๋ชฉ๋ก์„ ๋ฐ˜ํ™˜ํ•œ๋‹ค.
84-
* ํ”„๋กœ์ ํŠธ ์•„์ดํ…œ์„ ํŽ˜์ด์ง€๋„ค์ด์…˜ํ•˜๋ฉฐ author.login์œผ๋กœ ํ•„ํ„ฐ๋งํ•œ๋‹ค.
85-
*
86-
* @param {string} projectId
87-
* @param {string} username
88-
* @param {string} appToken
89-
* @returns {Promise<number[]>}
90-
*/
91-
async function fetchUserMergedPRsInProject(projectId, username, appToken) {
92-
const prNumbers = [];
93-
let cursor = null;
94-
95-
while (true) {
96-
const afterClause = cursor ? `, after: "${cursor}"` : "";
97-
const data = await graphql(
98-
`{
99-
node(id: "${projectId}") {
100-
... on ProjectV2 {
101-
items(first: 100${afterClause}) {
102-
pageInfo { hasNextPage endCursor }
103-
nodes {
104-
content {
105-
... on PullRequest {
106-
number
107-
state
108-
author { login }
109-
}
110-
}
111-
}
112-
}
113-
}
114-
}
115-
}`,
116-
appToken
117-
);
118-
119-
const { nodes, pageInfo } = data.node.items;
120-
121-
for (const item of nodes) {
122-
const pr = item.content;
123-
if (
124-
pr?.state === "MERGED" &&
125-
pr?.author?.login?.toLowerCase() === username.toLowerCase()
126-
) {
127-
prNumbers.push(pr.number);
128-
}
129-
}
130-
131-
if (!pageInfo.hasNextPage) break;
132-
cursor = pageInfo.endCursor;
133-
}
134-
135-
return prNumbers;
136-
}
137-
138-
/**
139-
* ํ˜„์žฌ ๊ธฐ์ˆ˜ ํ”„๋กœ์ ํŠธ์—์„œ ํ•ด๋‹น ์œ ์ €๊ฐ€ ์ œ์ถœํ•œ ๋ฌธ์ œ ๋ชฉ๋ก์„ ๋ฐ˜ํ™˜ํ•œ๋‹ค.
140-
*
141-
* ๊ธฐ์ˆ˜ ํ”„๋กœ์ ํŠธ๋ฅผ ์ฐพ์ง€ ๋ชปํ•˜๋ฉด ์ „์ฒด ๋ ˆํฌ ํŠธ๋ฆฌ ์Šค์บ”(fetchUserSolutions)์œผ๋กœ ํด๋ฐฑํ•œ๋‹ค.
142-
*
143-
* @param {string} repoOwner
144-
* @param {string} repoName
145-
* @param {string} username
146-
* @param {string} appToken
147-
* @returns {Promise<string[]>}
148-
*/
149-
export async function fetchCohortUserSolutions(
150-
repoOwner,
151-
repoName,
152-
username,
153-
appToken
154-
) {
155-
const projectId = await fetchActiveCohortProjectId(
156-
repoOwner,
157-
repoName,
158-
appToken
159-
);
160-
161-
if (!projectId) {
162-
console.warn(
163-
`[fetchCohortUserSolutions] Falling back to full tree scan for ${username}`
164-
);
165-
return fetchUserSolutions(repoOwner, repoName, username, appToken);
166-
}
167-
168-
const prNumbers = await fetchUserMergedPRsInProject(
169-
projectId,
170-
username,
171-
appToken
172-
);
173-
174-
console.log(
175-
`[fetchCohortUserSolutions] ${username} has ${prNumbers.length} merged PRs in current cohort`
176-
);
177-
178-
const problemNames = new Set();
179-
for (const prNumber of prNumbers) {
180-
const submissions = await fetchPRSubmissions(
181-
repoOwner,
182-
repoName,
183-
prNumber,
184-
username,
185-
appToken
186-
);
187-
for (const { problemName } of submissions) {
188-
problemNames.add(problemName);
189-
}
190-
}
191-
192-
return Array.from(problemNames);
193-
}
194-
1957
/**
1968
* Fetches problem-categories.json from the repo root via GitHub API.
1979
* Returns parsed JSON object, or null if the file is not found (404).

0 commit comments

Comments
ย (0)