Merge branch 'release/v0.14.2' into main

Author: nhinze23

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v0.14.2] - 2024-10-18
+### Fixed
+- [#44] fix, that dogus with irrelevant optional dependencies were not included when sorting by dependency
+
 ## [v0.14.1] - 2024-10-17
 ### Changed
 - use topological sorting to sort dogus by dependency

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=cesapp-lib
-VERSION=0.14.1
+VERSION=0.14.2
 
 GOTAG?=1.18.6
 MAKEFILES_VERSION=7.4.0

core/dogu-sort.go

@@ -101,8 +101,8 @@ func (bd *sortByDependency) getDependencyEdges() []toposort.Edge {
 	var dependencyEdges []toposort.Edge
 	for _, dogu := range bd.dogus {
 		dependencies := dogu.GetAllDependenciesOfType(DependencyTypeDogu)
-		if len(dependencies) > 0 {
-			dependentDogus := bd.dependenciesToDogus(dependencies)
+		dependentDogus := bd.dependenciesToDogus(dependencies)
+		if len(dependentDogus) > 0 {
 			for _, dependency := range dependentDogus {
 				dependencyEdges = append(dependencyEdges, toposort.Edge{dependency, dogu})
 			}

core/dogu-sort_test.go

@@ -143,6 +143,18 @@ func TestSortDogusByDependencyWithError(t *testing.T) {
 		assert.Nil(t, dogus)
 	})
 
+	t.Run("should return dogu if only irrelevant optional dependencies are set", func(t *testing.T) {
+		a := &Dogu{
+			Name:                 "a",
+			OptionalDependencies: []Dependency{{Type: DependencyTypeDogu, Name: "c"}},
+		}
+
+		dogus, err := SortDogusByDependencyWithError([]*Dogu{a})
+		assert.NoError(t, err)
+		assert.Len(t, dogus, 1)
+		assert.Equal(t, "a", dogus[0].Name)
+	})
+
 }
 
 func stringSliceContains(slice []string, item string) bool {
@@ -310,6 +322,18 @@ func TestSortDogusByInvertedDependency(t *testing.T) {
 		dogus := SortDogusByInvertedDependency([]*Dogu{a, b, c})
 		assert.Nil(t, dogus)
 	})
+
+	t.Run("should return dogu if only irrelevant optional dependencies are set", func(t *testing.T) {
+		a := &Dogu{
+			Name:                 "a",
+			OptionalDependencies: []Dependency{{Type: DependencyTypeDogu, Name: "c"}},
+		}
+
+		dogus, err := SortDogusByInvertedDependencyWithError([]*Dogu{a})
+		assert.NoError(t, err)
+		assert.Len(t, dogus, 1)
+		assert.Equal(t, "a", dogus[0].Name)
+	})
 }
 
 func TestTransformsDependencyListToDoguList(t *testing.T) {