auto close issue after complete

.dockerignore

@@ -9,4 +9,3 @@
 **/.editorconfig
 **/dist
 **/*.pem
-Dockerfile

Dockerfile

@@ -1,8 +1,17 @@
 FROM node:20-slim
+
 WORKDIR /usr/src/app
-COPY package.json package-lock.json ./
-RUN npm ci --production
+
+RUN apt-get update && apt-get install -y iputils-ping curl
+
+COPY . .
+
+RUN npm ci
+
+RUN npm run build
+
 RUN npm cache clean --force
+
 ENV NODE_ENV="production"
-COPY . .
+
 CMD [ "npm", "start" ]

comment.yaml

@@ -0,0 +1,57 @@
+project:
+  noneProjectComment: >
+    Thanks for joining R2CN Projetc! You need to first submit a PR to modify the organization.yaml file to apply for your project to be included in the R2CN program.
+  noneMaintainerComment: >
+    You do not have permission to apply for the R2CN internship tasks. Please contact your organization administrator to submit a PR and to update the R2CN organization.yaml file.
+
+task:
+  scoreUndefinedComment: >
+    Please add the R2CN-Score label to the issue. `Score` represents the task’s score.
+  scoreInvalidComment: >
+    The score must be within the range of 2 to 50.
+  insufficientScoreComment: >
+    The current organization has insufficient remaining points. Please contact the administrator.
+  toomanyTask: >
+    There are too many tasks currently active. Please check if there are 3 tasks already, or contact the administrator.
+
+command:
+  noPermission: >
+    Operation failed, You are not allowed to operate this task.
+  invalidTaskState: >
+    Operation failed, the current task status does not allow this operation.
+
+requestAssign:
+  success: >
+    Claim successful, awaiting review.
+  waitingInfoReview: >
+    Claim failed, personal information is under review.
+  existTask: >
+    Claim failed, you have already claimed another task.
+  alreadyClaim: >
+    Claim failed, you have already claimed this task, please do not repeat claim. 
+
+internDisapprove:
+  success: >
+    Operation successful, awaiting claim.
+
+internApprove:
+  success: >
+    Operation successful, awaiting PR.
+
+requestComplete:
+  success: >
+    Request complete successful, awaiting finish intern review.
+  noRelatedPR: >
+    Request complete failed, the task must be associated with at least one PR.
+
+requestRelease:
+  success: >
+    Request release task successful, awaiting another claim.
+
+internFail:
+  success: >
+    Release task successful, awaiting another claim.
+
+internDone:
+  success: >
+    Operation successful, task close.

src/common.ts

@@ -69,7 +69,8 @@ interface Repo {
 
 export interface CommandRequest {
     github_issue_id: number,
-    login?: string
+    login: string
+    github_id: number
 }
 
 

src/index.ts

@@ -21,55 +21,59 @@ export default (app: Probot) => {
         const creator = context.payload.issue.user.login;
         const repo_full_name = context.payload.repository.full_name;
 
-        if (hasLabel && config !== null) {
-            const repo = config.repos.find((repo) => repo.name === repo_full_name);
-            if (!repo) {
-                await context.octokit.issues.createComment(context.issue({
-                    body: config.project.noneProjectComment,
-                }));
-                return
-            }
+        if (hasLabel) {
+            context.log.debug("R2cn label not found, skipping message")
+            return
+        }
+        if (config == null) {
+            context.log.error("Config parsing error");
+            return
+        }
+        const repo = config.repos.find((repo) => repo.name === repo_full_name);
+        if (!repo) {
+            await context.octokit.issues.createComment(context.issue({
+                body: config.project.noneProjectComment,
+            }));
+            return
+        }
 
-            if (!repo.maintainers.includes(creator)) {
-                await context.octokit.issues.createComment(context.issue({
-                    body: config.project.noneMaintainerComment,
-                }));
-                return
-            }
-            const task = await Task.getTask(context.payload.issue.id);
-            if (task == null) {
-                const checkRes: Task.CheckTaskResults = await Task.checkTask(context.payload.repository, context.payload.issue, config);
-                if (checkRes.result) {
-                    const newTaskRes = await Task.newTask(context.payload.repository, context.payload.issue, checkRes.score);
-                    if (newTaskRes) {
-                        await context.octokit.issues.createComment(context.issue({
-                            body: "Task created successfully."
-                        }));
-                    }
-                } else {
+        if (!repo.maintainers.includes(creator)) {
+            await context.octokit.issues.createComment(context.issue({
+                body: config.project.noneMaintainerComment,
+            }));
+            return
+        }
+        const task = await Task.getTask(context.payload.issue.id);
+        if (task == null) {
+            const checkRes: Task.CheckTaskResults = await Task.checkTask(context.payload.repository, context.payload.issue, config);
+            if (checkRes.result) {
+                const newTaskRes = await Task.newTask(context.payload.repository, context.payload.issue, checkRes.score);
+                if (newTaskRes) {
                     await context.octokit.issues.createComment(context.issue({
-                        body: checkRes.message
+                        body: "Task created successfully."
                     }));
                 }
             } else {
-                const comment = context.payload.comment.body.trim();
-
-                if (comment.startsWith("/request")) {
-                    let res = await Student.handle_stu_cmd(context.payload.comment.user, comment, config, task);
-                    context.octokit.issues.createComment(context.issue({
-                        body: res.message
-                    }));
-                } else if (comment.startsWith("/intern")) {
-                    let res = await handle_mentor_cmd(context.payload.comment.user, comment, config, task);
-                    context.octokit.issues.createComment(context.issue({
-                        body: res.message
-                    }));
-                } else {
-                    context.log.debug("Normal Comment, skipping...")
-                }
+                await context.octokit.issues.createComment(context.issue({
+                    body: checkRes.message
+                }));
             }
         } else {
-            context.log.error("R2cn label not found or config parsing error")
+            const comment = context.payload.comment.body.trim();
+
+            if (comment.startsWith("/request")) {
+                let res = await Student.handle_stu_cmd(context, context.payload.comment.user, comment, config, task);
+                context.octokit.issues.createComment(context.issue({
+                    body: res.message
+                }));
+            } else if (comment.startsWith("/intern")) {
+                let res = await handle_mentor_cmd(context, context.payload.comment.user, comment, config, task);
+                context.octokit.issues.createComment(context.issue({
+                    body: res.message
+                }));
+            } else {
+                context.log.debug("Normal Comment, skipping...")
+            }
         }
     });
 };

src/mentor.ts

@@ -2,9 +2,10 @@ import { User } from "@octokit/webhooks-types";
 import { CommandRequest, Config, postData } from "./common.js";
 import { Task, TaskStatus } from "./task.js";
 import { releaseTask } from "./student.js";
+import { Context } from "probot";
 
 
-export async function handle_mentor_cmd(student: User, command: string, config: Config, task: Task) {
+export async function handle_mentor_cmd(context: Context, mentor: User, command: string, config: Config, task: Task) {
     var command_res = {
         result: false,
         message: "",
@@ -16,24 +17,24 @@ export async function handle_mentor_cmd(student: User, command: string, config:
         return command_res;
     };
 
-    const isMentorAuthorized = (task: Task, student: User) => {
-        return task.student_github_login === student.login;
+    const isMentorAuthorized = (task: Task, mentor: User) => {
+        return task.mentor_github_login === mentor.login;
     };
 
-    if (!isMentorAuthorized(task, student)) {
+    if (!isMentorAuthorized(task, mentor)) {
         return setResponse(config.command.noPermission);
     }
 
     switch (command) {
-
         case "/intern-disapprove":
             if (task.task_status !== TaskStatus.RequestAssign) {
                 return setResponse(config.command.invalidTaskState);
             }
 
             await releaseTask({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: mentor.login,
+                github_id: mentor.id
             });
             return setResponse(config.internDisapprove.success, true);
 
@@ -43,7 +44,8 @@ export async function handle_mentor_cmd(student: User, command: string, config:
             }
             await internApprove({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: mentor.login,
+                github_id: mentor.id
             });
             return setResponse(config.internApprove.success, true);
 
@@ -53,16 +55,24 @@ export async function handle_mentor_cmd(student: User, command: string, config:
             }
             await releaseTask({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: mentor.login,
+                github_id: mentor.id
             });
             return setResponse(config.internFail.success, true);
         case "/intern-done":
             if (task.task_status !== TaskStatus.RequestFinish) {
                 return setResponse(config.command.invalidTaskState);
             }
+            await context.octokit.issues.update({
+                owner: task.owner,
+                repo: task.repo,
+                issue_number: task.github_issue_number,
+                state: "closed",
+            });
             await internDone({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: mentor.login,
+                github_id: mentor.id
             });
             return setResponse(config.internDone.success, true);
 

src/student.ts

@@ -2,9 +2,10 @@
 import { User } from "@octokit/webhooks-types";
 import { CommandRequest, Config, postData } from "./common.js";
 import { Task, TaskStatus } from "./task.js";
+import { Context } from "probot";
 
 
-export async function handle_stu_cmd(student: User, command: string, config: Config, task: Task) {
+export async function handle_stu_cmd(context: Context, student: User, command: string, config: Config, task: Task) {
     var command_res = {
         result: false,
         message: "",
@@ -40,7 +41,8 @@ export async function handle_stu_cmd(student: User, command: string, config: Con
 
             if (await requestAssign({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: student.login,
+                github_id: student.id
             })) {
                 return setResponse(config.requestAssign.success, true);
             } else {
@@ -55,12 +57,21 @@ export async function handle_stu_cmd(student: User, command: string, config: Con
                 return setResponse(config.command.noPermission);
             }
 
+            //check related PRs
+            // const res = await context.octokit.issues.get({
+            //     owner: task.owner,
+            //     repo: task.repo,
+            //     issue_number: task.github_issue_number
+            // });
+
+            // if (res.data.pull_request == undefined) {
+            //     return setResponse(config.requestComplete.noRelatedPR);
+            // }
             await requestComplete({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: student.login,
+                github_id: student.id
             })
-
-            // TODO: Add logic to check related PRs
             return setResponse(config.requestComplete.success, true);
 
         case "/request-release":
@@ -74,9 +85,10 @@ export async function handle_stu_cmd(student: User, command: string, config: Con
 
             await releaseTask({
                 github_issue_id: task.github_issue_id,
-                login: student.login
+                login: student.login,
+                github_id: student.id
             })
-            return setResponse(config.requestComplete.success, true);
+            return setResponse(config.requestRelease.success, true);
 
         default:
             return setResponse("Unsupported command");

src/task.ts

@@ -2,6 +2,9 @@ import { Issue, Repository } from "@octokit/webhooks-types";
 import { Config, fetchData, postData } from "./common.js";
 
 export interface Task {
+    repo: string,
+    owner: string,
+    github_issue_number: number,
     github_repo_id: number,
     github_issue_id: number,
     points?: number,
@@ -27,20 +30,26 @@ export async function getTask(issue_id: number) {
     return res
 }
 
-interface newTask {
+interface TaskCreate {
+    repo: string,
+    owner: string,
+    github_issue_number: number,
     github_repo_id: number,
     github_issue_id: number,
     score: number,
     mentor_github_login: string,
 }
 
-export async function newTask(repo: Repository, issue: Issue, score: number) {
+export async function newTask(repository: Repository, issue: Issue, score: number) {
     const req = {
-        github_repo_id: repo.id,
+        repo: repository.name,
+        owner: repository.owner.login,
+        github_issue_number: issue.number,
+        github_repo_id: repository.id,
         github_issue_id: issue.id,
         score: score,
         mentor_github_login: issue.user.login,
-    }
+    } as TaskCreate;
     const apiUrl = `${process.env.API_ENDPOINT}/task/new`;
     const res = await postData<Task[], SearchTaskReq>(apiUrl, req).then((res) => {
         return res.data