fix: addressed comments

cloudoperators · Sep 25, 2024 · 0a86391 · 0a86391
1 parent 3d6cc8a
commit 0a86391
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/internal/api/graphql/graph/baseResolver/component_version.go b/internal/api/graphql/graph/baseResolver/component_version.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cloudoperators/heureka/internal/api/graphql/graph/model"
 	"github.com/cloudoperators/heureka/internal/app"
 	"github.com/cloudoperators/heureka/internal/entity"
-	"github.com/samber/lo"
+	"github.com/cloudoperators/heureka/internal/util"
 	"github.com/sirupsen/logrus"
 )
 
@@ -86,14 +86,11 @@ func ComponentVersionBaseResolver(app app.Heureka, ctx context.Context, filter *
 			componentId = []*int64{pid}
 		}
 	} else {
-		componentId = lo.Map(filter.ComponentID, func(id *string, _ int) *int64 {
-			i, err := ParseCursor(id)
-			if err != nil {
-				logrus.WithField("componentId", filter.ComponentID).Error("ComponentVersionBaseResolver: Error while parsing parameter 'componentId'")
-				return nil
-			}
-			return i
-		})
+		componentId, err = util.ConvertStrToIntSlice(filter.ComponentID)
+
+		if err != nil {
+			return nil, NewResolverError("ComponentVersionBaseResolver", "Bad Request - Error while parsing filter component ID")
+		}
 	}
 
 	f := &entity.ComponentVersionFilter{

diff --git a/internal/app/component_version/component_version_handler.go b/internal/app/component_version/component_version_handler.go
@@ -4,9 +4,8 @@
 package component_version
 
 import (
+	"errors"
 	"fmt"
-	"strings"
-
 	"github.com/cloudoperators/heureka/internal/app/common"
 	"github.com/cloudoperators/heureka/internal/app/event"
 	"github.com/cloudoperators/heureka/internal/database"
@@ -118,10 +117,11 @@ func (cv *componentVersionHandler) CreateComponentVersion(componentVersion *enti
 	newComponent, err := cv.database.CreateComponentVersion(componentVersion)
 
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "Error 1062") {
+		l.Error(err)
+		duplicateEntryError := &database.DuplicateEntryDatabaseError{}
+		if errors.As(err, &duplicateEntryError) {
 			return nil, NewComponentVersionHandlerError("Entry already Exists")
 		}
-		l.Error(err)
 		return nil, NewComponentVersionHandlerError("Internal error while creating componentVersion.")
 	}
 

diff --git a/internal/app/issue/issue_handler.go b/internal/app/issue/issue_handler.go
@@ -3,9 +3,8 @@
 package issue
 
 import (
+	"errors"
 	"fmt"
-	"strings"
-
 	"github.com/cloudoperators/heureka/internal/app/common"
 	"github.com/cloudoperators/heureka/internal/app/event"
 	"github.com/cloudoperators/heureka/internal/database"
@@ -248,10 +247,11 @@ func (is *issueHandler) AddComponentVersionToIssue(issueId, componentVersionId i
 	err := is.database.AddComponentVersionToIssue(issueId, componentVersionId)
 
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "Error 1062") {
+		l.Error(err)
+		duplicateEntryError := &database.DuplicateEntryDatabaseError{}
+		if errors.As(err, &duplicateEntryError) {
 			return nil, NewIssueHandlerError("Entry already Exists")
 		}
-		l.Error(err)
 		return nil, NewIssueHandlerError("Internal error while adding component version to issue.")
 	}
 

diff --git a/scanner/k8s-assets/processor/processor.go b/scanner/k8s-assets/processor/processor.go
@@ -142,10 +142,7 @@ func (p *Processor) getSupportGroup(ctx context.Context, serviceInfo scanner.Ser
 
 	// Return the first item
 	if listSupportGroupsResp.SupportGroups.TotalCount > 0 {
-		for _, sg := range listSupportGroupsResp.SupportGroups.Edges {
-			supportGroupId = sg.Node.Id
-			break
-		}
+		supportGroupId = listSupportGroupsResp.SupportGroups.Edges[0].Node.Id
 	} else {
 		return "", fmt.Errorf("ListSupportGroups returned no SupportGroupID")
 	}