fix: badges broken (resolve #475)

routes/compat/shields/v1/badge.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/go-chi/chi/v5"
 	"github.com/muety/wakapi/helpers"
+	"github.com/muety/wakapi/models/types"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"net/http"
 	"time"
@@ -97,7 +98,7 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.Inter
 		User: user,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/shields/v1/badge_test.go

@@ -1,43 +0,0 @@
-package v1
-
-import (
-	"github.com/stretchr/testify/assert"
-	"regexp"
-	"testing"
-)
-
-func TestBadgeHandler_EntityPattern(t *testing.T) {
-	type test struct {
-		test string
-		key  string
-		val  string
-	}
-
-	pathPrefix := "/compat/shields/v1/current/today/"
-
-	tests := []test{
-		{test: pathPrefix + "project:wakapi", key: "project", val: "wakapi"},
-		{test: pathPrefix + "os:Linux", key: "os", val: "Linux"},
-		{test: pathPrefix + "editor:VSCode", key: "editor", val: "VSCode"},
-		{test: pathPrefix + "language:Java", key: "language", val: "Java"},
-		{test: pathPrefix + "machine:devmachine", key: "machine", val: "devmachine"},
-		{test: pathPrefix + "label:work", key: "label", val: "work"},
-		{test: pathPrefix + "foo:bar", key: "", val: ""},                                   // invalid entity
-		{test: pathPrefix + "project:01234", key: "project", val: "01234"},                 // digits only
-		{test: pathPrefix + "project:anchr-web-ext", key: "project", val: "anchr-web-ext"}, // with dashes
-		{test: pathPrefix + "project:wakapi v2", key: "project", val: "wakapi v2"},         // with blank space
-		{test: pathPrefix + "project:project", key: "project", val: "project"},
-		{test: pathPrefix + "project:Anchr-Android_v2.0", key: "project", val: "Anchr-Android_v2.0"}, // all the way
-	}
-
-	sut := regexp.MustCompile(`(project|os|editor|language|machine|label):([^:?&/]+)`) // see entityFilterPattern in badge_utils.go
-
-	for _, tc := range tests {
-		var key, val string
-		if groups := sut.FindStringSubmatch(tc.test); len(groups) > 2 {
-			key, val = groups[1], groups[2]
-		}
-		assert.Equal(t, tc.key, key)
-		assert.Equal(t, tc.val, val)
-	}
-}

routes/compat/wakatime/v1/all_time.go

@@ -7,6 +7,7 @@ import (
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"github.com/muety/wakapi/models/types"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
 	"net/http"
@@ -68,7 +69,7 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User, filters *models.Filt
 		Recompute: false,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/wakatime/v1/statusbar.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"github.com/go-chi/chi/v5"
 	"github.com/muety/wakapi/helpers"
+	"github.com/muety/wakapi/models/types"
 	"net/http"
 	"time"
 
@@ -90,7 +91,7 @@ func (h *StatusBarHandler) loadUserSummary(user *models.User, start, end time.Ti
 		Recompute: false,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/wakatime/v1/users_test.go

@@ -77,7 +77,7 @@ func TestUsersHandler_Get(t *testing.T) {
 
 			data, err := ioutil.ReadAll(res.Body)
 			if err != nil {
-				t.Errorf("unextected error. Error: %s", err)
+				t.Errorf("unexpected error. Error: %s", err)
 			}
 
 			if !strings.Contains(string(data), "\"username\":\"AdminUser\"") {