Fix SQL Connection (#976)

Author: carlsixsmith-moj

src/Application/Common/Interfaces/ISqlConnectionFactory.cs

@@ -2,9 +2,7 @@ namespace Cfo.Cats.Application.Common.Interfaces;
 
 public interface ISqlConnectionFactory
 {
-    IDbConnection GetOpenConnection();
-
-    IDbConnection CreateNewConnection();
+    IDbConnection CreateOpenConnection();
 
     string GetConnectionString();
 }

src/Application/Features/Labels/LabelCounter.cs

@@ -7,7 +7,7 @@ public class LabelCounter(ISqlConnectionFactory sqlConnectionFactory) : ILabelCo
 {
     public int CountParticipants(LabelId labelId)
     {
-        var connection = sqlConnectionFactory.GetOpenConnection();
+        using var connection = sqlConnectionFactory.CreateOpenConnection();
 
         const string sql = """
                            SELECT Count(*) 
@@ -24,7 +24,7 @@ FROM [Participant].[Label] as [Label]
 
     public int CountVisibleLabels(string name, string? contractId)
     {
-        var connection = sqlConnectionFactory.GetOpenConnection();
+        using var connection = sqlConnectionFactory.CreateOpenConnection();
 
         const string sql = """
                          SELECT Count(*) 

src/Application/Features/Labels/Queries/GetLabelById.cs

@@ -18,7 +18,7 @@ public class Handler(ISqlConnectionFactory sqlConnectionFactory) : IRequestHandl
     {
         public async Task<Result<LabelDto>> Handle(Query request, CancellationToken cancellationToken)
         {
-            var connection = sqlConnectionFactory.GetOpenConnection();
+            using var connection = sqlConnectionFactory.CreateOpenConnection();
 
             const string sql = $"""
                                 SELECT 

src/Application/Features/Labels/Queries/GetVisibleLabels.cs

@@ -17,7 +17,7 @@ public class Handler(ISqlConnectionFactory sqlConnectionFactory) : IRequestHandl
     {
         public async Task<Result<LabelDto[]>> Handle(Query request, CancellationToken cancellationToken)
         {
-            var connection = sqlConnectionFactory.GetOpenConnection();
+            using var connection = sqlConnectionFactory.CreateOpenConnection();
 
             const string sql = $"""
                                     SELECT 

src/Application/Features/ParticipantLabels/GetParticipantLabels/GetParticipantLabelsQueryHandler.cs

@@ -8,7 +8,7 @@ public class GetParticipantLabelsQueryHandler(ISqlConnectionFactory sqlConnectio
 {
     public async Task<Result<GetParticipantLabelsDto>> Handle(GetParticipantLabelsQuery request, CancellationToken cancellationToken)
     {
-        var connection = sqlConnectionFactory.GetOpenConnection();
+        using var connection = sqlConnectionFactory.CreateOpenConnection();
 
         var sql = """
             select

src/Application/Features/ParticipantLabels/ParticipantLabelsCounter.cs

@@ -9,7 +9,7 @@ public class ParticipantLabelsCounter(ISqlConnectionFactory sqlConnectionFactory
 {
     public int CountOpenLabels(ParticipantId participantId, LabelId labelId)
     {
-        var connection = sqlConnectionFactory.GetOpenConnection();
+        using var connection = sqlConnectionFactory.CreateOpenConnection();
 
         const string sql = """
                             SELECT COUNT(*)

src/Infrastructure/Persistence/SqlConnectionFactory.cs

@@ -3,24 +3,9 @@
 
 namespace Cfo.Cats.Infrastructure.Persistence;
 
-public class SqlConnectionFactory(string connectionString) : ISqlConnectionFactory, IDisposable
+public class SqlConnectionFactory(string connectionString) : ISqlConnectionFactory
 {
-    private IDbConnection? _connection;
-
-    public IDbConnection GetOpenConnection()
-    {
-        if (this._connection is { State: ConnectionState.Open })
-        {
-            return _connection;
-        }
-
-        _connection = new SqlConnection(connectionString);
-        _connection.Open();
-
-        return _connection;
-    }
-    
-    public IDbConnection CreateNewConnection()
+    public IDbConnection CreateOpenConnection()
     {
         var connection = new SqlConnection(connectionString);
         connection.Open();
@@ -29,12 +14,4 @@ public IDbConnection CreateNewConnection()
     }
 
     public string GetConnectionString() => connectionString;
-
-    public void Dispose()
-    {
-        if (this._connection != null && this._connection.State == ConnectionState.Open)
-        {
-            this._connection.Dispose();
-        }
-    }
 }

test/Application.UnitTests/Labels/LabelCounterTests.cs

@@ -29,7 +29,7 @@ public void CountParticipants_ShouldReturnExpectedCount(int expectedCount)
             .Returns(expectedCount);
 
         var sqlFactory = new Mock<ISqlConnectionFactory>();
-        sqlFactory.Setup(x => x.GetOpenConnection()).Returns(connection.Object);
+        sqlFactory.Setup(x => x.CreateOpenConnection()).Returns(connection.Object);
 
         var counter = new LabelCounter(sqlFactory.Object);
         var labelId = new LabelId(Guid.NewGuid());

test/Application.UnitTests/ParticipantLabels/ParticipantLabelsCounterTests.cs

@@ -23,8 +23,7 @@ public void Constructor_WithValidFactory_ShouldCreateInstance()
 
     private class TestSqlConnectionFactory : ISqlConnectionFactory
     {
-        public IDbConnection GetOpenConnection() => null!;
-        public IDbConnection CreateNewConnection() => null!;
+        public IDbConnection CreateOpenConnection() => null!;
         public string GetConnectionString() => "";
     }
 }