Using a sql.NullString for username

BuxOrg · Apr 6, 2022 · 9bb9663 · 9bb9663
1 parent b0fa955
commit 9bb9663
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/model_paymails.go b/model_paymails.go
@@ -2,6 +2,7 @@ package bux
 
 import (
 	"context"
+	"database/sql"
 	"errors"
 
 	"github.com/BuxOrg/bux/datastore"
@@ -21,13 +22,13 @@ type PaymailAddress struct {
 	Model `bson:",inline"`
 
 	// Model specific fields
-	ID              string `json:"id" toml:"id" yaml:"id" gorm:"<-:create;type:char(64);primaryKey;comment:This is the unique paymail record id" bson:"_id"`                                                                              // Unique identifier
-	XpubID          string `json:"xpub_id" toml:"xpub_id" yaml:"xpub_id" gorm:"<-:create;type:char(64);index;comment:This is the related xPub" bson:"xpub_id"`                                                                            // Related xPub ID
-	Alias           string `json:"alias" toml:"alias" yaml:"alias" gorm:"<-;type:varchar(64);comment:This is alias@" bson:"alias"`                                                                                                        // Alias part of the paymail
-	Domain          string `json:"domain" toml:"domain" yaml:"domain" gorm:"<-;type:varchar(255);comment:This is @domain.com" bson:"domain"`                                                                                              // Domain of the paymail
-	Username        string `json:"username" toml:"username" yaml:"username" gorm:"<-;type:varchar(255);uniqueIndex;comment:This is username" bson:"username"`                                                                             // Full username
-	Avatar          string `json:"avatar" toml:"avatar" yaml:"avatar" gorm:"<-;type:text;comment:This is avatar url" bson:"avatar"`                                                                                                       // This is the url of the user (public profile)
-	ExternalXpubKey string `json:"external_xpub_key" toml:"external_xpub_key" yaml:"external_xpub_key" gorm:"<-:create;type:varchar(512);index;comment:This is full xPub for external use, encryption optional" bson:"external_xpub_key"` // PublicKey hex encoded
+	ID              string         `json:"id" toml:"id" yaml:"id" gorm:"<-:create;type:char(64);primaryKey;comment:This is the unique paymail record id" bson:"_id"`                                                                              // Unique identifier
+	XpubID          string         `json:"xpub_id" toml:"xpub_id" yaml:"xpub_id" gorm:"<-:create;type:char(64);index;comment:This is the related xPub" bson:"xpub_id"`                                                                            // Related xPub ID
+	Alias           string         `json:"alias" toml:"alias" yaml:"alias" gorm:"<-;type:varchar(64);comment:This is alias@" bson:"alias"`                                                                                                        // Alias part of the paymail
+	Domain          string         `json:"domain" toml:"domain" yaml:"domain" gorm:"<-;type:varchar(255);comment:This is @domain.com" bson:"domain"`                                                                                              // Domain of the paymail
+	Username        sql.NullString `json:"username" toml:"username" yaml:"username" gorm:"<-;type:varchar(255);uniqueIndex;comment:This is username" bson:"username"`                                                                             // Full username
+	Avatar          string         `json:"avatar" toml:"avatar" yaml:"avatar" gorm:"<-;type:text;comment:This is avatar url" bson:"avatar"`                                                                                                       // This is the url of the user (public profile)
+	ExternalXpubKey string         `json:"external_xpub_key" toml:"external_xpub_key" yaml:"external_xpub_key" gorm:"<-:create;type:varchar(512);index;comment:This is full xPub for external use, encryption optional" bson:"external_xpub_key"` // PublicKey hex encoded
 
 	// Private fields
 	externalXpubKeyDecrypted string

diff --git a/model_paymails_test.go b/model_paymails_test.go
@@ -46,7 +46,8 @@ func TestNewPaymail(t *testing.T) {
 			WithXPub(testXpub),
 			WithEncryptionKey(testEncryption),
 		)
-		p.Username = "Tester"
+		p.Username.String = "Tester"
+		p.Username.Valid = true
 		p.Avatar = "img url"
 		err = p.Save(ctx)
 		require.NoError(t, err)
@@ -70,7 +71,7 @@ func TestNewPaymail(t *testing.T) {
 		require.NotNil(t, identityKey)
 
 		assert.Equal(t, paymail, p2.Alias+"@"+p2.Domain)
-		assert.Equal(t, "Tester", p2.Username)
+		assert.Equal(t, "Tester", p2.Username.String)
 		assert.Equal(t, "img url", p2.Avatar)
 		assert.Equal(t, "d8c2bed524071d72d859caf90da5f448b5861cd4d4fd47697f94166c13c5a987", p2.XpubID)
 		assert.Equal(t, paymailIdentityXPub, identityKey.String())

diff --git a/paymail_service_provider.go b/paymail_service_provider.go
@@ -65,7 +65,7 @@ func (p *PaymailDefaultServiceProvider) GetPaymailByAlias(ctx context.Context, a
 		Domain:      paymailAddress.Domain,
 		ID:          paymailAddress.ID,
 		LastAddress: destination.Address,
-		Name:        paymailAddress.Username,
+		Name:        paymailAddress.Username.String,
 		PubKey:      pubKey,
 	}, nil
 }