Merge branch 'master' into feat-576-request-metrics

actions/access_keys/access_keys_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -29,9 +27,6 @@ func (ts *TestSuite) TearDownSuite() {
 func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
-	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

actions/admin/admin_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	adminRoutes := NewHandler(ts.AppConfig, ts.Services)
 	adminRoutes.RegisterAdminEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

actions/base/base_test.go

@@ -4,8 +4,6 @@ import (
 	"testing"
 
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -29,8 +27,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler()
 	routes.RegisterBaseEndpoints(ts.Router.Group(""))
 }

actions/contacts/contacts_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

actions/contacts/create.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/engine"
 	"github.com/bitcoin-sv/spv-wallet/mappings"
+	"github.com/bitcoin-sv/spv-wallet/server/auth"
 	"github.com/gin-gonic/gin"
 )
 
@@ -23,19 +24,26 @@ import (
 // @Security	bux-auth-xpub
 func (a *Action) create(c *gin.Context) {
 
-	fullName := c.GetString("full_name")
-	paymail := c.GetString("paymail")
-	pubKey := c.GetString("pubKey")
+	var contact engine.Contact
+
+	err := c.ShouldBindJSON(&contact)
+
+	if err != nil {
+		c.JSON(http.StatusUnprocessableEntity, err.Error())
+		return
+	}
+
+	pubKey := c.GetString(auth.ParamXPubKey)
 
 	var requestBody CreateContact
 
-	contact, err := a.Services.SpvWalletEngine.NewContact(c.Request.Context(), fullName, paymail, pubKey, engine.WithMetadatas(requestBody.Metadata))
+	newContact, err := a.Services.SpvWalletEngine.NewContact(c.Request.Context(), contact.FullName, contact.Paymail, pubKey, engine.WithMetadatas(requestBody.Metadata))
 	if err != nil {
 		c.JSON(http.StatusUnprocessableEntity, err.Error())
 		return
 	}
 
-	contract := mappings.MapToContactContract(contact)
+	contract := mappings.MapToContactContract(newContact)
 
 	c.JSON(http.StatusCreated, contract)
 }

actions/contacts/models.go

@@ -1,8 +1,21 @@
 package contacts
 
-import "github.com/bitcoin-sv/spv-wallet/engine"
+import (
+	"github.com/bitcoin-sv/spv-wallet/engine"
+	"github.com/bitcoin-sv/spv-wallet/models"
+)
 
 // CreateContact is the model for creating a contact
 type CreateContact struct {
 	Metadata engine.Metadata `json:"metadata"`
 }
+
+// UpdateContact is the model for updating a contact
+type UpdateContact struct {
+	XPubID   string               `json:"xpub_id"`
+	FullName string               `json:"full_name"`
+	Paymail  string               `json:"paymail"`
+	PubKey   string               `json:"pubKey"`
+	Status   models.ContactStatus `json:"status"`
+	Metadata engine.Metadata      `json:"metadata"`
+}

actions/contacts/routes.go

@@ -19,6 +19,11 @@ func NewHandler(appConfig *config.AppConfig, services *config.AppServices) route
 	apiEndpoints := routes.APIEndpointsFunc(func(router *gin.RouterGroup) {
 		contactGroup := router.Group("/contact")
 		contactGroup.POST("", action.create)
+		contactGroup.PATCH("", action.update)
+
+		contactsGroup := router.Group("/contacts")
+		contactsGroup.GET("", action.search)
+
 	})
 
 	return apiEndpoints

actions/contacts/routes_test.go

@@ -7,14 +7,15 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// TestBaseRegisterRoutes will test routes
-func (ts *TestSuite) TestRegisterRoutes() {
+// TestContactsRegisterRoutes will test routes
+func (ts *TestSuite) TestContactsRegisterRoutes() {
 	ts.T().Run("test routes", func(t *testing.T) {
 		testCases := []struct {
 			method string
 			url    string
 		}{
 			{"POST", "/" + config.APIVersion + "/contact"},
+			{"GET", "/" + config.APIVersion + "/contacts"},
 		}
 
 		ts.Router.Routes()

actions/contacts/search.go

@@ -0,0 +1,64 @@
+package contacts
+
+import (
+	"net/http"
+
+	"github.com/bitcoin-sv/spv-wallet/actions"
+	"github.com/bitcoin-sv/spv-wallet/engine"
+	"github.com/bitcoin-sv/spv-wallet/mappings"
+	"github.com/bitcoin-sv/spv-wallet/models"
+	"github.com/bitcoin-sv/spv-wallet/server/auth"
+	"github.com/gin-gonic/gin"
+)
+
+// Search will fetch a list of contacts
+// Get contacts godoc
+// @Summary		Search contacts
+// @Description	Search contacts
+// @Tags		Contact
+// @Produce		json
+// @Param		page query int false "page"
+// @Param		page_size query int false "page_size"
+// @Param		order_by_field query string false "order_by_field"
+// @Param		sort_direction query string false "sort_direction"
+// @Param		conditions query string false "conditions"
+// @Success		200
+// @Router		/v1/contacts [get]
+// @Security	x-auth-xpub
+func (a *Action) search(c *gin.Context) {
+	reqXPubID := c.GetString(auth.ParamXPubHashKey)
+
+	params := c.Request.URL.Query()
+
+	queryParams, metadata, _, err := actions.GetQueryParameters(c)
+	if err != nil {
+		c.JSON(http.StatusExpectationFailed, err.Error())
+		return
+	}
+
+	dbConditions := make(map[string]interface{})
+
+	for key, value := range params {
+		dbConditions[key] = value
+	}
+
+	dbConditions["xpub_id"] = reqXPubID
+
+	var contacts []*engine.Contact
+	if contacts, err = a.Services.SpvWalletEngine.GetContacts(
+		c.Request.Context(),
+		metadata,
+		&dbConditions,
+		queryParams,
+	); err != nil {
+		c.JSON(http.StatusExpectationFailed, err.Error())
+		return
+	}
+
+	contactContracts := make([]*models.Contact, 0)
+	for _, contact := range contacts {
+		contactContracts = append(contactContracts, mappings.MapToContactContract(contact))
+	}
+
+	c.JSON(http.StatusOK, contactContracts)
+}

actions/contacts/update.go

@@ -0,0 +1,47 @@
+package contacts
+
+import (
+	"net/http"
+
+	"github.com/bitcoin-sv/spv-wallet/engine"
+	"github.com/bitcoin-sv/spv-wallet/mappings"
+	"github.com/bitcoin-sv/spv-wallet/server/auth"
+	"github.com/gin-gonic/gin"
+)
+
+// update will update an existing model
+// Update Contact godoc
+// @Summary		Update contact
+// @Description	Update contact
+// @Tags		Contacts
+// @Produce		json
+// @Param		metadata body string true "Contacts Metadata"
+// @Success		200
+// @Router		/v1/contact [patch]
+// @Security	x-auth-xpub
+func (a *Action) update(c *gin.Context) {
+	reqXPubID := c.GetString(auth.ParamXPubHashKey)
+
+	var requestBody UpdateContact
+
+	if err := c.ShouldBindJSON(&requestBody); err != nil {
+		c.JSON(http.StatusBadRequest, err.Error())
+		return
+	}
+
+	if requestBody.XPubID == "" {
+		c.JSON(http.StatusBadRequest, "Id is missing")
+	}
+
+	contact, err := a.Services.SpvWalletEngine.UpdateContact(c.Request.Context(), requestBody.FullName, requestBody.PubKey, reqXPubID, requestBody.Paymail, engine.ContactStatus(requestBody.Status), engine.WithMetadatas(requestBody.Metadata))
+
+	if err != nil {
+		c.JSON(http.StatusExpectationFailed, err.Error())
+		return
+	}
+
+	contract := mappings.MapToContactContract(contact)
+
+	c.JSON(http.StatusOK, contract)
+
+}

actions/destinations/destination_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	basicRoutes, apiRoutes := NewHandler(ts.AppConfig, ts.Services)
 	basicRoutes.RegisterBasicEndpoints(ts.Router.Group("/" + config.APIVersion))
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))

actions/transactions/transaction_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	basicRoutes, apiRoutes, callbackRoutes := NewHandler(ts.AppConfig, ts.Services)
 	basicRoutes.RegisterBasicEndpoints(ts.Router.Group("/" + config.APIVersion))
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))

actions/utxos/utxo_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	apiRoutes := NewHandler(ts.AppConfig, ts.Services)
 	apiRoutes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

actions/xpubs/xpubs_test.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/bitcoin-sv/spv-wallet/config"
 	"github.com/bitcoin-sv/spv-wallet/tests"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -30,8 +28,6 @@ func (ts *TestSuite) SetupTest() {
 	ts.BaseSetupTest()
 
 	// Load the router & register routes
-	ts.Router = gin.Default()
-	require.NotNil(ts.T(), ts.Router)
 	routes := NewHandler(ts.AppConfig, ts.Services)
 	routes.RegisterAPIEndpoints(ts.Router.Group("/" + config.APIVersion))
 }

config/config_test.go

@@ -4,17 +4,18 @@ import (
 	"context"
 	"testing"
 
-	"github.com/bitcoin-sv/spv-wallet/logging"
 	"github.com/mrz1836/go-cachestore"
 	"github.com/mrz1836/go-datastore"
+	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 // newTestConfig will make a new test config
 func newTestConfig(t *testing.T) (ac *AppConfig) {
-	defaultLogger := logging.GetDefaultLogger()
-	ac, err := Load(defaultLogger)
+	nop := zerolog.Nop()
+	ac, err := Load(&nop)
+
 	require.NoError(t, err)
 	require.NotNil(t, ac)
 	return