refactor: небольшой рефакторинг имен и структуры

__tests__/github.test.ts

@@ -1,7 +1,7 @@
 import { debug } from 'console'
 import { config } from 'dotenv'
 
-import { GithubMerge } from '../src/github'
+import { GithubReview } from '../src/github'
 
 describe('github', () => {
   config()
@@ -21,15 +21,15 @@ describe('github', () => {
   // })
 
   it('getQualityDiscussion', async () => {
-    const githubMR = new GithubMerge({
+    const githubMR = new GithubReview({
       pull_number: 9,
       token: token,
       repo: repo
     })
     debug(await githubMR.getQualityDiscussion())
   })
   it('getReviews', async () => {
-    const githubMR = new GithubMerge({
+    const githubMR = new GithubReview({
       pull_number: 9,
       token: token,
       repo: repo
@@ -38,7 +38,7 @@ describe('github', () => {
   })
 
   it('getReviewComments', async () => {
-    const githubMR = new GithubMerge({
+    const githubMR = new GithubReview({
       pull_number: 9,
       token: token,
       repo: repo

__tests__/publisher.test.ts

@@ -1,8 +1,8 @@
 import { config } from 'dotenv'
 
-import { Publisher } from '../src/publisher'
+import { ReviewPublisher } from '../src/publisher/review'
 import { Sonar } from '../src/sonar'
-import { GithubMerge } from '../src/github'
+import { GithubReview } from '../src/github'
 
 describe('main.ts', () => {
   config()
@@ -19,12 +19,12 @@ describe('main.ts', () => {
       branchPluginEnabled: true,
       pull_number: 370
     })
-    const github = new GithubMerge({
+    const github = new GithubReview({
       repo: repo,
       pull_number: 9,
       token: token
     })
-    const publisher = new Publisher(sonar, github)
+    const publisher = new ReviewPublisher(sonar, github)
     await publisher.generateReport()
   })
   it('publishIssues', async () => {
@@ -34,12 +34,12 @@ describe('main.ts', () => {
       branchPluginEnabled: true,
       pull_number: 370
     })
-    const github = new GithubMerge({
+    const github = new GithubReview({
       repo: repo,
       pull_number: 370,
       token: token
     })
-    const publisher = new Publisher(sonar, github)
+    const publisher = new ReviewPublisher(sonar, github)
     const status = {
       projectStatus: {
         status: 'UNKNOWN',

src/github/core.ts

@@ -14,7 +14,7 @@ export type ReviewComments =
   Endpoints['GET /repos/{owner}/{repo}/pulls/{pull_number}/comments']['response']['data']
 export type ReviewComment = ReviewComments[0]
 
-export class GithubMerge {
+export class GithubReview {
   pull_number: number
   octokit: InstanceType<typeof GitHub>
   repo: Repo

src/main.ts

@@ -1,10 +1,10 @@
 import * as core from '@actions/core'
 import { Sonar } from './sonar'
 import { SonarProperties } from './sonar/properties'
-import { GithubMerge } from './github'
+import { GithubReview } from './github'
 import githubAutoConfig from './github/autoconfig'
 import { Repo } from './model/entity'
-import { Publisher } from './publisher'
+import * as PublisherFactory from './publisher'
 
 /**
  * The main function for the action.
@@ -15,39 +15,40 @@ export async function run(): Promise<void> {
     const githubConfig = githubAutoConfig()
     const sonarConfig = new SonarProperties({ projectDir: process.cwd() })
 
-    const args: Args = {
-      sonarToken: core.getInput('sonar_token') || process.env.SONAR_TOKEN || '',
+    core.debug(`generate report`)
+
+    generateReport({
+      sonarToken: core.getInput('sonar_token') || process.env.SONAR_TOKEN,
       sonarURL: core.getInput('sonar_url') || sonarConfig.getSonarURL(),
       sonarProjectKey:
         core.getInput('sonar_project') || sonarConfig.getProjectKey(),
       sonarBranchPlugin: core.getBooleanInput('sonar_branch_plugin'),
       repo: githubConfig.repo,
       mergeID:
-        parseInt(core.getInput('pull_number')) || githubConfig.pr?.number || 9,
+        parseInt(core.getInput('pull_number')) || githubConfig.pr?.number,
       githubToken:
         core.getInput('github_token') || process.env.GITHUB_TOKEN || ''
-    }
-    core.debug(`generate report`)
-
-    generateReport(args)
+    })
   } catch (error) {
     // Fail the workflow run if an error occurs
     if (error instanceof Error) core.setFailed(error.message)
   }
 }
 
-interface Args {
+export async function generateReport(args: {
   sonarToken?: string
   sonarURL: string
   sonarProjectKey: string
   sonarBranchPlugin: boolean
-  mergeID: number
+  mergeID?: number
   githubToken: string
   repo: Repo
-}
+}) {
+  if (!args.mergeID) {
+    throw 'You need to specify pull_number'
+  }
 
-export async function generateReport(args: Args) {
-  const github = new GithubMerge({
+  const github = new GithubReview({
     token: args.githubToken,
     pull_number: args.mergeID,
     repo: args.repo
@@ -61,6 +62,6 @@ export async function generateReport(args: Args) {
     pull_number: args.mergeID
   })
 
-  const publisher = new Publisher(sonar, github)
+  const publisher = PublisherFactory.create(sonar, github)
   await publisher.generateReport()
 }