feat(notifier): Sorting release by kind and name for better formatting

Signed-off-by: Vincent Boutour <[email protected]>

pkg/model/ketchup.go

@@ -134,3 +134,18 @@ func (a ReleaseByRepositoryIDAndPattern) Less(i, j int) bool {
 	}
 	return a[i].Repository.ID < a[j].Repository.ID
 }
+
+// ReleaseByKindAndName sort release by repository kind and repository name
+type ReleaseByKindAndName []Release
+
+func (a ReleaseByKindAndName) Len() int      { return len(a) }
+func (a ReleaseByKindAndName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ReleaseByKindAndName) Less(i, j int) bool {
+	if a[i].Repository.Kind == a[j].Repository.Kind {
+		if a[i].Repository.Name == a[j].Repository.Name {
+			return a[i].Repository.Part < a[j].Repository.Part
+		}
+		return a[i].Repository.Name < a[j].Repository.Name
+	}
+	return a[i].Repository.Kind < a[j].Repository.Kind
+}

pkg/model/ketchup_test.go

@@ -224,3 +224,40 @@ func TestReleaseByRepositoryID(t *testing.T) {
 		})
 	}
 }
+
+func TestReleaseByKindAndName(t *testing.T) {
+	type args struct {
+		array []Release
+	}
+
+	var cases = []struct {
+		intention string
+		args      args
+		want      []Release
+	}{
+		{
+			"simple",
+			args{
+				array: []Release{
+					NewRelease(NewHelmRepository(3, "http://chart", "app"), DefaultPattern, semver.Version{}),
+					NewRelease(NewGithubRepository(1, "vibioh/github"), DefaultPattern, semver.Version{}),
+					NewRelease(NewHelmRepository(2, "http://chart", "cron"), DefaultPattern, semver.Version{}),
+				},
+			},
+			[]Release{
+				NewRelease(NewGithubRepository(1, "vibioh/github"), DefaultPattern, semver.Version{}),
+				NewRelease(NewHelmRepository(3, "http://chart", "app"), DefaultPattern, semver.Version{}),
+				NewRelease(NewHelmRepository(2, "http://chart", "cron"), DefaultPattern, semver.Version{}),
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.intention, func(t *testing.T) {
+			sort.Sort(ReleaseByKindAndName(tc.args.array))
+			if got := tc.args.array; !reflect.DeepEqual(got, tc.want) {
+				t.Errorf("ReleaseByRepositoryID() = %+v, want %+v", got, tc.want)
+			}
+		})
+	}
+}

pkg/notifier/notifier.go

@@ -242,6 +242,8 @@ func (a app) sendNotification(ctx context.Context, ketchupToNotify map[model.Use
 	for user, releases := range ketchupToNotify {
 		logger.Info("Sending email to %s for %d releases", user.Email, len(releases))
 
+		sort.Sort(model.ReleaseByKindAndName(releases))
+
 		payload := map[string]interface{}{
 			"releases": releases,
 		}