Add badge route for specific commit and latest

Author: Wilfried OLLIVIER

application/application.go

@@ -137,12 +137,13 @@ func New(cfg *conf.Conf) (*Application, error) {
 					r.Post("/", a.PostTaskHandler)
 					r.Get("/", a.TaskHandler(false))
 					r.Get("/status", badge.StatusBadge(a.storage, false))
-					r.Get("/badge/{badge}", a.TaskMyBadgeHandler)
+					r.Get("/badge/{badge}", a.BadgeMyTaskHandler(false))
 					r.Get("/volumes/*", a.VolumesHandler(6, false))
 				})
 				r.Route("/latest", func(r chi.Router) {
 					r.Get("/", a.TaskHandler(true))
 					r.Get("/status", badge.StatusBadge(a.storage, true))
+					r.Get("/badge/{badge}", a.BadgeMyTaskHandler(true))
 					r.Get("/volumes/*", a.VolumesHandler(6, true))
 				})
 			})

application/badge.go

@@ -13,53 +13,56 @@ import (
 	"go.uber.org/zap"
 )
 
-func (a *Application) TaskMyBadgeHandler(w http.ResponseWriter, r *http.Request) {
-	l := a.logger.With(
-		zap.String("url", r.URL.String()),
-		zap.String("service", chi.URLParam(r, "serviceID")),
-		zap.String("project", chi.URLParam(r, "project")),
-		zap.String("branch", chi.URLParam(r, "branch")),
-		zap.String("commit", chi.URLParam(r, "commit")),
-		zap.String("branch", chi.URLParam(r, "branch")),
-	)
-	service := chi.URLParam(r, "serviceID")
-	project := chi.URLParam(r, "project")
-	branch := chi.URLParam(r, "branch")
-	commit := chi.URLParam(r, "commit")
-	bdg := chi.URLParam(r, "badge")
+// BadgeMyTaskHandler generates a badge for a given task
+func (a *Application) BadgeMyTaskHandler(latest bool) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := a.logger.With(
+			zap.String("url", r.URL.String()),
+			zap.String("service", chi.URLParam(r, "serviceID")),
+			zap.String("project", chi.URLParam(r, "project")),
+			zap.String("branch", chi.URLParam(r, "branch")),
+			zap.String("commit", chi.URLParam(r, "commit")),
+			zap.String("branch", chi.URLParam(r, "branch")),
+		)
+		service := chi.URLParam(r, "serviceID")
+		project := chi.URLParam(r, "project")
+		branch := chi.URLParam(r, "branch")
+		commit := chi.URLParam(r, "commit")
+		bdg := chi.URLParam(r, "badge")
 
-	t, err := a.storage.GetByCommit(service, project, branch, commit, false)
-	if err != nil {
-		l.Warn("Task get error", zap.Error(err))
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
+		t, err := a.storage.GetByCommit(service, project, branch, commit, latest)
+		if err != nil {
+			l.Warn("Task get error", zap.Error(err))
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
 
-	p := filepath.Join(a.storage.GetVolumePath(t), "/data", fmt.Sprintf("%s.badge", bdg))
+		p := filepath.Join(a.storage.GetVolumePath(t), "/data", fmt.Sprintf("%s.badge", bdg))
 
-	_, err = os.Stat(p)
-	if err != nil {
-		l.Warn("Task get error", zap.Error(err))
-		if os.IsNotExist(err) {
-			w.WriteHeader(http.StatusNotFound)
-		} else {
-			w.WriteHeader(http.StatusBadRequest)
+		_, err = os.Stat(p)
+		if err != nil {
+			l.Warn("Task get error", zap.Error(err))
+			if os.IsNotExist(err) {
+				w.WriteHeader(http.StatusNotFound)
+			} else {
+				w.WriteHeader(http.StatusBadRequest)
+			}
+			return
 		}
-		return
-	}
-	l = l.With(zap.String("path", p))
-	b, err := ioutil.ReadFile(p)
-	if err != nil {
-		l.Error("reading file", zap.Error(err))
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	var badge _badge.Badge
-	err = json.Unmarshal(b, &badge)
-	if err != nil {
-		l.Error("JSON unmarshal", zap.Error(err))
-		w.WriteHeader(http.StatusInternalServerError)
-		return
+		l = l.With(zap.String("path", p))
+		b, err := ioutil.ReadFile(p)
+		if err != nil {
+			l.Error("reading file", zap.Error(err))
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		var badge _badge.Badge
+		err = json.Unmarshal(b, &badge)
+		if err != nil {
+			l.Error("JSON unmarshal", zap.Error(err))
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		badge.Render(w, r)
 	}
-	badge.Render(w, r)
 }