feat(SPV-839): add requesterPaymail when adding contact (#78)

bitcoin-sv · Jun 25, 2024 · 84103b7 · 84103b7
1 parent 4cba08c
commit 84103b7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/domain/contacts/contacts_service.go b/domain/contacts/contacts_service.go
@@ -26,13 +26,13 @@ func NewContactsService(adminWalletClient users.AdminWalletClient, walletClientF
 	}
 }
 
-func (s *ContactsService) UpsertContact(ctx context.Context, accessKey, paymail, fullName string, metadata map[string]any) (*models.Contact, error) {
+func (s *ContactsService) UpsertContact(ctx context.Context, accessKey, paymail, fullName, requesterPaymail string, metadata map[string]any) (*models.Contact, error) {
 	userWalletClient, err := s.walletClientFactory.CreateWithAccessKey(accessKey)
 	if err != nil {
 		return nil, err
 	}
 
-	return userWalletClient.UpsertContact(ctx, paymail, fullName, metadata)
+	return userWalletClient.UpsertContact(ctx, paymail, fullName, requesterPaymail, metadata)
 }
 
 func (s *ContactsService) AcceptContact(ctx context.Context, accessKey, paymail string) error {

diff --git a/domain/users/interfaces.go b/domain/users/interfaces.go
@@ -72,7 +72,7 @@ type (
 		CreateAndFinalizeTransaction(recipients []*walletclient.Recipients, metadata map[string]any) (DraftTransaction, error)
 		RecordTransaction(hex, draftTxId string, metadata map[string]any) (*models.Transaction, error)
 		// Contacts methods
-		UpsertContact(ctx context.Context, paymail, fullName string, metadata map[string]any) (*models.Contact, walletclient.ResponseError)
+		UpsertContact(ctx context.Context, paymail, fullName, requesterPaymail string, metadata map[string]any) (*models.Contact, walletclient.ResponseError)
 		AcceptContact(ctx context.Context, paymail string) walletclient.ResponseError
 		RejectContact(ctx context.Context, paymail string) walletclient.ResponseError
 		ConfirmContact(ctx context.Context, contact *models.Contact, passcode, requesterPaymail string, period, digits uint) walletclient.ResponseError

diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.21.5
 
 require (
 	github.com/avast/retry-go/v4 v4.5.1
-	github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.6
-	github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.9
+	github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.8
+	github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.13
 	github.com/brianvoe/gofakeit/v6 v6.28.0
 	github.com/centrifugal/centrifuge v0.31.0
 	github.com/gin-contrib/sessions v0.0.5

diff --git a/go.sum b/go.sum
@@ -12,10 +12,10 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.6 h1:hls/lXY23iOrHoIdh4BoANT3wadEOBWsW5tRRRhDnlY=
-github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.6/go.mod h1:UQuExLUqIzXwUFpfW22UWNDMU/BCQM8YWJR5nofwj+A=
-github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.9 h1:lPN+r10zuQ19tNMczYT1H+FcUCZMh3LAhAqngrqM1i0=
-github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.9/go.mod h1:i3txysriHpprqYd3u97wEQsC4/jn+KHcyFOmuFYMw8M=
+github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.8 h1:LMPJliYl2znHlmD/9gH3bXnThlR9KS8PgIitgCEe9Fs=
+github.com/bitcoin-sv/spv-wallet-go-client v1.0.0-beta.8/go.mod h1:bTHREznlCnG8/SRXZCA4LF7gZmUrD0e8u34FNiTqENU=
+github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.13 h1:rBscs3Gbz0RWY03eI3Z9AwD7/MxajdJF54oy3xMqKRQ=
+github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.13/go.mod h1:i3txysriHpprqYd3u97wEQsC4/jn+KHcyFOmuFYMw8M=
 github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck=
 github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA=
 github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173 h1:2yTIV9u7H0BhRDGXH5xrAwAz7XibWJtX2dNezMeNsUo=

diff --git a/tests/mocks/users_interfaces_mq.go b/tests/mocks/users_interfaces_mq.go
diff --git a/transports/http/endpoints/api/contacts/endpoints.go b/transports/http/endpoints/api/contacts/endpoints.go
@@ -85,7 +85,7 @@ func (h *handler) upsertContact(c *gin.Context) {
 		return
 	}
 
-	_, err = h.cService.UpsertContact(c.Request.Context(), c.GetString(auth.SessionAccessKey), paymail, req.FullName, req.Metadata)
+	_, err = h.cService.UpsertContact(c.Request.Context(), c.GetString(auth.SessionAccessKey), paymail, req.FullName, c.GetString(auth.SessionUserPaymail), req.Metadata)
 	if err != nil {
 		h.log.Error().Msgf("An error occurred while upserting the contact: %s", err)
 		c.JSON(http.StatusInternalServerError, "An error occurred while upserting the contact.")

diff --git a/transports/spvwallet/client.go b/transports/spvwallet/client.go
@@ -228,8 +228,8 @@ func (c *Client) GetTransactionsCount() (int64, error) {
 }
 
 // UpsertContact creates or updates contact.
-func (c *Client) UpsertContact(ctx context.Context, paymail, fullName string, metadata map[string]any) (*models.Contact, walletclient.ResponseError) {
-	return c.client.UpsertContact(ctx, paymail, fullName, metadata)
+func (c *Client) UpsertContact(ctx context.Context, paymail, fullName, requesterPaymail string, metadata map[string]any) (*models.Contact, walletclient.ResponseError) {
+	return c.client.UpsertContact(ctx, paymail, fullName, requesterPaymail, metadata)
 }
 
 // AcceptContact accepts contact.