feat(BUX-639): add upsert contact

bitcoin-sv · Apr 2, 2024 · f43bb1d · f43bb1d
1 parent bbe0b0f
commit f43bb1d
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 16 deletions.
diff --git a/contacts.go b/contacts.go
@@ -7,6 +7,16 @@ import (
 	"github.com/bitcoin-sv/spv-wallet/models"
 )
 
+// UpsertContact add or update contact. When adding a new contact, the system utilizes Paymail's PIKE capability to dispatch an invitation request, asking the counterparty to include the current user in their contacts.
+func (b *WalletClient) UpsertContact(ctx context.Context, paymail, fullName string, metadata *models.Metadata) (*models.Contact, transports.ResponseError) {
+	return b.transport.UpsertContact(ctx, paymail, fullName, metadata, "")
+}
+
+// UpsertContactForPaymail add or update contact. When adding a new contact, the system utilizes Paymail's PIKE capability to dispatch an invitation request, asking the counterparty to include the current user specified paymail in their contacts.
+func (b *WalletClient) UpsertContactForPaymail(ctx context.Context, paymail, fullName string, metadata *models.Metadata, requesterPaymail string) (*models.Contact, transports.ResponseError) {
+	return b.transport.UpsertContact(ctx, paymail, fullName, metadata, requesterPaymail)
+}
+
 // AcceptContact will accept the contact associated with the paymail
 func (b *WalletClient) AcceptContact(ctx context.Context, paymail string) transports.ResponseError {
 	return b.transport.AcceptContact(ctx, paymail)

diff --git a/contacts_test.go b/contacts_test.go
@@ -11,29 +11,55 @@ import (
 // TestRejectContact will test the RejectContact method
 func TestContactActionsRouting(t *testing.T) {
 	tcs := []struct {
-		name  string
-		route string
-		f     func(c *WalletClient) error
+		name            string
+		route           string
+		responsePayload string
+		f               func(c *WalletClient) error
 	}{
 		{
-			name:  "RejectContact",
-			route: "/contact/rejected/",
-			f:     func(c *WalletClient) error { return c.RejectContact(context.Background(), fixtures.PaymailAddress) },
+			name:            "RejectContact",
+			route:           "/contact/rejected/",
+			responsePayload: "{}",
+			f:               func(c *WalletClient) error { return c.RejectContact(context.Background(), fixtures.PaymailAddress) },
 		},
 		{
-			name:  "AcceptContact",
-			route: "/contact/accepted/",
-			f:     func(c *WalletClient) error { return c.AcceptContact(context.Background(), fixtures.PaymailAddress) },
+			name:            "AcceptContact",
+			route:           "/contact/accepted/",
+			responsePayload: "{}",
+			f:               func(c *WalletClient) error { return c.AcceptContact(context.Background(), fixtures.PaymailAddress) },
 		},
 		{
-			name:  "ConfirmContact",
-			route: "/contact/confirmed/",
-			f:     func(c *WalletClient) error { return c.ConfirmContact(context.Background(), fixtures.PaymailAddress) },
+			name:            "ConfirmContact",
+			route:           "/contact/confirmed/",
+			responsePayload: "{}",
+			f:               func(c *WalletClient) error { return c.ConfirmContact(context.Background(), fixtures.PaymailAddress) },
 		},
 		{
-			name:  "GetContacts",
-			route: "/contact/search/",
-			f:     func(c *WalletClient) error { _, err := c.GetContacts(context.Background(), nil, nil, nil); return err },
+			name:            "GetContacts",
+			route:           "/contact/search/",
+			responsePayload: "[]",
+			f: func(c *WalletClient) error {
+				_, err := c.GetContacts(context.Background(), nil, nil, nil)
+				return err
+			},
+		},
+		{
+			name:            "UpsertContact",
+			route:           "/contact/",
+			responsePayload: "{}",
+			f: func(c *WalletClient) error {
+				_, err := c.UpsertContact(context.Background(), "", "", nil)
+				return err
+			},
+		},
+		{
+			name:            "UpsertContactForPaymail",
+			route:           "/contact/",
+			responsePayload: "{}",
+			f: func(c *WalletClient) error {
+				_, err := c.UpsertContactForPaymail(context.Background(), "", "", nil, "")
+				return err
+			},
 		},
 	}
 
@@ -43,7 +69,7 @@ func TestContactActionsRouting(t *testing.T) {
 			tmq := testTransportHandler{
 				Type:      fixtures.RequestType,
 				Path:      tc.route,
-				Result:    "[]",
+				Result:    tc.responsePayload,
 				ClientURL: fixtures.ServerURL,
 				Client:    WithHTTPClient,
 			}

diff --git a/transports/http.go b/transports/http.go
@@ -693,3 +693,29 @@ func (h *TransportHTTP) GetContacts(ctx context.Context, conditions map[string]i
 
 	return result, nil
 }
+
+// UpsertContact add or update contact. When adding a new contact, the system utilizes Paymail's PIKE capability to dispatch an invitation request, asking the counterparty to include the current user in their contacts.
+func (h *TransportHTTP) UpsertContact(ctx context.Context, paymail, fullName string, metadata *models.Metadata, requesterPaymail string) (*models.Contact, ResponseError) {
+	payload := map[string]interface{}{
+		"fullName":    fullName,
+		FieldMetadata: processMetadata(metadata),
+	}
+
+	if requesterPaymail != "" {
+		payload["requesterPaymail"] = requesterPaymail
+	}
+
+	jsonStr, err := json.Marshal(payload)
+	if err != nil {
+		return nil, WrapError(err)
+	}
+
+	var result models.Contact
+	if err := h.doHTTPRequest(
+		ctx, http.MethodPut, "/contact/"+paymail, jsonStr, h.xPriv, h.signRequest, &result,
+	); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
diff --git a/transports/interface.go b/transports/interface.go
@@ -55,6 +55,7 @@ type ContactService interface {
 	RejectContact(ctx context.Context, paymail string) ResponseError
 	ConfirmContact(ctx context.Context, paymail string) ResponseError
 	GetContacts(ctx context.Context, conditions map[string]interface{}, metadata *models.Metadata, queryParams *QueryParams) ([]*models.Contact, ResponseError)
+	UpsertContact(ctx context.Context, paymail, fullName string, metadata *models.Metadata, requesterPaymail string) (*models.Contact, ResponseError)
 }
 
 // AdminService is the admin related requests