feat(SPV-887): add address field to paymail_address response models (#…

…766)
bitcoin-sv · Nov 13, 2024 · 87ae633 · 87ae633
1 parent f6e90d0
commit 87ae633
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/engine/model_paymail_addresses.go b/engine/model_paymail_addresses.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/bitcoin-sv/go-paymail"
 	compat "github.com/bitcoin-sv/go-sdk/compat/bip32"
@@ -364,5 +365,8 @@ func (m *PaymailAddress) migratePostgreSQL(client datastore.ClientInterface, tab
 }
 
 func (m *PaymailAddress) String() string {
+	if strings.Contains(m.Alias, "@") {
+		return m.Alias
+	}
 	return fmt.Sprintf("%s@%s", m.Alias, m.Domain)
 }
diff --git a/mappings/paymail_address.go b/mappings/paymail_address.go
@@ -20,6 +20,7 @@ func MapToPaymailContract(pa *engine.PaymailAddress) *response.PaymailAddress {
 		Domain:     pa.Domain,
 		PublicName: pa.PublicName,
 		Avatar:     pa.Avatar,
+		Address:    pa.String(),
 	}
 }
 

diff --git a/mappings/paymail_address_old.go b/mappings/paymail_address_old.go
@@ -20,6 +20,7 @@ func MapToOldPaymailContract(pa *engine.PaymailAddress) *models.PaymailAddress {
 		Domain:     pa.Domain,
 		PublicName: pa.PublicName,
 		Avatar:     pa.Avatar,
+		Address:    pa.String(),
 	}
 }
 

diff --git a/models/paymail_address.go b/models/paymail_address.go
@@ -19,4 +19,6 @@ type PaymailAddress struct {
 	PublicName string `json:"public_name" example:"Test User"`
 	// Avatar is a paymail address's avatar.
 	Avatar string `json:"avatar" example:"https://spvwallet.com/avatar.png"`
+	// Address is a paymail address that combines alias and domain with @
+	Address string `json:"address" example:"test@spvwallet.com"`
 }
diff --git a/models/response/paymail_address.go b/models/response/paymail_address.go
@@ -17,4 +17,6 @@ type PaymailAddress struct {
 	PublicName string `json:"publicName" example:"Test User"`
 	// Avatar is a paymail address's avatar.
 	Avatar string `json:"avatar" example:"https://spvwallet.com/avatar.png"`
+	// Address is a paymail address that combines alias and domain with @
+	Address string `json:"address" example:"test@spvwallet.com"`
 }