Merge pull request #72 from sameaste92/main

add protomoney Sub fix
dogmatiq · Aug 8, 2024 · e22e107 · e22e107
2 parents f1b8490 + 2eb7821
commit e22e107
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/protomoney/math.go b/protomoney/math.go
@@ -51,11 +51,23 @@ func Add(a, b *money.Money) *money.Money {
 // It panics if a and b do not use the same currency.
 func Sub(a, b *money.Money) *money.Money {
 	assertSameCurrency(a, b)
+	units := a.Units - b.Units
+	nanos := a.Nanos - b.Nanos
+
+	if units > 0 && nanos < 0 {
+		nanos = nanosPerUnit + nanos
+		units--
+	}
+
+	if units < 0 && nanos > 0 {
+		nanos = -(nanosPerUnit - nanos)
+		units++
+	}
 
 	m := &money.Money{
 		CurrencyCode: a.CurrencyCode,
-		Units:        a.Units - b.Units,
-		Nanos:        a.Nanos - b.Nanos,
+		Units:        units,
+		Nanos:        nanos,
 	}
 
 	normalizeInPlace(m)

diff --git a/protomoney/math_test.go b/protomoney/math_test.go
@@ -50,20 +50,36 @@ var _ = Describe("func Add()", func() {
 })
 
 var _ = Describe("func Sub()", func() {
-	It("returns a - b", func() {
-		a := &money.Money{CurrencyCode: "XYZ", Units: 1, Nanos: 230000000}
-		b := &money.Money{CurrencyCode: "XYZ", Units: 3, Nanos: 450000000}
-		x := &money.Money{CurrencyCode: "XYZ", Units: -2, Nanos: -220000000}
-		Expect(Sub(a, b)).To(Equal(x))
-	})
-
-	It("panics if the amounts do not have the same currency", func() {
-		Expect(func() {
-			a := &money.Money{CurrencyCode: "XYZ"}
-			b := &money.Money{CurrencyCode: "ABC"}
-			Sub(a, b)
-		}).To(PanicWith("can not operate on amounts in differing currencies (XYZ vs ABC)"))
-	})
+	DescribeTable(
+		"returns a - b",
+		func(a, b, x *money.Money) {
+			Expect(Sub(a, b)).To(Equal(x))
+		},
+		Entry(
+			"negative",
+			&money.Money{CurrencyCode: "XYZ", Units: 1, Nanos: 230000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 3, Nanos: 450000000},
+			&money.Money{CurrencyCode: "XYZ", Units: -2, Nanos: -220000000},
+		),
+		Entry(
+			"positive",
+			&money.Money{CurrencyCode: "XYZ", Units: 3, Nanos: 450000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 1, Nanos: 230000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 2, Nanos: 220000000},
+		),
+		Entry(
+			"positive unit and negative nanos are normalized",
+			&money.Money{CurrencyCode: "XYZ", Units: 40, Nanos: 0},
+			&money.Money{CurrencyCode: "XYZ", Units: 0, Nanos: 450000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 39, Nanos: 550000000},
+		),
+		Entry(
+			"negative unit and positive nanos are normalized",
+			&money.Money{CurrencyCode: "XYZ", Units: 1, Nanos: 200000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 2, Nanos: 100000000},
+			&money.Money{CurrencyCode: "XYZ", Units: 0, Nanos: -900000000},
+		),
+	)
 })
 
 var _ = Describe("func Sum()", func() {