fix(ketchup): Handling pattern update from UI

Signed-off-by: Vincent Boutour <bob@vibioh.fr>

Makefile

@@ -74,7 +74,7 @@ style:
 .PHONY: mocks
 mocks:
 	find . -name "mocks" -type d -exec rm -r "{}" \+
-	mockgen -destination pkg/mocks/model.go -mock_names Mailer=Mailer,AuthService=AuthService,UserService=UserService,UserStore=UserStore,HelmProvider=HelmProvider,RepositoryService=RepositoryService -package mocks github.com/ViBiOh/ketchup/pkg/model Mailer,AuthService,UserService,UserStore,HelmProvider,RepositoryService
+	mockgen -destination pkg/mocks/model.go -mock_names Mailer=Mailer,AuthService=AuthService,UserService=UserService,UserStore=UserStore,HelmProvider=HelmProvider,RepositoryService=RepositoryService,KetchupService=KetchupService -package mocks github.com/ViBiOh/ketchup/pkg/model Mailer,AuthService,UserService,UserStore,HelmProvider,RepositoryService,KetchupService
 
 ## test: Shortcut to launch all the test tasks (unit, functional and integration).
 .PHONY: test

cmd/ketchup/templates/ketchup.html

@@ -138,6 +138,7 @@ <h2 class="header">Edit ketchup</h2>
 
       <form method="POST" action="/app/ketchups/{{ .Repository.ID }}">
         <input type="hidden" name="method" value="PUT">
+        <input type="hidden" name="old-pattern" value="{{ .Pattern }}">
 
         <p class="padding no-margin">
           <label for="edit-pattern-{{ .ID }}" class="block">Pattern: <img class="icon icon-small" title="'latest': latest version, beta included.

pkg/ketchup/ketchups.go

