updated router, refactored to use utils from sc

catalog/catalogapi.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"github.com/linksmart/service-catalog/v3/utils"
 )
 
 type ThingsCollection struct {
@@ -180,8 +181,8 @@ func (a *HTTPAPI) List(w http.ResponseWriter, req *http.Request) {
 		ErrorResponse(w, http.StatusBadRequest, "Error parsing the query:", err.Error())
 		return
 	}
-	page, perPage, err := ParsePagingParams(
-		req.Form.Get(GetParamPage), req.Form.Get(GetParamPerPage), MaxPerPage)
+	page, perPage, err := utils.ParsePagingParams(
+		req.Form.Get(utils.GetParamPage), req.Form.Get(utils.GetParamPerPage), MaxPerPage)
 	if err != nil {
 		ErrorResponse(w, http.StatusBadRequest, "Error parsing query parameters:", err.Error())
 		return
@@ -224,8 +225,8 @@ func (a *HTTPAPI) Filter(w http.ResponseWriter, req *http.Request) {
 		ErrorResponse(w, http.StatusBadRequest, "Error parsing the query:", err.Error())
 		return
 	}
-	page, perPage, err := ParsePagingParams(
-		req.Form.Get(GetParamPage), req.Form.Get(GetParamPerPage), MaxPerPage)
+	page, perPage, err := utils.ParsePagingParams(
+		req.Form.Get(utils.GetParamPage), req.Form.Get(utils.GetParamPerPage), MaxPerPage)
 	if err != nil {
 		ErrorResponse(w, http.StatusBadRequest, "Error parsing query parameters:", err.Error())
 		return

catalog/constants.go

@@ -9,5 +9,4 @@ const (
 	ApiVersion       = "1.0.0"
 	BackendMemory    = "memory"
 	BackendLevelDB   = "leveldb"
-	loggerPrefix     = "[catalog] "
 )

catalog/controller.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/linksmart/service-catalog/v3/utils"
 	uuid "github.com/satori/go.uuid"
 )
 
@@ -98,7 +99,7 @@ func (c *Controller) filter(path, op, value string, page, perPage int) ([]ThingD
 		}
 
 		for i := range slice {
-			matched, err := MatchObject(slice[i], strings.Split(path, "."), op, value)
+			matched, err := utils.MatchObject(slice[i], strings.Split(path, "."), op, value)
 			if err != nil {
 				return nil, 0, err
 			}
@@ -112,7 +113,7 @@ func (c *Controller) filter(path, op, value string, page, perPage int) ([]ThingD
 		}
 	}
 	// Pagination
-	offset, limit, err := GetPagingAttr(len(matches), page, perPage, MaxPerPage)
+	offset, limit, err := utils.GetPagingAttr(len(matches), page, perPage, MaxPerPage)
 	if err != nil {
 		return nil, 0, &BadRequestError{fmt.Sprintf("Unable to paginate: %s", err)}
 	}

catalog/ldbstorage.go

@@ -9,6 +9,7 @@ import (
 	"net/url"
 	"sync"
 
+	"github.com/linksmart/service-catalog/v3/utils"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -117,7 +118,7 @@ func (s *LevelDBStorage) list(page int, perPage int) ([]ThingDescription, int, e
 	if err != nil {
 		return nil, 0, err
 	}
-	offset, limit, err := GetPagingAttr(total, page, perPage, MaxPerPage)
+	offset, limit, err := utils.GetPagingAttr(total, page, perPage, MaxPerPage)
 	if err != nil {
 		return nil, 0, &BadRequestError{fmt.Sprintf("Unable to paginate: %s", err)}
 	}