feat(issue): add issueType count (#119)

Co-authored-by: David Rochow <[email protected]>
cloudoperators · Aug 7, 2024 · b9d7189 · b9d7189
1 parent 20b2ccd
commit b9d7189
Show file tree

Hide file tree

Showing 17 changed files with 594 additions and 46 deletions.
diff --git a/internal/api/graphql/graph/baseResolver/issue.go b/internal/api/graphql/graph/baseResolver/issue.go
@@ -14,6 +14,14 @@ import (
 	"k8s.io/utils/pointer"
 )
 
+func GetIssueListOptions(requestedFields []string) *entity.IssueListOptions {
+	listOptions := GetListOptions(requestedFields)
+	return &entity.IssueListOptions{
+		ListOptions:         *listOptions,
+		ShowIssueTypeCounts: lo.Contains(requestedFields, "issueTypeCounts"),
+	}
+}
+
 func SingleIssueBaseResolver(app app.Heureka, ctx context.Context, parent *model.NodeParent) (*model.Issue, error) {
 	requestedFields := GetPreloads(ctx)
 	logrus.WithFields(logrus.Fields{
@@ -29,7 +37,7 @@ func SingleIssueBaseResolver(app app.Heureka, ctx context.Context, parent *model
 		Id: parent.ChildIds,
 	}
 
-	opt := &entity.ListOptions{}
+	opt := &entity.IssueListOptions{}
 
 	issues, err := app.ListIssues(f, opt)
 
@@ -102,7 +110,7 @@ func IssueBaseResolver(app app.Heureka, ctx context.Context, filter *model.Issue
 		IssueMatchTargetRemediationDate: nil, //@todo Implement
 	}
 
-	opt := GetListOptions(requestedFields)
+	opt := GetIssueListOptions(requestedFields)
 
 	issues, err := app.ListIssues(f, opt)
 
@@ -121,17 +129,29 @@ func IssueBaseResolver(app app.Heureka, ctx context.Context, filter *model.Issue
 		edges = append(edges, &edge)
 	}
 
-	tc := 0
+	totalCount := 0
 	if issues.TotalCount != nil {
-		tc = int(*issues.TotalCount)
+		totalCount = int(*issues.TotalCount)
+	}
+
+	vulnerabilityCount := 0
+	policiyViolationCount := 0
+	securityEventCount := 0
+
+	if issues.VulnerabilityCount != nil && issues.PolicyViolationCount != nil && issues.SecurityEventCount != nil {
+		vulnerabilityCount = int(*issues.VulnerabilityCount)
+		policiyViolationCount = int(*issues.PolicyViolationCount)
+		securityEventCount = int(*issues.SecurityEventCount)
 	}
 
 	connection := model.IssueConnection{
-		TotalCount: tc,
-		Edges:      edges,
-		PageInfo:   model.NewPageInfo(issues.PageInfo),
+		TotalCount:           totalCount,
+		VulnerabilityCount:   vulnerabilityCount,
+		PolicyViolationCount: policiyViolationCount,
+		SecurityEventCount:   securityEventCount,
+		Edges:                edges,
+		PageInfo:             model.NewPageInfo(issues.PageInfo),
 	}
 
 	return &connection, nil
-
 }
diff --git a/internal/api/graphql/graph/generated.go b/internal/api/graphql/graph/generated.go
diff --git a/internal/api/graphql/graph/model/models_gen.go b/internal/api/graphql/graph/model/models_gen.go
diff --git a/internal/api/graphql/graph/queryCollection/issue/directRelations.graphql b/internal/api/graphql/graph/queryCollection/issue/directRelations.graphql
@@ -8,6 +8,9 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
         after: $after
     ) {
         totalCount
+        vulnerabilityCount
+        policyViolationCount
+        securityEventCount
         edges {
             node {
                 id

diff --git a/internal/api/graphql/graph/schema/issue.graphqls b/internal/api/graphql/graph/schema/issue.graphqls
@@ -34,6 +34,9 @@ input IssueInput {
 
 type IssueConnection implements Connection {
     totalCount: Int!
+    vulnerabilityCount: Int!
+    policyViolationCount: Int!
+    securityEventCount: Int!
     edges: [IssueEdge]!
     pageInfo: PageInfo
 }

diff --git a/internal/app/interface.go b/internal/app/interface.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Heureka interface {
-	ListIssues(*entity.IssueFilter, *entity.ListOptions) (*entity.List[entity.IssueResult], error)
+	ListIssues(*entity.IssueFilter, *entity.IssueListOptions) (*entity.IssueList, error)
 	CreateIssue(*entity.Issue) (*entity.Issue, error)
 	UpdateIssue(*entity.Issue) (*entity.Issue, error)
 	DeleteIssue(int64) error