finish the refactoring for the dedicated identifier type

3 files changed, 12 insertions, 11 deletions

diff --git a/identity/bare.go b/identity/bare.go
index 93cea91f..a243f074 100644
--- a/identity/bare.go
+++ b/identity/bare.go
@@ -50,13 +50,12 @@ type bareIdentityJSON struct {
 }
 
 func (i *Bare) MarshalJSON() ([]byte, error) {
-	data, err := json.Marshal(bareIdentityJSON{
+	return json.Marshal(bareIdentityJSON{
 		Name:      i.name,
 		Email:     i.email,
 		Login:     i.login,
 		AvatarUrl: i.avatarUrl,
 	})
-	return data, err
 }
 
 func (i *Bare) UnmarshalJSON(data []byte) error {
diff --git a/identity/common.go b/identity/common.go
index 68a6d57c..007e10d6 100644
--- a/identity/common.go
+++ b/identity/common.go
@@ -4,17 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strings"
+
+	"github.com/MichaelMure/git-bug/entity"
 )
 
 var ErrIdentityNotExist = errors.New("identity doesn't exist")
 
-type ErrMultipleMatch struct {
-	Matching []string
-}
-
-func (e ErrMultipleMatch) Error() string {
-	return fmt.Sprintf("Multiple matching identities found:\n%s", strings.Join(e.Matching, "\n"))
+func NewErrMultipleMatch(matching []entity.Id) *entity.ErrMultipleMatch {
+	return entity.NewErrMultipleMatch("identity", matching)
 }
 
 // Custom unmarshaling function to allow package user to delegate
diff --git a/identity/identity_actions.go b/identity/identity_actions.go
index 40aab8e2..aa6a2a91 100644
--- a/identity/identity_actions.go
+++ b/identity/identity_actions.go
@@ -59,8 +59,13 @@ func MergeAll(repo repository.ClockedRepo, remote string) <-chan entity.MergeRes
 		}
 
 		for _, remoteRef := range remoteRefs {
-			refSplitted := strings.Split(remoteRef, "/")
-			id := refSplitted[len(refSplitted)-1]
+			refSplit := strings.Split(remoteRef, "/")
+			id := entity.Id(refSplit[len(refSplit)-1])
+
+			if err := id.Validate(); err != nil {
+				out <- entity.NewMergeInvalidStatus(id, errors.Wrap(err, "invalid ref").Error())
+				continue
+			}
 
 			remoteIdentity, err := read(repo, remoteRef)