changed issueMetadata and serviceMetadata to objectMetadata

cloudoperators · Nov 14, 2024 · 7b188a6 · 7b188a6
1 parent 22d26ea
commit 7b188a6
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/internal/api/graphql/graph/baseResolver/common.go b/internal/api/graphql/graph/baseResolver/common.go
@@ -102,6 +102,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.issueMetadata"),
+		IncludeAggregations: lo.Contains(requestedFields, "edges.node.objectMetadata"),
 	}
 }
diff --git a/internal/api/graphql/graph/model/models.go b/internal/api/graphql/graph/model/models.go
@@ -180,10 +180,10 @@ func NewIssueWithAggregations(issue *entity.IssueResult) Issue {
 	lastModified := issue.Issue.UpdatedAt.String()
 	issueType := IssueTypes(issue.Type.String())
 
-	var issueMetadata IssueMetadata
+	var objectMetadata IssueMetadata
 
 	if issue.IssueAggregations != nil {
-		issueMetadata = IssueMetadata{
+		objectMetadata = IssueMetadata{
 			ServiceCount:                  int(issue.IssueAggregations.AffectedServices),
 			ActivityCount:                 int(issue.IssueAggregations.Activities),
 			IssueMatchCount:               int(issue.IssueAggregations.IssueMatches),
@@ -195,13 +195,13 @@ func NewIssueWithAggregations(issue *entity.IssueResult) Issue {
 	}
 
 	return 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),
+		ID:             fmt.Sprintf("%d", issue.Issue.Id),
+		PrimaryName:    &issue.Issue.PrimaryName,
+		Type:           &issueType,
+		Description:    &issue.Issue.Description,
+		LastModified:   &lastModified,
+		ObjectMetadata: &objectMetadata,
+		Metadata:       getModelMetadata(issue.Issue.Metadata),
 	}
 }
 
@@ -370,20 +370,20 @@ func NewService(s *entity.Service) Service {
 }
 
 func NewServiceWithAggregations(service *entity.ServiceResult) Service {
-	var serviceMetadata ServiceMetadata
+	var objectMetadata ServiceMetadata
 
 	if service.ServiceAggregations != nil {
-		serviceMetadata = ServiceMetadata{
+		objectMetadata = ServiceMetadata{
 			IssueMatchCount:        int(service.ServiceAggregations.IssueMatches),
 			ComponentInstanceCount: int(service.ServiceAggregations.ComponentInstances),
 		}
 	}
 
 	return Service{
-		ID:              fmt.Sprintf("%d", service.Id),
-		Ccrn:            &service.CCRN,
-		ServiceMetadata: &serviceMetadata,
-		Metadata:        getModelMetadata(service.BaseService.Metadata),
+		ID:             fmt.Sprintf("%d", service.Id),
+		Ccrn:           &service.CCRN,
+		ObjectMetadata: &objectMetadata,
+		Metadata:       getModelMetadata(service.BaseService.Metadata),
 	}
 }
 

diff --git a/internal/api/graphql/graph/queryCollection/issue/directRelations.graphql b/internal/api/graphql/graph/queryCollection/issue/directRelations.graphql
@@ -81,7 +81,7 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
                         nextPageAfter
                     }
                 }
