chore: factor out inarray

gabotechs · Dec 10, 2022 · b3dab09 · b3dab09
1 parent 0871b98
commit b3dab09
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 28 deletions.
diff --git a/internal/node/flatten_test.go b/internal/node/flatten_test.go
@@ -6,13 +6,15 @@ import (
 	"testing"
 )
 
+const testGroup = "test-group"
+
 func TestNode_Flatten(t *testing.T) {
 	a := require.New(t)
 
-	node0 := MakeNode("0", 0)
-	node1 := MakeNode("1", 0)
-	node2 := MakeNode("2", 0)
-	node3 := MakeNode("3", 0)
+	node0 := MakeNode("0", testGroup, 0)
+	node1 := MakeNode("1", testGroup, 0)
+	node2 := MakeNode("2", testGroup, 0)
+	node3 := MakeNode("3", testGroup, 0)
 
 	node0.AddChild(node1)
 	node0.AddChild(node2)

diff --git a/internal/node/level.go b/internal/node/level.go
@@ -1,6 +1,10 @@
 package node
 
-import "context"
+import (
+	"context"
+
+	"dep-tree/internal/utils"
+)
 
 type key int
 
@@ -11,15 +15,6 @@ const (
 const unknown = -2
 const cyclic = -1
 
-func elementInArray[T comparable](value T, array []T) bool {
-	for _, el := range array {
-		if value == el {
-			return true
-		}
-	}
-	return false
-}
-
 func hashDep[T any](a *Node[T], b *Node[T]) string {
 	return a.Id + " -> " + b.Id
 }
@@ -47,7 +42,7 @@ func calculateLevel[T any](
 		knownCycles, _ := ctx.Value(cycleKey).([]string)
 		if knownCycles == nil {
 			knownCycles = []string{}
-		} else if elementInArray(dep, knownCycles) {
+		} else if utils.InArray(dep, knownCycles) {
 			continue
 		}
 

diff --git a/internal/node/level_test.go b/internal/node/level_test.go
@@ -10,10 +10,10 @@ import (
 func TestNode_Level(t *testing.T) {
 	a := require.New(t)
 
-	node0 := MakeNode("0", 0)
-	node1 := MakeNode("1", 0)
-	node2 := MakeNode("2", 0)
-	node3 := MakeNode("3", 0)
+	node0 := MakeNode("0", testGroup, 0)
+	node1 := MakeNode("1", testGroup, 0)
+	node2 := MakeNode("2", testGroup, 0)
+	node3 := MakeNode("3", testGroup, 0)
 
 	node0.AddChild(node1, node2)
 	node1.AddChild(node3)
@@ -34,11 +34,11 @@ func TestNode_Level(t *testing.T) {
 func TestNode_Level_Circular(t *testing.T) {
 	a := require.New(t)
 
-	node0 := MakeNode("0", 0)
-	node1 := MakeNode("1", 0)
-	node2 := MakeNode("2", 0)
-	node3 := MakeNode("3", 0)
-	node4 := MakeNode("4", 0)
+	node0 := MakeNode("0", testGroup, 0)
+	node1 := MakeNode("1", testGroup, 0)
+	node2 := MakeNode("2", testGroup, 0)
+	node3 := MakeNode("3", testGroup, 0)
+	node4 := MakeNode("4", testGroup, 0)
 
 	node0.AddChild(node1, node2, node3)
 	node1.AddChild(node2, node4)

diff --git a/internal/node/node.go b/internal/node/node.go
@@ -4,15 +4,17 @@ import "github.com/elliotchance/orderedmap/v2"
 
 type Node[T any] struct {
 	Id       string
+	GroupId  string
 	Data     T
 	Children *orderedmap.OrderedMap[string, *Node[T]]
 	Parents  *orderedmap.OrderedMap[string, *Node[T]]
 }
 
-func MakeNode[T any](id string, data T) *Node[T] {
+func MakeNode[T any](id string, groupId string, data T) *Node[T] {
 	return &Node[T]{
 		Id:       id,
 		Data:     data,
+		GroupId:  groupId,
 		Children: orderedmap.NewOrderedMap[string, *Node[T]](),
 		Parents:  orderedmap.NewOrderedMap[string, *Node[T]](),
 	}

diff --git a/internal/render/board_test.go b/internal/render/board_test.go
@@ -2,11 +2,10 @@ package render
 
 import (
 	"os"
-
-	"github.com/stretchr/testify/require"
-
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 const RebuildTestsEnv = "REBUILD_TESTS"

diff --git a/internal/utils/inarray.go b/internal/utils/inarray.go
@@ -0,0 +1,10 @@
+package utils
+
+func InArray[T comparable](value T, array []T) bool {
+	for _, el := range array {
+		if value == el {
+			return true
+		}
+	}
+	return false
+}