fix: задубливание комментариев

1CDevFlow · Jun 4, 2024 · 09ea2f9 · 09ea2f9
1 parent 8880111
commit 09ea2f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/__tests__/publisher.test.ts b/__tests__/publisher.test.ts
@@ -21,7 +21,7 @@ describe('main.ts', () => {
     })
     const github = new GithubReview({
       repo: repo,
-      pull_number: 9,
+      pull_number: 370,
       token: token
     })
     const publisher = new ReviewPublisher(sonar, github)

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/github/core.ts b/src/github/core.ts
@@ -147,15 +147,18 @@ export class GithubReview {
   }
 
   async getReviewComments(): Promise<ReviewComments> {
+    core.debug('getReviewComments')
     const response = await this.octokit.rest.pulls.listReviewComments({
       ...this.repo,
       pull_number: this.pull_number
     })
 
+    core.debug(`Response: ${JSON.stringify(response.data)}`)
     return response.data
   }
 
   async deleteComment(comment_id: number) {
+    core.debug(`deleteComment ${comment_id}`)
     await this.octokit.rest.pulls.deleteReviewComment({
       ...this.repo,
       comment_id: comment_id

diff --git a/src/publisher/review.ts b/src/publisher/review.ts
@@ -1,8 +1,6 @@
-import { summary } from '@actions/core'
 import { GitReviewParam, GithubReview, Review, ReviewComment } from 'src/github'
 import { Publisher } from 'src/model/entity'
 import { Sonar } from 'src/sonar'
-import * as entity from 'src/sonar/entity'
 
 export class ReviewPublisher implements Publisher {
   sonar: Sonar

diff --git a/src/sonar/report.ts b/src/sonar/report.ts
@@ -3,8 +3,6 @@ import { MetricKey, QualityStatus, SecurityLevel } from './enum'
 
 const IMAGE_DIR_LINK = 'https://hsonar.s3.ap-southeast-1.amazonaws.com/images/'
 const REVIEW_BODY_PATTERN = /^# SonarQube Code Analytics/g
-const COMMENT_KEY_PATTERN =
-  /project\/issues\?id=.+&pullRequest=\d+&open=(.+)\)/g
 
 export class SonarReport {
   host?: string
@@ -256,9 +254,11 @@ ${this.duplicatedIcon(param.duplicatedValue)} ${duplicatedText}`
   }
 
   getIssueCommentKey(body: string) {
-    const match = COMMENT_KEY_PATTERN.exec(body)
-    if (match) {
-      return match[1]
+    const startSymbol = '&open='
+    const start = body.indexOf(startSymbol)
+    const end = body.indexOf(')', start)
+    if (start && end) {
+      return body.substring(start + startSymbol.length, end)
     }
   }
 }