Final

cloudoperators · Oct 23, 2024 · 353848a · 353848a
1 parent f4ab534
commit 353848a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/internal/api/graphql/graph/baseResolver/common.go b/internal/api/graphql/graph/baseResolver/common.go
@@ -98,6 +98,6 @@ func GetListOptions(requestedFields []string) *entity.ListOptions {
 	return &entity.ListOptions{
 		ShowTotalCount:      lo.Contains(requestedFields, "totalCount"),
 		ShowPageInfo:        lo.Contains(requestedFields, "pageInfo"),
-		IncludeAggregations: lo.Contains(requestedFields, "edges.node.metadata"),
+		IncludeAggregations: lo.Contains(requestedFields, "edges.node.issueMetadata"),
 	}
 }
diff --git a/internal/api/graphql/graph/model/models.go b/internal/api/graphql/graph/model/models.go
@@ -177,6 +177,7 @@ func NewIssueWithAggregations(issue *entity.IssueResult) Issue {
 		ID:            fmt.Sprintf("%d", issue.Issue.Id),
 		PrimaryName:   &issue.Issue.PrimaryName,
 		Type:          &issueType,
+		Description:   &issue.Issue.Description,
 		LastModified:  &lastModified,
 		IssueMetadata: &issueMetadata,
 		Metadata:      getModelMetadata(issue.Issue.Metadata),

diff --git a/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql b/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
@@ -11,10 +11,9 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
         edges {
             node {
 				id
-                type
 				primaryName
+                type
 				description
-				lastModified
                 metadata {
                     created_at
                     created_by

diff --git a/internal/e2e/common/issue.go b/internal/e2e/common/issue.go
@@ -31,7 +31,7 @@ func QueryCreateIssue(port string, issue Issue) *model.Issue {
 	str := string(b)
 	req := graphql.NewRequest(str)
 
-	req.Var("input", map[string]interface{}{
+	req.Var("input", map[string]string{
 		"primaryName": issue.PrimaryName,
 		"description": issue.Description,
 		"type":        issue.Type,

diff --git a/internal/e2e/common/user.go b/internal/e2e/common/user.go
@@ -20,6 +20,7 @@ import (
 
 const NumberOfSystemUsers = 1
 const SystemUserId = 1
+const EmptyUserId = -1
 
 var SystemUserName = "systemuser"
 var SystemUserUniqueUserId = "S0000000"

diff --git a/internal/e2e/metadata_test.go b/internal/e2e/metadata_test.go
@@ -26,16 +26,15 @@ const (
 )
 
 var (
-	testCreatedIssueType        = entity.IssueTypeVulnerability.String()
-	testUpdatedIssueType        = entity.IssueTypePolicyViolation.String()
+	testCreatedIssueType = entity.IssueTypeVulnerability.String()
+	testUpdatedIssueType = entity.IssueTypePolicyViolation.String()
 )
 
 func createTestIssue(port string) string {
 	issue := e2e_common.QueryCreateIssue(port, e2e_common.Issue{PrimaryName: testIssuePrimaryName, Description: testCreatedIssueDescription, Type: testCreatedIssueType})
 	Expect(*issue.PrimaryName).To(Equal(testIssuePrimaryName))
 	Expect(*issue.Description).To(Equal(testCreatedIssueDescription))
 	Expect(issue.Type.String()).To(Equal(testCreatedIssueType))
-	fmt.Println("AAAAAAAAAAAAAAAAAA ", *issue)
 	return issue.ID
 }
 func updateTestIssue(port string, iid string) {
@@ -48,7 +47,6 @@ func updateTestIssue(port string, iid string) {
 func getTestIssue(port string) model.Issue {
 	issues := e2e_common.QueryGetIssue(port, testIssuePrimaryName)
 	Expect(issues.TotalCount).To(Equal(1))
-	fmt.Println("AAAAAAAAAAAAAAAAAA ", *issues.Edges[0].Node)
 	return *issues.Edges[0].Node
 }
 
@@ -81,13 +79,13 @@ var _ = Describe("Creating and updating entity via API", Label("e2e", "Entities"
 			Expect(issue.Type.String()).To(Equal(testCreatedIssueType))
 
 			Expect(issue.Metadata).To(Not(BeNil()))
-			Expect(*issue.Metadata.CreatedBy).To(Equal(e2e_common.SystemUserId))
+			Expect(*issue.Metadata.CreatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.SystemUserId)))
 
 			createdAt, err := time.Parse(dbDateLayout, *issue.Metadata.CreatedAt)
 			Expect(err).Should(BeNil())
 			Expect(createdAt).Should(BeTemporally("~", time.Now().UTC(), 3*time.Second))
 
-			Expect(*issue.Metadata.UpdatedBy).To(BeEmpty())
+			Expect(*issue.Metadata.UpdatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.EmptyUserId)))
 
 			updatedAt, err := time.Parse(dbDateLayout, *issue.Metadata.UpdatedAt)
 			Expect(err).Should(BeNil())
@@ -107,13 +105,13 @@ var _ = Describe("Creating and updating entity via API", Label("e2e", "Entities"
 			Expect(issue.Type.String()).To(Equal(testUpdatedIssueType))
 
 			Expect(issue.Metadata).To(Not(BeNil()))
-			Expect(*issue.Metadata.CreatedBy).To(Equal(e2e_common.SystemUserId))
+			Expect(*issue.Metadata.CreatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.SystemUserId)))
 
 			createdAt, err := time.Parse(dbDateLayout, *issue.Metadata.CreatedAt)
 			Expect(err).Should(BeNil())
 			Expect(createdAt).Should(BeTemporally("~", time.Now().UTC(), 3*time.Second))
 
-			Expect(*issue.Metadata.UpdatedBy).To(Equal(e2e_common.SystemUserId))
+			Expect(*issue.Metadata.UpdatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.SystemUserId)))
 
 			updatedAt, err := time.Parse(dbDateLayout, *issue.Metadata.UpdatedAt)
 			Expect(err).Should(BeNil())