fix: Dismissed or Fixed alerts should not be included in the list (#94)

kunalnagarco · Jun 30, 2022 · 2d3d468 · 2d3d468
1 parent 8a24022
commit 2d3d468
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "nodemailer": "^6.7.5"
   },
   "devDependencies": {
-    "@octokit/graphql-schema": "10.73.0",
+    "@octokit/graphql-schema": "^10.74.1",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/commit-analyzer": "9.0.2",
     "@semantic-release/git": "10.0.1",

diff --git a/src/entities/alert.ts b/src/entities/alert.ts
@@ -27,3 +27,15 @@ export const toAlert = (
   manifest: repositoryVulnerabilityAlert.vulnerableManifestFilename,
   createdAt: repositoryVulnerabilityAlert.createdAt,
 })
+
+export const isActiveAlert = (
+  repositoryVulnerabilityAlert: RepositoryVulnerabilityAlert,
+): boolean => {
+  if (
+    repositoryVulnerabilityAlert.dismissedAt === null &&
+    repositoryVulnerabilityAlert.fixedAt === null
+  ) {
+    return true
+  }
+  return false
+}
diff --git a/src/fetch-alerts.ts b/src/fetch-alerts.ts
@@ -1,4 +1,4 @@
-import { Alert, toAlert } from './entities'
+import { Alert, toAlert, isActiveAlert } from './entities'
 import { Repository } from '@octokit/graphql-schema'
 import { getOctokit } from '@actions/github'
 
@@ -18,6 +18,8 @@ export const fetchAlerts = async (
           edges {
             node {
               id
+              dismissedAt
+              fixedAt
               repository {
                 name
                 owner {
@@ -62,7 +64,7 @@ export const fetchAlerts = async (
   if (gitHubAlerts) {
     const alerts: Alert[] = []
     for (const gitHubAlert of gitHubAlerts) {
-      if (gitHubAlert && gitHubAlert.node) {
+      if (gitHubAlert && gitHubAlert.node && isActiveAlert(gitHubAlert.node)) {
         alerts.push(toAlert(gitHubAlert.node))
       }
     }