post fumpt

Author: tsim-sap

internal/api/graphql/graph/baseResolver/vulnerability.go

@@ -20,7 +20,14 @@ import (
 // - Only returns Issues of type Vulnerability
 // - Only returns Issues with at least one IssueMatch with status "new"
 // - Default ordering is by IssueVariantRating (descending), EarliestTargetRemediationDate (ascending) and IssuePrimaryName (ascending)
-func VulnerabilityBaseResolver(app app.Heureka, ctx context.Context, filter *model.VulnerabilityFilter, first *int, after *string, parent *model.NodeParent) (*model.VulnerabilityConnection, error) {
+func VulnerabilityBaseResolver(
+	app app.Heureka,
+	ctx context.Context,
+	filter *model.VulnerabilityFilter,
+	first *int,
+	after *string,
+	parent *model.NodeParent,
+) (*model.VulnerabilityConnection, error) {
 	requestedFields := GetPreloads(ctx)
 	logrus.WithFields(logrus.Fields{
 		"requestedFields": requestedFields,

internal/api/graphql/graph/model/models.go

@@ -469,10 +469,12 @@ func NewVulnerability(issue *entity.Issue, aggregations *entity.IssueAggregation
 		Name:        &issue.PrimaryName,
 		Description: &issue.Description,
 	}
+
 	if aggregations != nil && !aggregations.EarliestTargetRemediationDate.IsZero() {
 		date := aggregations.EarliestTargetRemediationDate.Format(time.RFC3339)
 		v.EarliestTargetRemediationDate = &date
 	}
+
 	return v
 }
 

internal/api/graphql/graph/resolver/vulnerability.go

@@ -238,12 +238,14 @@ var _ = Describe("When listing Issues", Label("app", "ListIssues"), func() {
 			db.On("GetIssues", filter, []entity.Order{}).Return(issues, nil)
 			db.On("GetAllIssueCursors", filter, []entity.Order{}).Return(cursors, nil)
 			db.On("CountIssueTypes", filter).Return(issueTypeCounts, nil)
-			issueHandler = appIssue.NewIssueHandler(handlerContext)
+			issueHandler = issue.NewIssueHandler(handlerContext)
 			res, err := issueHandler.ListIssues(filter, options)
 			Expect(err).To(BeNil(), "no error should be thrown")
 			Expect(*res.PageInfo.HasNextPage).To(BeEquivalentTo(hasNextPage), "correct hasNextPage indicator")
 			Expect(len(res.Elements)).To(BeEquivalentTo(resElements))
-			Expect(len(res.PageInfo.Pages)).To(BeEquivalentTo(int(math.Ceil(float64(dbElements)/float64(pageSize)))), "correct  number of pages")
+			Expect(
+				len(res.PageInfo.Pages),
+			).To(BeEquivalentTo(int(math.Ceil(float64(dbElements)/float64(pageSize)))), "correct  number of pages")
 		},
 			Entry("When pageSize is 1 and the database was returning 2 elements", 1, 2, 1, true),
 			Entry("When pageSize is 10 and the database was returning 9 elements", 10, 9, 9, false),

internal/app/issue/issue_handler_test.go

@@ -369,7 +369,10 @@ func WithIssue(order []entity.Order, issue entity.Issue, ivRating int64, earlies
 			case entity.IssueVariantRating:
 				cursors.fields = append(cursors.fields, Field{Name: entity.IssueVariantRating, Value: ivRating, Order: o.Direction})
 			case entity.IssueEarliestTargetRemediationDate:
-				cursors.fields = append(cursors.fields, Field{Name: entity.IssueEarliestTargetRemediationDate, Value: earliestTargetRemediationDate, Order: o.Direction})
+				cursors.fields = append(
+					cursors.fields,
+					Field{Name: entity.IssueEarliestTargetRemediationDate, Value: earliestTargetRemediationDate, Order: o.Direction},
+				)
 			default:
 				continue
 			}

internal/database/mariadb/cursor.go

@@ -182,8 +182,8 @@ func getIssueJoinsExtended(filter *entity.IssueFilter, order []entity.Order, inc
 		`)
 	}
 
-	if len(filter.ServiceId) > 0 || len(filter.ServiceCCRN) > 0 || len(filter.SupportGroupCCRN) > 0 || filter.AllServices || includeAggJoins {
-
+	if len(filter.ServiceId) > 0 || len(filter.ServiceCCRN) > 0 || len(filter.SupportGroupCCRN) > 0 || filter.AllServices ||
+		includeAggJoins {
 		joins = fmt.Sprintf("%s\n%s", joins, `
 			LEFT JOIN ComponentInstance CI ON CI.componentinstance_id = IM.issuematch_component_instance_id
 		`)
@@ -435,7 +435,8 @@ func (s *SqlDatabase) GetIssuesWithAggregations(
 
 	filter = ensureIssueFilter(filter)
 	joins := getIssueJoinsExtended(filter, order, true)
-	cursorFields, err := DecodeCursor(filter.Paginated.After)
+
+	cursorFields, err := DecodeCursor(filter.After)
 	if err != nil {
 		return nil, err
 	}
@@ -635,9 +636,10 @@ func (s *SqlDatabase) GetAllIssueCursors(
 		if row.IssueVariantRow != nil {
 			ivRating = row.RatingNumerical.Int64
 		}
+
 		var etrd time.Time
 		if row.IssueAggregationsRow != nil {
-			etrd = GetTimeValue(row.IssueAggregationsRow.EarliestTargetRemediationDate)
+			etrd = GetTimeValue(row.EarliestTargetRemediationDate)
 		}
 
 		cursor, _ := EncodeCursor(WithIssue(order, issue, ivRating, etrd))
@@ -685,9 +687,10 @@ func (s *SqlDatabase) GetIssues(
 			if e.IssueVariantRow != nil {
 				ivRating = e.RatingNumerical.Int64
 			}
+
 			var etrd time.Time
 			if e.IssueAggregationsRow != nil {
-				etrd = GetTimeValue(e.IssueAggregationsRow.EarliestTargetRemediationDate)
+				etrd = GetTimeValue(e.EarliestTargetRemediationDate)
 			}
 
 			cursor, _ := EncodeCursor(WithIssue(order, issue, ivRating, etrd))

internal/database/mariadb/issue.go

@@ -517,7 +517,9 @@ var _ = Describe("Issue", Label("database", "Issue"), func() {
 						},
 						[]entity.Order{},
 						func(entries []entity.IssueResult) string {
-							after, _ := mariadb.EncodeCursor(mariadb.WithIssue([]entity.Order{}, *entries[len(entries)-1].Issue, 0, time.Time{}))
+							after, _ := mariadb.EncodeCursor(
+								mariadb.WithIssue([]entity.Order{}, *entries[len(entries)-1].Issue, 0, time.Time{}),
+							)
 							return after
 						},
 						len(seedCollection.IssueRows),
@@ -1283,7 +1285,7 @@ var _ = Describe("Ordering Issues", Label("IssueOrder"), func() {
 			// 2. Issue 3 (Feb 17 07:15)
 			// 3. Issue 1 (Feb 17 01:10)
 
-			var idx1, idx2, idx3 int = -1, -1, -1
+			idx1, idx2, idx3 := -1, -1, -1
 			for i, r := range res {
 				if r.Issue.Id == issue1Row.Id.Int64 {
 					idx1 = i