refactor: remove exceptions

nadirbad · Dec 27, 2024 · 4aad452 · 4aad452
1 parent 5a2a2c2
commit 4aad452
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 42 deletions.
diff --git a/src/Application/Common/Exceptions/UnsupportedColourException.cs b/src/Application/Common/Exceptions/UnsupportedColourException.cs
diff --git a/src/Application/Domain/ValueObjects/Colour.cs b/src/Application/Domain/ValueObjects/Colour.cs
@@ -1,5 +1,8 @@
-using VerticalSliceArchitecture.Application.Common;
-using VerticalSliceArchitecture.Application.Common.Exceptions;
+using System.Reflection.Metadata.Ecma335;
+
+using ErrorOr;
+
+using VerticalSliceArchitecture.Application.Common;
 
 namespace VerticalSliceArchitecture.Application.Domain.ValueObjects;
 
@@ -18,11 +21,11 @@ private Colour(string code)
         Code = code;
     }
 
-    public static Colour From(string code)
+    public static ErrorOr<Colour> From(string code)
     {
         var colour = new Colour { Code = code };
 
-        return !SupportedColours.Contains(colour) ? throw new UnsupportedColourException(code) : colour;
+        return !SupportedColours.Contains(colour) ? ColourErrors.UnsupportedColour(code) : colour;
     }
 
     public static Colour White => new("#FFFFFF");
@@ -48,11 +51,6 @@ public static implicit operator string(Colour colour)
         return colour.ToString();
     }
 
-    public static explicit operator Colour(string code)
-    {
-        return From(code);
-    }
-
     public override string ToString()
     {
         return Code;

diff --git a/src/Application/Domain/ValueObjects/ColourErrors.cs b/src/Application/Domain/ValueObjects/ColourErrors.cs
@@ -0,0 +1,11 @@
+using ErrorOr;
+
+namespace VerticalSliceArchitecture.Application.Domain.ValueObjects;
+
+public static class ColourErrors
+{
+    public static Error UnsupportedColour(string code) =>
+        Error.Validation(
+            code: "ColourErrors.UnsupportedColour",
+            description: $"The colour code '{code}' is not supported.");
+}
diff --git a/tests/Application.UnitTests/ValueObjects/ColourTests.cs b/tests/Application.UnitTests/ValueObjects/ColourTests.cs
@@ -1,5 +1,4 @@
-using VerticalSliceArchitecture.Application.Common.Exceptions;
-using VerticalSliceArchitecture.Application.Domain.ValueObjects;
+using VerticalSliceArchitecture.Application.Domain.ValueObjects;
 
 namespace VerticalSliceArchitecture.Application.UnitTests.ValueObjects;
 
@@ -12,7 +11,8 @@ public void ShouldReturnCorrectColourCode()
 
         var colour = Colour.From(code);
 
-        colour.Code.Should().Be(code);
+        colour.IsError.Should().BeFalse();
+        colour.Value.Code.Should().Be(code);
     }
 
     [Fact]
@@ -32,17 +32,13 @@ public void ShouldPerformImplicitConversionToColourCodeString()
     }
 
     [Fact]
-    public void ShouldPerformExplicitConversionGivenSupportedColourCode()
+    public void ShouldReturnErrorGivenNotSupportedColourCode()
     {
-        var colour = (Colour)"#FFFFFF";
+        // Arrange/Act
+        var colour = Colour.From("##FF33CC");
 
-        colour.Should().Be(Colour.White);
-    }
-
-    [Fact]
-    public void ShouldThrowUnsupportedColourExceptionGivenNotSupportedColourCode()
-    {
-        FluentActions.Invoking(() => Colour.From("##FF33CC"))
-            .Should().Throw<UnsupportedColourException>();
+        // Assert
+        colour.IsError.Should().BeTrue();
+        colour.FirstError.Code.Should().Be("ColourErrors.UnsupportedColour");
     }
 }