[#1839] Percentage can be zero

Author: placer14

api/jsonapi_test.go

@@ -193,7 +193,7 @@ func TestPatchProfileCurrencyUpdate(t *testing.T) {
 	}, nil, validateProfile)
 }
 
-func TestPatchProfileValidatesAsInvalid(t *testing.T) {
+func TestPatchProfileCanBeInvalid(t *testing.T) {
 	var (
 		// init profile for patch
 		postProfile = `{
@@ -245,13 +245,13 @@ func TestPatchProfileValidatesAsInvalid(t *testing.T) {
 		invalidPatchProfile = `{
 	"moderatorInfo": {
 		"fee": {
-			"percentage": 0
+			"percentage": -1
 		}
 	}
 }`
 	)
 
-	expectedErr := fmt.Errorf("invalid profile: %s", repo.ErrModeratorFeeHasNonPositivePercent)
+	expectedErr := fmt.Errorf("invalid profile: %s", repo.ErrModeratorFeeHasNegativePercentage)
 	runAPITests(t, apiTests{
 		{"POST", "/ob/profile", postProfile, 200, anyResponseJSON},
 		{"PATCH", "/ob/profile", patchProfile, 200, anyResponseJSON},

repo/profile.go

@@ -19,8 +19,8 @@ var (
 	ErrMissingModeratorFee = errors.New("moderator info is missing fee schedule")
 	// ErrUnknownModeratorFeeType indicates the feeType is unknown
 	ErrUnknownModeratorFeeType = errors.New("moderator fee type is unknown")
-	// ErrModeratorFeeHasNonPositivePercent indicates when the percentage is non-positive but should be
-	ErrModeratorFeeHasNonPositivePercent = errors.New("percentage moderator fee should be greater than zero")
+	// ErrModeratorFeeHasNegativePercentage indicates when the percentage is non-positive but should be
+	ErrModeratorFeeHasNegativePercentage = errors.New("percentage moderator fee should not be negative")
 	// ErrFixedFeeHasNonZeroPercentage indicates when the percentage is not zero but should be
 	ErrFixedFeeHasNonZeroPercentage = errors.New("fixed moderator fee should have a zero percentage amount")
 	// ErrPercentageFeeHasFixedFee indicates that a fixed fee is included when there should not be
@@ -132,15 +132,15 @@ func (p *Profile) validateModeratorFees() error {
 			return err
 		}
 	case pb.Moderator_Fee_PERCENTAGE.String():
-		if p.ModeratorInfo.Fee.Percentage <= 0 {
-			return ErrModeratorFeeHasNonPositivePercent
+		if p.ModeratorInfo.Fee.Percentage < 0 {
+			return ErrModeratorFeeHasNegativePercentage
 		}
 		if p.ModeratorInfo.Fee.FixedFee != nil {
 			return ErrPercentageFeeHasFixedFee
 		}
 	case pb.Moderator_Fee_FIXED_PLUS_PERCENTAGE.String():
-		if p.ModeratorInfo.Fee.Percentage <= 0 {
-			return ErrModeratorFeeHasNonPositivePercent
+		if p.ModeratorInfo.Fee.Percentage < 0 {
+			return ErrModeratorFeeHasNegativePercentage
 		}
 		if err := validateFixedFee(); err != nil {
 			return err

repo/profile_test.go

@@ -239,7 +239,7 @@ func TestProfileValidPercentageFee(t *testing.T) {
 	}
 }
 
-func TestProfileInvalidPercentageFeeZero(t *testing.T) {
+func TestProfileValidPercentageFeeZero(t *testing.T) {
 	p := factory.NewProfile()
 	p.ModeratorInfo = &repo.ModeratorInfo{
 		Fee: &repo.ModeratorFee{
@@ -248,10 +248,8 @@ func TestProfileInvalidPercentageFeeZero(t *testing.T) {
 		},
 	}
 
-	if err := p.Valid(); err == nil {
-		t.Errorf("expected zero percentage fee to be invalid")
-	} else if err != repo.ErrModeratorFeeHasNonPositivePercent {
-		t.Errorf("expected ErrModeratorFeeHasNonPositivePercent error, but was (%s)", err.Error())
+	if err := p.Valid(); err != nil {
+		t.Errorf("expected profile example to be valid")
 	}
 }
 
@@ -293,7 +291,7 @@ func TestProfileValidPercentageWithFixedFee(t *testing.T) {
 	}
 }
 
-func TestProfileInvalidPercentWithFixedHavingZeroPercent(t *testing.T) {
+func TestProfileValidPercentWithFixedHavingZeroPercent(t *testing.T) {
 	p := factory.NewProfile()
 	p.ModeratorInfo = &repo.ModeratorInfo{
 		Fee: &repo.ModeratorFee{
@@ -306,10 +304,28 @@ func TestProfileInvalidPercentWithFixedHavingZeroPercent(t *testing.T) {
 		},
 	}
 
+	if err := p.Valid(); err != nil {
+		t.Errorf("expected profile exmaple to be valid")
+	}
+}
+
+func TestProfileInvalidPercentWithFixedHavingNegativePercent(t *testing.T) {
+	p := factory.NewProfile()
+	p.ModeratorInfo = &repo.ModeratorInfo{
+		Fee: &repo.ModeratorFee{
+			FeeType:    pb.Moderator_Fee_FIXED_PLUS_PERCENTAGE.String(),
+			Percentage: -1,
+			FixedFee: &repo.ModeratorFixedFee{
+				Amount:         "1234",
+				AmountCurrency: factory.NewCurrencyDefinition("BTC"),
+			},
+		},
+	}
+
 	if err := p.Valid(); err == nil {
-		t.Errorf("expected percentage with fixed fee but percent is zero to be invalid")
-	} else if err != repo.ErrModeratorFeeHasNonPositivePercent {
-		t.Errorf("expected ErrModeratorFeeHasNonPositivePercent error, but got (%s)", err.Error())
+		t.Errorf("expected percentage with fixed fee but negative percentage to be invalid")
+	} else if err != repo.ErrModeratorFeeHasNegativePercentage {
+		t.Errorf("expected ErrModeratorFeeHasNegativePercentage error, but got (%s)", err.Error())
 	}
 }