VCST-244: Fix issues with Money (#232)

* fix: Use CurrencyDecimalDigits instead of NumberDecimalDigits when rounding money * fix: Make the multiplication of Money by Money obsolete, as it makes no sense * fix: Change return type to decimal when dividing Money by Money
VirtoCommerce · Nov 22, 2024 · cc196dd · cc196dd
1 parent 23d093e
commit cc196dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/VirtoCommerce.CoreModule.Core/Currency/DefaultMoneyRoundingPolicy.cs b/src/VirtoCommerce.CoreModule.Core/Currency/DefaultMoneyRoundingPolicy.cs
@@ -12,7 +12,7 @@ public decimal RoundMoney(decimal amount, Currency currency)
         {
             var roundingType = EnumUtility.SafeParse(currency.RoundingType, RoundingType.Rounding001);
             var midpointRounding = EnumUtility.SafeParse(currency.MidpointRounding, MidpointRounding.AwayFromZero);
-            return Round(amount, currency.NumberFormat.NumberDecimalDigits, roundingType, midpointRounding);
+            return Round(amount, currency.NumberFormat.CurrencyDecimalDigits, roundingType, midpointRounding);
         }
 
         /// <summary>

diff --git a/src/VirtoCommerce.CoreModule.Core/Currency/Money.cs b/src/VirtoCommerce.CoreModule.Core/Currency/Money.cs
@@ -115,11 +115,12 @@ public decimal TruncatedAmount
         public static Money operator -(Money first, Money second)
             => new Money(first.InternalAmount - second.ConvertTo(first.Currency).InternalAmount, first.Currency);
 
+        [Obsolete("Multiplying Money by Money makes no sense", DiagnosticId = "VC0009", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions/")]
         public static Money operator *(Money first, Money second)
             => new Money(first.InternalAmount * second.ConvertTo(first.Currency).InternalAmount, first.Currency);
 
-        public static Money operator /(Money first, Money second)
-            => new Money(first.InternalAmount / second.ConvertTo(first.Currency).InternalAmount, first.Currency);
+        public static decimal operator /(Money first, Money second)
+            => first.InternalAmount / second.ConvertTo(first.Currency).InternalAmount;
 
         public static bool operator ==(Money money, long value) => !(money is null) && money.InternalAmount == value;
 

diff --git a/tests/VirtoCommerce.CoreModule.Tests/DefaultMoneyRoundingPolicyTests.cs b/tests/VirtoCommerce.CoreModule.Tests/DefaultMoneyRoundingPolicyTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using VirtoCommerce.CoreModule.Core.Common;
 using VirtoCommerce.CoreModule.Core.Currency;
 using VirtoCommerce.CoreModule.Core.Enums;
 using Xunit;
@@ -14,7 +15,7 @@ public void CanRound(decimal amount, decimal expected, RoundingType roundingType
         {
             // Arrange
             var roundPolicy = new DefaultMoneyRoundingPolicy();
-            var currency = new Currency();
+            var currency = new Currency(new Language("en-US"), code: null);
             currency.RoundingType = roundingType.ToString();
             currency.MidpointRounding = midpointRounding.ToString();