@@ -100,7 +100,7 @@ func (a App) handleUpdate(w http.ResponseWriter, r *http.Request) {
 
 	item := model.NewKetchup(r.FormValue("pattern"), r.FormValue("version"), ketchupFrequency, model.NewGithubRepository(id, "")).WithID()
 
-	updated, err := a.ketchupService.Update(r.Context(), item)
+	updated, err := a.ketchupService.Update(r.Context(), r.FormValue("old-pattern"), item)
 	if err != nil {
 		a.rendererApp.Error(w, err)
 		return

pkg/model/interfaces.go

@@ -55,3 +55,14 @@ type RepositoryService interface {
 	Clean(context.Context) error
 	LatestVersions(Repository) (map[string]semver.Version, error)
 }
+
+// KetchupService defines interaction with ketchup
+type KetchupService interface {
+	List(ctx context.Context, pageSize uint, last string) ([]Ketchup, uint64, error)
+	ListForRepositories(ctx context.Context, repositories []Repository, frequency KetchupFrequency) ([]Ketchup, error)
+	ListOutdatedByFrequency(ctx context.Context, frequency KetchupFrequency) ([]Ketchup, error)
+	Create(ctx context.Context, item Ketchup) (Ketchup, error)
+	Update(ctx context.Context, oldPattern string, item Ketchup) (Ketchup, error)
+	UpdateAll(ctx context.Context) error
+	Delete(ctx context.Context, item Ketchup) error
+}

pkg/notifier/notifier.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/ketchup/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/semver"
-	"github.com/ViBiOh/ketchup/pkg/service/ketchup"
 	"github.com/ViBiOh/ketchup/pkg/service/user"
 	mailerModel "github.com/ViBiOh/mailer/pkg/model"
 	"github.com/prometheus/client_golang/prometheus/push"
@@ -27,7 +26,7 @@ var (
 // App of package
 type App struct {
 	repositoryService model.RepositoryService
-	ketchupService    ketchup.App
+	ketchupService    model.KetchupService
 	userService       user.App
 	mailerApp         model.Mailer
 	helmApp           model.HelmProvider
@@ -53,7 +52,7 @@ func Flags(fs *flag.FlagSet, prefix string) Config {
 }
 
 // New creates new App from Config
-func New(config Config, repositoryService model.RepositoryService, ketchupService ketchup.App, userService user.App, mailerApp model.Mailer, helmApp model.HelmProvider) App {
+func New(config Config, repositoryService model.RepositoryService, ketchupService model.KetchupService, userService user.App, mailerApp model.Mailer, helmApp model.HelmProvider) App {
 	return App{
 		loginID: uint64(*config.loginID),
 		pushURL: strings.TrimSpace(*config.pushURL),

pkg/notifier/notifier_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/ViBiOh/ketchup/pkg/mocks"
 	"github.com/ViBiOh/ketchup/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/semver"
-	"github.com/ViBiOh/ketchup/pkg/service/ketchup/ketchuptest"
 	"github.com/golang/mock/gomock"
 )
 
@@ -167,7 +166,7 @@ func TestGetKetchupToNotify(t *testing.T) {
 	}{
 		{
 			"list error",
-			App{ketchupService: ketchuptest.New().SetListForRepositories(nil, errors.New("failed"))},
+			App{},
 			args{
 				ctx: context.Background(),
 			},
@@ -176,7 +175,7 @@ func TestGetKetchupToNotify(t *testing.T) {
 		},
 		{
 			"empty",
-			App{ketchupService: ketchuptest.New()},
+			App{},
 			args{
 				ctx: context.Background(),
 			},
@@ -185,44 +184,7 @@ func TestGetKetchupToNotify(t *testing.T) {
 		},
 		{
 			"one release, n ketchups",
-			App{ketchupService: ketchuptest.New().SetListForRepositories([]model.Ketchup{
-				{
-					Pattern:    model.DefaultPattern,
-					Repository: model.NewGithubRepository(1, repositoryName),
-					User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
-					Version:    repositoryVersion,
-				},
-				{
-					Pattern:    model.DefaultPattern,
-					Repository: model.NewGithubRepository(1, repositoryName),
-					User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
-					Version:    repositoryVersion,
-				},
-				{
-					Pattern:    model.DefaultPattern,
-					Repository: model.NewGithubRepository(2, "vibioh/dotfiles"),
-					User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
-					Version:    repositoryVersion,
-				},
-				{
-					Pattern:    "^1.1-0",
-					Repository: model.NewGithubRepository(2, "vibioh/dotfiles"),
-					User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
-					Version:    repositoryVersion,
-				},
-				{
-					Pattern:    model.DefaultPattern,
-					Repository: model.NewGithubRepository(3, "vibioh/zzz"),
-					User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
-					Version:    repositoryVersion,
-				},
-				{
-					Pattern:    model.DefaultPattern,
-					Repository: model.NewGithubRepository(3, "vibioh/zzz"),
-					User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
-					Version:    "1.1.0",
-				},
-			}, nil)},
+			App{},
 			args{
 				ctx: context.Background(),
 				releases: []model.Release{
@@ -283,6 +245,61 @@ func TestGetKetchupToNotify(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.intention, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+
+			mockKetchupService := mocks.NewKetchupService(ctrl)
+
+			tc.instance.ketchupService = mockKetchupService
+
+			switch tc.intention {
+			case "list error":
+				mockKetchupService.EXPECT().ListForRepositories(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("failed"))
+			case "empty":
+				mockKetchupService.EXPECT().ListForRepositories(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil)
+				mockKetchupService.EXPECT().ListOutdatedByFrequency(gomock.Any(), gomock.Any()).Return(nil, nil)
+			case "one release, n ketchups":
+				mockKetchupService.EXPECT().ListForRepositories(gomock.Any(), gomock.Any(), gomock.Any()).Return([]model.Ketchup{
+					{
+						Pattern:    model.DefaultPattern,
+						Repository: model.NewGithubRepository(1, repositoryName),
+						User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
+						Version:    repositoryVersion,
+					},
+					{
+						Pattern:    model.DefaultPattern,
+						Repository: model.NewGithubRepository(1, repositoryName),
+						User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
+						Version:    repositoryVersion,
+					},
+					{
+						Pattern:    model.DefaultPattern,
+						Repository: model.NewGithubRepository(2, "vibioh/dotfiles"),
+						User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
+						Version:    repositoryVersion,
+					},
+					{
+						Pattern:    "^1.1-0",
+						Repository: model.NewGithubRepository(2, "vibioh/dotfiles"),
+						User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
+						Version:    repositoryVersion,
+					},
+					{
+						Pattern:    model.DefaultPattern,
+						Repository: model.NewGithubRepository(3, "vibioh/zzz"),
+						User:       model.NewUser(1, testEmail, authModel.NewUser(0, "")),
+						Version:    repositoryVersion,
+					},
+					{
+						Pattern:    model.DefaultPattern,
+						Repository: model.NewGithubRepository(3, "vibioh/zzz"),
+						User:       model.NewUser(2, "guest@nowhere", authModel.NewUser(0, "")),
+						Version:    "1.1.0",
+					},
+				}, nil)
+				mockKetchupService.EXPECT().ListOutdatedByFrequency(gomock.Any(), gomock.Any()).Return(nil, nil)
+			}
+
 			got, gotErr := tc.instance.getKetchupToNotify(tc.args.ctx, tc.args.releases)
 
 			failed := false