Skip to content

Commit 5a8a779

Browse files
Merge pull request #31 from aferraromedina/fix-bug-with-connection-factory
fix: fix dispose of SqlConnection
2 parents 3995445 + ff2bccc commit 5a8a779

4 files changed

Lines changed: 6 additions & 11 deletions

File tree

Doppler.ReportingApi.Test/Utils/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class ServiceCollectionExtensions
1010
public static void SetupConnectionFactory(this IServiceCollection services, DbConnection dbConnection)
1111
{
1212
var mockDatabaseConnectionFactory = new Mock<IDatabaseConnectionFactory>();
13-
mockDatabaseConnectionFactory.Setup(a => a.GetConnection()).ReturnsAsync(dbConnection);
13+
mockDatabaseConnectionFactory.Setup(a => a.GetConnection()).Returns(dbConnection);
1414
services.AddSingleton(mockDatabaseConnectionFactory.Object);
1515
}
1616

Doppler.ReportingApi/Infrastructure/DatabaseConnectionFactory.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public DatabaseConnectionFactory(IOptions<DopplerDatabaseSettings> dopplerDataBa
2020
/// Open new connection and return it for use
2121
/// </summary>
2222
/// <returns></returns>
23-
public async Task<IDbConnection> GetConnection()
24-
{
25-
var cn = new SqlConnection(_connectionString);
26-
await cn.OpenAsync();
27-
return cn;
28-
}
23+
public IDbConnection GetConnection() => new SqlConnection(_connectionString);
2924
}
3025
}

Doppler.ReportingApi/Infrastructure/IDatabaseConnectionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ namespace Doppler.ReportingApi.Infrastructure
55
{
66
public interface IDatabaseConnectionFactory
77
{
8-
Task<IDbConnection> GetConnection();
8+
IDbConnection GetConnection();
99
}
1010
}

Doppler.ReportingApi/Infrastructure/SummaryRepository.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public SummaryRepository(IDatabaseConnectionFactory connectionFactory)
1818

1919
public async Task<CampaignsSummary> GetCampaignsSummaryByUserAsync(string userName, DateTime startDate, DateTime endDate)
2020
{
21-
using (var connection = await _connectionFactory.GetConnection())
21+
using (var connection = _connectionFactory.GetConnection())
2222
{
2323
var dummyDatabaseQuery = @"
2424
SELECT
@@ -62,7 +62,7 @@ Campaign.IdScheduledTask IS NULL AND --Exclude automations
6262

6363
public async Task<SubscribersSummary> GetSubscribersSummaryByUserAsync(string userName, DateTime startDate, DateTime endDate)
6464
{
65-
using (var connection = await _connectionFactory.GetConnection())
65+
using (var connection = _connectionFactory.GetConnection())
6666
{
6767
var dummyDatabaseQuery = @"
6868
SELECT
@@ -86,7 +86,7 @@ FROM Subscriber S
8686

8787
public async Task<SystemUsageSummary> GetSystemUsageAsync(string accountName)
8888
{
89-
using (var connection = await _connectionFactory.GetConnection())
89+
using (var connection = _connectionFactory.GetConnection())
9090
{
9191
var databaseQuery = @"
9292
SELECT

0 commit comments

Comments
 (0)