[#1904] Apply legacy schema normalization to (*OpenBazaarNode).FetchProfile

Author: placer14

core/profile.go

@@ -50,11 +50,12 @@ func (n *OpenBazaarNode) FetchProfile(peerID string, useCache bool) (pb.Profile,
 	if err != nil || len(b) == 0 {
 		return pro, err
 	}
-	err = jsonpb.UnmarshalString(string(b), &pro)
+	p, err := repo.UnmarshalJSONProfile(b)
 	if err != nil {
 		return pro, err
 	}
-	return pro, nil
+	p.NormalizeSchema()
+	return *p.GetProtobuf(), nil
 }
 
 // UpdateProfile - update user profile
@@ -187,16 +188,18 @@ func (n *OpenBazaarNode) PatchProfile(patch map[string]interface{}) error {
 		return err
 	}
 
-	normalProfile, err := repo.NormalizeProfileProtobuf(p)
+	repoProfile, err := repo.UnmarshalJSONProfile(newProfile)
 	if err != nil {
 		return fmt.Errorf("building profile for validation: %s", err.Error())
 	}
 
-	if err := normalProfile.Valid(); err != nil {
+	repoProfile.NormalizeSchema()
+
+	if err := repoProfile.Valid(); err != nil {
 		return fmt.Errorf("invalid profile: %s", err.Error())
 	}
 
-	return n.UpdateProfile(normalProfile.GetProtobuf())
+	return n.UpdateProfile(repoProfile.GetProtobuf())
 }
 
 func (n *OpenBazaarNode) appendCountsToProfile(profile *pb.Profile) (*pb.Profile, bool) {

repo/profile.go

@@ -57,14 +57,9 @@ func NewProfileFromProtobuf(p *pb.Profile) (*Profile, error) {
 	return &Profile{profileProto: clonedProfile}, nil
 }
 
-func NormalizeProfileProtobuf(p *pb.Profile) (*Profile, error) {
-	repoProfile, err := NewProfileFromProtobuf(p)
-	if err != nil {
-		return nil, err
-	}
-
-	repoProfile.normalizeFees()
-	return repoProfile, nil
+func (p *Profile) NormalizeSchema() *Profile {
+	p.normalizeFees()
+	return p
 }
 
 func (p *Profile) GetProtobuf() *pb.Profile {

repo/profile_test.go

@@ -19,7 +19,7 @@ func TestProfileFromProtobufMissingModInfo(t *testing.T) {
 	}
 }
 
-func TestNormalizeProfileProtobuf(t *testing.T) {
+func TestProfileNormalizeSchema(t *testing.T) {
 	var (
 		exampleFee = &pb.Moderator_Price{
 			BigAmount: "10",
@@ -108,12 +108,13 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 	for i, e := range examples {
 		var (
 			subject = e.example()
-			p, err  = repo.NormalizeProfileProtobuf(subject)
+			p, err  = repo.NewProfileFromProtobuf(subject)
 		)
 		if err != nil {
 			t.Errorf("failed normalization on example (%d): %s", i, err)
 			continue
 		}
+		p.NormalizeSchema()
 		e.validate(p.GetProtobuf())
 	}
 }