Add placeholders, show created comment url

peaceiris · Aug 13, 2021 · 17eb590 · 17eb590
1 parent ffa41da
commit 17eb590
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 24 deletions.
diff --git a/__tests__/classes/comment.test.ts b/__tests__/classes/comment.test.ts
@@ -113,12 +113,13 @@ describe('getRawBody', () => {
 
     getRunContext(): RunContext {
       const runContext: RunContext = {
-        Id: this.id,
         ConfigFilePath: this.inputs.ConfigFilePath,
-        LabelName: this.labelName as string,
-        LabelEvent: this.labelEvent,
         EventName: this.eventName,
-        EventAlias: this.eventAlias
+        Id: this.id,
+        EventAlias: this.eventAlias,
+        LabelEvent: this.labelEvent,
+        LabelName: this.labelName as string,
+        IssueNumber: this.issueNumber
       };
       return runContext;
     }
@@ -320,12 +321,13 @@ describe('Mustache issues', () => {
 
     getRunContext(): RunContext {
       const runContext: RunContext = {
-        Id: this.id,
         ConfigFilePath: this.inputs.ConfigFilePath,
-        LabelName: this.labelName as string,
-        LabelEvent: this.labelEvent,
         EventName: this.eventName,
-        EventAlias: this.eventAlias
+        Id: this.id,
+        EventAlias: this.eventAlias,
+        LabelEvent: this.labelEvent,
+        LabelName: this.labelName as string,
+        IssueNumber: this.issueNumber
       };
       return runContext;
     }
@@ -502,12 +504,13 @@ describe('Mustache pull_request', () => {
 
     getRunContext(): RunContext {
       const runContext: RunContext = {
-        Id: this.id,
         ConfigFilePath: this.inputs.ConfigFilePath,
-        LabelName: this.labelName as string,
-        LabelEvent: this.labelEvent,
         EventName: this.eventName,
-        EventAlias: this.eventAlias
+        Id: this.id,
+        EventAlias: this.eventAlias,
+        LabelEvent: this.labelEvent,
+        LabelName: this.labelName as string,
+        IssueNumber: this.issueNumber
       };
       return runContext;
     }
@@ -684,12 +687,13 @@ describe('Mustache pull_request_target', () => {
 
     getRunContext(): RunContext {
       const runContext: RunContext = {
-        Id: this.id,
         ConfigFilePath: this.inputs.ConfigFilePath,
-        LabelName: this.labelName as string,
-        LabelEvent: this.labelEvent,
         EventName: this.eventName,
-        EventAlias: this.eventAlias
+        Id: this.id,
+        EventAlias: this.eventAlias,
+        LabelEvent: this.labelEvent,
+        LabelName: this.labelName as string,
+        IssueNumber: this.issueNumber
       };
       return runContext;
     }

diff --git a/src/classes/comment.ts b/src/classes/comment.ts
@@ -105,6 +105,11 @@ class Comment implements ICommentGenerator {
   get view(): any {
     if (this.runContext.EventName === 'issues') {
       return {
+        eventName: this.runContext.EventName,
+        number: this.runContext.IssueNumber,
+        labelName: this.runContext.LabelName,
+        author: this.contextLoader.userLogin,
+        labeler: this.contextLoader.senderLogin,
         issue: {
           user: {
             login: this.contextLoader.userLogin
@@ -116,6 +121,11 @@ class Comment implements ICommentGenerator {
       };
     } else if (this.runContext.EventName === 'discussion') {
       return {
+        eventName: this.runContext.EventName,
+        number: this.runContext.IssueNumber,
+        labelName: this.runContext.LabelName,
+        author: this.contextLoader.userLogin,
+        labeler: this.contextLoader.senderLogin,
         discussion: {
           user: {
             login: this.contextLoader.userLogin
@@ -130,6 +140,11 @@ class Comment implements ICommentGenerator {
       this.runContext.EventName === 'pull_request_target'
     ) {
       return {
+        eventName: this.runContext.EventName,
+        number: this.runContext.IssueNumber,
+        labelName: this.runContext.LabelName,
+        author: this.contextLoader.userLogin,
+        labeler: this.contextLoader.senderLogin,
         pull_request: {
           user: {
             login: this.contextLoader.userLogin

diff --git a/src/classes/context-loader.ts b/src/classes/context-loader.ts
@@ -35,12 +35,14 @@ const eventType = (eventName: EventName): EventAlias =>
   eventTypeTable[eventName as keyof EventTypeTable];
 
 interface RunContext {
-  readonly Id: string;
   readonly ConfigFilePath: string;
-  readonly LabelName: string;
-  readonly LabelEvent: LabelEvent;
+
   readonly EventName: EventName;
+  readonly Id: string;
   readonly EventAlias: EventAlias;
+  readonly LabelEvent: LabelEvent;
+  readonly LabelName: string;
+  readonly IssueNumber: number;
 }
 
 interface IContext {
@@ -122,12 +124,13 @@ class ContextLoader implements IContextLoader {
 
   getRunContext(): RunContext {
     const runContext: RunContext = {
-      Id: this.id,
       ConfigFilePath: this.inputs.ConfigFilePath,
-      LabelName: this.labelName as string,
-      LabelEvent: this.labelEvent,
       EventName: this.eventName,
-      EventAlias: this.eventAlias
+      Id: this.id,
+      EventAlias: this.eventAlias,
+      LabelEvent: this.labelEvent,
+      LabelName: this.labelName as string,
+      IssueNumber: this.issueNumber
     };
     groupConsoleLog('Dump runContext', runContext);
     return runContext;

diff --git a/src/classes/issue.ts b/src/classes/issue.ts
@@ -202,6 +202,8 @@ class Issue implements IIssueProcessor {
         addDiscussionComment(input: $input) {
           comment {
             body
+            id
+            url
           }
         }
       }
@@ -215,7 +217,7 @@ class Issue implements IIssueProcessor {
 
     try {
       const res: GraphQlQueryResponseData = await this.githubClient.graphql(query, variables);
-      info(`Add comment to #${this.number}`);
+      info(`Add comment to #${this.number}, ${res.addDiscussionComment.comment.url}`);
       groupConsoleLog('GraphQlQueryResponseData', res);
     } catch (error) {
       groupConsoleLog('Request failed', error.request);