[#1904] Support legacy schema in (*repo.Profile).NormalizeProfileProtobuf

Author: placer14

repo/profile.go

@@ -211,12 +211,21 @@ func (p *Profile) normalizeFees() {
 		}
 
 		if ff, err := p.GetModeratedFixedFee(); err == nil {
-			var amtInt uint64
-			if ai, err := strconv.Atoi(p.profileProto.ModeratorInfo.Fee.FixedFee.BigAmount); err == nil {
-				amtInt = uint64(ai)
+			switch p.GetVersion() {
+			case 5:
+				var amtInt uint64
+				if ai, err := strconv.Atoi(p.profileProto.ModeratorInfo.Fee.FixedFee.BigAmount); err == nil {
+					amtInt = uint64(ai)
+				}
+				p.profileProto.ModeratorInfo.Fee.FixedFee.CurrencyCode = ff.Currency.Code.String()
+				p.profileProto.ModeratorInfo.Fee.FixedFee.Amount = amtInt
+			default: // v4 and earlier
+				p.profileProto.ModeratorInfo.Fee.FixedFee.AmountCurrency = &pb.CurrencyDefinition{
+					Code:         ff.Currency.Code.String(),
+					Divisibility: uint32(ff.Currency.Divisibility),
+				}
+				p.profileProto.ModeratorInfo.Fee.FixedFee.BigAmount = ff.Amount.String()
 			}
-			p.profileProto.ModeratorInfo.Fee.FixedFee.CurrencyCode = ff.Currency.Code.String()
-			p.profileProto.ModeratorInfo.Fee.FixedFee.Amount = amtInt
 		}
 	}
 }

repo/profile_test.go

@@ -20,16 +20,18 @@ func TestProfileFromProtobufMissingModInfo(t *testing.T) {
 }
 
 func TestNormalizeProfileProtobuf(t *testing.T) {
-	var exampleFee = &pb.Moderator_Price{
-		BigAmount: "10",
-		AmountCurrency: &pb.CurrencyDefinition{
-			Code:         "BTC",
-			Divisibility: 8,
-		},
-	}
+	var (
+		exampleFee = &pb.Moderator_Price{
+			BigAmount: "10",
+			AmountCurrency: &pb.CurrencyDefinition{
+				Code:         "BTC",
+				Divisibility: 8,
+			},
+		}
+	)
 	var examples = []struct {
 		example  func() *pb.Profile
-		validate func(*pb.Profile, *testing.T)
+		validate func(*pb.Profile)
 	}{
 		{ // profile with percent fee should remove non-percent fee values
 			example: func() *pb.Profile {
@@ -39,7 +41,7 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 				p.ModeratorInfo.Fee.Percentage = 1.1
 				return p
 			},
-			validate: func(p *pb.Profile, t *testing.T) {
+			validate: func(p *pb.Profile) {
 				if p.ModeratorInfo.Fee.FixedFee != nil {
 					t.Errorf("expected fixed fee to be removed, but was not")
 				}
@@ -53,7 +55,7 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 				p.ModeratorInfo.Fee.Percentage = 1.1
 				return p
 			},
-			validate: func(p *pb.Profile, t *testing.T) {
+			validate: func(p *pb.Profile) {
 				if p.ModeratorInfo.Fee.Percentage != 0 {
 					t.Errorf("expected percentage to be zero, but was not")
 				}
@@ -66,7 +68,7 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 				p.ModeratorInfo.Fee.FixedFee = exampleFee
 				return p
 			},
-			validate: func(p *pb.Profile, t *testing.T) {
+			validate: func(p *pb.Profile) {
 				if actual := p.ModeratorInfo.Fee.FixedFee.CurrencyCode; actual != exampleFee.AmountCurrency.Code {
 					t.Errorf("expected legacy code to be (%s), but was (%s)", exampleFee.AmountCurrency.Code, actual)
 				}
@@ -80,6 +82,27 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 				}
 			},
 		},
+		{ // legacy v4 profile with fixed fee should populate current schema
+			example: func() *pb.Profile {
+				pb := factory.MustLoadProfileFixture("v4-profile-moderator-fixed-fee")
+				rp, err := repo.UnmarshalJSONProfile(pb)
+				if err != nil {
+					t.Fatal(err)
+				}
+				p := rp.GetProtobuf()
+				p.ModeratorInfo.Fee.FixedFee.CurrencyCode = "BTC"
+				p.ModeratorInfo.Fee.FixedFee.Amount = 10
+				return p
+			},
+			validate: func(p *pb.Profile) {
+				if actual := p.ModeratorInfo.Fee.FixedFee.AmountCurrency.Code; actual != "BTC" {
+					t.Errorf("expected fee amount currency code to be (%s), but was (%s)", "BTC", actual)
+				}
+				if actualAmt := p.ModeratorInfo.Fee.FixedFee.BigAmount; actualAmt != "10" {
+					t.Errorf("expected fee amount to be (%s), but was (%s)", "10", actualAmt)
+				}
+			},
+		},
 	}
 
 	for i, e := range examples {
@@ -91,7 +114,7 @@ func TestNormalizeProfileProtobuf(t *testing.T) {
 			t.Errorf("failed normalization on example (%d): %s", i, err)
 			continue
 		}
-		e.validate(p.GetProtobuf(), t)
+		e.validate(p.GetProtobuf())
 	}
 }