From b49ab8650c1b6390e3d06e6ad69a98b9755631f7 Mon Sep 17 00:00:00 2001 From: Mateusz Luszczewski Date: Mon, 7 Dec 2020 10:18:43 +0100 Subject: [PATCH 1/3] fixed bug with last_stable after add first stable version --- service/model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/model.go b/service/model.go index c71a2bd..8efe919 100644 --- a/service/model.go +++ b/service/model.go @@ -164,7 +164,7 @@ func (s *ModelsService) SetLabel(ctx context.Context, model app.ModelID) (*app.L return nil, err } - if model.Label == app.StableLabel { + if model.Label == app.StableLabel && prevVersion != 0 { lastStableModel := app.ModelID{ServableID: model.ServableID, Version: prevVersion, Label: app.PrevStableLabel} if err := s.metadata.ChangeLabel(ctx, app.ModelData{ModelID: lastStableModel, Status: app.StatusReady}); err != nil { logging.ErrorWithStack(ctx, exterr.WrapWithFrame(err)) From f8b6da3f4c21fd7ebb6a90462502cb1ddf1e17fe Mon Sep 17 00:00:00 2001 From: Mateusz Luszczewski Date: Mon, 7 Dec 2020 10:21:09 +0100 Subject: [PATCH 2/3] changed message after first stable version addition --- rest/model.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rest/model.go b/rest/model.go index 59dbf9b..4e3e077 100644 --- a/rest/model.go +++ b/rest/model.go @@ -269,8 +269,13 @@ func (rest *REST) setModelLabelToStableHandler(w http.ResponseWriter, r *http.Re return } - writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' changed from version [%d] to [%d]", - lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.PreviousVersion, lChangedResp.NewVersion)) + if lChangedResp.PreviousVersion != 0 { + writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' changed from version [%d] to [%d]", + lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.PreviousVersion, lChangedResp.NewVersion)) + } else { + writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' version set to [%d]", + lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.NewVersion)) + } } func (rest *REST) setModelLabelHandler(w http.ResponseWriter, r *http.Request) { From d9e10416c2987c9443bbd2e33bd677fc94c148b2 Mon Sep 17 00:00:00 2001 From: Mateusz Luszczewski Date: Wed, 9 Dec 2020 12:46:06 +0100 Subject: [PATCH 3/3] deleted else in if statement which checks PreviousVersion variable --- rest/model.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rest/model.go b/rest/model.go index 4e3e077..9db8563 100644 --- a/rest/model.go +++ b/rest/model.go @@ -272,10 +272,12 @@ func (rest *REST) setModelLabelToStableHandler(w http.ResponseWriter, r *http.Re if lChangedResp.PreviousVersion != 0 { writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' changed from version [%d] to [%d]", lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.PreviousVersion, lChangedResp.NewVersion)) - } else { - writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' version set to [%d]", - lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.NewVersion)) + return } + + writeJSONSuccessResponse(w, r, http.StatusOK, fmt.Sprintf("model[%s-%s-%s] label '%s' version set to [%d]", + lChangedResp.Team, lChangedResp.Project, lChangedResp.Name, lChangedResp.Label, lChangedResp.NewVersion)) + } func (rest *REST) setModelLabelHandler(w http.ResponseWriter, r *http.Request) {