-                issueMetadata {
+                objectMetadata {
                     serviceCount
                     activityCount
                     issueMatchCount

diff --git a/...ollection/issue/withIssueMetadata.graphql → ...llection/issue/withObjectMetadata.graphql b/...ollection/issue/withIssueMetadata.graphql → ...llection/issue/withObjectMetadata.graphql
@@ -12,7 +12,7 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
             node {
                 id
                 lastModified
-                issueMetadata {
+                objectMetadata {
                     serviceCount
                     activityCount
                     issueMatchCount

diff --git a/...ction/service/withServiceMetadata.graphql → ...ection/service/withObjectMetadata.graphql b/...ction/service/withServiceMetadata.graphql → ...ection/service/withObjectMetadata.graphql
@@ -22,7 +22,7 @@ query ($filter: ServiceFilter, $first: Int, $after: String) {
                         }
                     }
                 }
-                serviceMetadata {
+                objectMetadata {
                     issueMatchCount
                     componentInstanceCount
                 }

diff --git a/internal/api/graphql/graph/schema/issue.graphqls b/internal/api/graphql/graph/schema/issue.graphqls
@@ -13,7 +13,7 @@ type Issue implements Node {
     activities(filter: ActivityFilter, first: Int, after: String): ActivityConnection
     issueMatches(filter: IssueMatchFilter, first: Int, after: String): IssueMatchConnection
     componentVersions(filter: ComponentVersionFilter, first: Int, after: String): ComponentVersionConnection
-    issueMetadata: IssueMetadata
+    objectMetadata: IssueMetadata
     metadata: Metadata
 }
 

diff --git a/internal/api/graphql/graph/schema/service.graphqls b/internal/api/graphql/graph/schema/service.graphqls
@@ -9,7 +9,7 @@ type Service implements Node {
     activities(filter: ActivityFilter, first: Int, after: String): ActivityConnection
     issueRepositories(filter: IssueRepositoryFilter, first: Int, after: String): IssueRepositoryConnection
     componentInstances(filter: ComponentInstanceFilter, first: Int, after: String): ComponentInstanceConnection
-    serviceMetadata: ServiceMetadata
+    objectMetadata: ServiceMetadata
     metadata: Metadata
 
 }

diff --git a/internal/e2e/issue_query_test.go b/internal/e2e/issue_query_test.go
@@ -199,13 +199,13 @@ var _ = Describe("Getting Issues via API", Label("e2e", "Issues"), func() {
 					Expect(*respData.Issues.PageInfo.PageNumber).To(Equal(1), "Correct page number")
 				})
 			})
-			Context("and we request metadata", Label("withIssueMetadata.graphql"), func() {
+			Context("and we request metadata", Label("withObjectMetadata.graphql"), func() {
 				It("returns correct metadata counts", func() {
 					// create a queryCollection (safe to share across requests)
 					client := graphql.NewClient(fmt.Sprintf("http://localhost:%s/query", cfg.Port))
 
 					//@todo may need to make this more fault proof?! What if the test is executed from the root dir? does it still work?
-					b, err := os.ReadFile("../api/graphql/graph/queryCollection/issue/withIssueMetadata.graphql")
+					b, err := os.ReadFile("../api/graphql/graph/queryCollection/issue/withObjectMetadata.graphql")
 
 					Expect(err).To(BeNil())
 					str := string(b)
@@ -232,10 +232,10 @@ var _ = Describe("Getting Issues via API", Label("e2e", "Issues"), func() {
 							ciCount += *imEdge.Node.ComponentInstance.Count
 							serviceIdSet[imEdge.Node.ComponentInstance.Service.ID] = true
 						}
-						Expect(issueEdge.Node.IssueMetadata.IssueMatchCount).To(Equal(issueEdge.Node.IssueMatches.TotalCount), "IssueMatchCount is correct")
-						Expect(issueEdge.Node.IssueMetadata.ComponentInstanceCount).To(Equal(ciCount), "ComponentInstanceCount is correct")
-						Expect(issueEdge.Node.IssueMetadata.ActivityCount).To(Equal(issueEdge.Node.Activities.TotalCount), "ActivityCount is correct")
-						Expect(issueEdge.Node.IssueMetadata.ServiceCount).To(Equal(len(serviceIdSet)), "ServiceCount is correct")
+						Expect(issueEdge.Node.ObjectMetadata.IssueMatchCount).To(Equal(issueEdge.Node.IssueMatches.TotalCount), "IssueMatchCount is correct")
+						Expect(issueEdge.Node.ObjectMetadata.ComponentInstanceCount).To(Equal(ciCount), "ComponentInstanceCount is correct")
+						Expect(issueEdge.Node.ObjectMetadata.ActivityCount).To(Equal(issueEdge.Node.Activities.TotalCount), "ActivityCount is correct")
+						Expect(issueEdge.Node.ObjectMetadata.ServiceCount).To(Equal(len(serviceIdSet)), "ServiceCount is correct")
 					}
 				})
 			})

diff --git a/internal/e2e/service_query_test.go b/internal/e2e/service_query_test.go
@@ -119,7 +119,7 @@ var _ = Describe("Getting Services via API", Label("e2e", "Services"), func() {
 				client := graphql.NewClient(fmt.Sprintf("http://localhost:%s/query", cfg.Port))
 
 				//@todo may need to make this more fault proof?! What if the test is executed from the root dir? does it still work?
-				b, err := os.ReadFile("../api/graphql/graph/queryCollection/service/withServiceMetadata.graphql")
+				b, err := os.ReadFile("../api/graphql/graph/queryCollection/service/withObjectMetadata.graphql")
 
 				Expect(err).To(BeNil())
 				str := string(b)
@@ -146,8 +146,8 @@ var _ = Describe("Getting Services via API", Label("e2e", "Services"), func() {
 						imCount += ciEdge.Node.IssueMatches.TotalCount
 						ciCount += *ciEdge.Node.Count
 					}
-					Expect(serviceEdge.Node.ServiceMetadata.IssueMatchCount).To(Equal(imCount))
-					Expect(serviceEdge.Node.ServiceMetadata.ComponentInstanceCount).To(Equal(ciCount))
+					Expect(serviceEdge.Node.ObjectMetadata.IssueMatchCount).To(Equal(imCount))
+					Expect(serviceEdge.Node.ObjectMetadata.ComponentInstanceCount).To(Equal(ciCount))
 				}
 			})