feat: Improve inbox and outbox

src/Paramore.Brighter.Inbox.MsSql/MsSqlInbox.cs

@@ -25,223 +25,50 @@ THE SOFTWARE. */
 
 using System;
 using System.Data;
-using System.Data.Common;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Data.SqlClient;
-using Paramore.Brighter.Inbox.Exceptions;
-using Paramore.Brighter.JsonConverters;
 using Paramore.Brighter.Logging;
 using Paramore.Brighter.MsSql;
 using Paramore.Brighter.Observability;
 
-namespace Paramore.Brighter.Inbox.MsSql
+namespace Paramore.Brighter.Inbox.MsSql;
+
+/// <summary>
+///     Class MsSqlInbox.
+/// </summary>
+public class MsSqlInbox : RelationalDatabaseInbox
 {
+    private const int MsSqlDuplicateKeyError_UniqueIndexViolation = 2601;
+    private const int MsSqlDuplicateKeyError_UniqueConstraintViolation = 2627;
+
     /// <summary>
-    ///     Class MsSqlInbox.
+    ///     Initializes a new instance of the <see cref="MsSqlInbox" /> class.
     /// </summary>
-    public class MsSqlInbox : RelationalDatabaseInbox
+    /// <param name="configuration">The configuration.</param>
+    /// <param name="connectionProvider">The Connection Provider.</param>
+    public MsSqlInbox(IAmARelationalDatabaseConfiguration configuration, IAmARelationalDbConnectionProvider connectionProvider) 
+        : base(DbSystem.MsSql, configuration, connectionProvider,
+            new MsSqlQueries(), ApplicationLogging.CreateLogger<MsSqlInbox>())
     {
-        private const int MsSqlDuplicateKeyError_UniqueIndexViolation = 2601;
-        private const int MsSqlDuplicateKeyError_UniqueConstraintViolation = 2627;
-        private readonly IAmARelationalDbConnectionProvider _connectionProvider;
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="MsSqlInbox" /> class.
-        /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        /// <param name="connectionProvider">The Connection Provider.</param>
-        public MsSqlInbox(IAmARelationalDatabaseConfiguration configuration, IAmARelationalDbConnectionProvider connectionProvider) 
-            : base(DbSystem.MsSql, configuration.DatabaseName, configuration.InBoxTableName, 
-                  new MsSqlQueries(), ApplicationLogging.CreateLogger<MsSqlInbox>())
-        {
-            ContinueOnCapturedContext = false;
-            _connectionProvider = connectionProvider;
-        }
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="MsSqlInbox" /> class.
-        /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        public MsSqlInbox(IAmARelationalDatabaseConfiguration configuration) : this(configuration,
-            new MsSqlConnectionProvider(configuration))
-        {
-        }
-
-        protected override DbCommand CreateCommand(
-            DbConnection connection, string sqlText, int outBoxTimeout, params IDbDataParameter[] parameters)
-        {
-            var command = connection.CreateCommand();
-
-            command.CommandTimeout = outBoxTimeout < 0 ? 0 : outBoxTimeout;
-            command.CommandText = sqlText;
-            command.Parameters.AddRange(parameters);
-
-            return command;
-        }
-
-        protected override void WriteToStore(Func<DbConnection, DbCommand> commandFunc, Action? loggingAction)
-        {
-            using var connection = GetOpenConnection(_connectionProvider);
-            using var command = commandFunc.Invoke(connection);
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (SqlException ex)
-            {
-                if (ex.Number != MsSqlDuplicateKeyError_UniqueIndexViolation && ex.Number != MsSqlDuplicateKeyError_UniqueConstraintViolation) throw;
-                loggingAction?.Invoke();
-                return;
-
-            }
-        }
-
-        protected override async Task WriteToStoreAsync(Func<DbConnection, DbCommand> commandFunc, 
-            Action? loggingAction, CancellationToken cancellationToken)
-        {
-            using var connection = await GetOpenConnectionAsync(_connectionProvider, cancellationToken)
-                .ConfigureAwait(ContinueOnCapturedContext);
-            using var command = commandFunc.Invoke(connection);
-            try
-            {
-                await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(ContinueOnCapturedContext);
-            }
-            catch (SqlException ex)
-            {
-                if (ex.Number != MsSqlDuplicateKeyError_UniqueIndexViolation && ex.Number != MsSqlDuplicateKeyError_UniqueConstraintViolation) throw;
-                loggingAction?.Invoke();
-                return;
-
-            }
-        }
-
-        protected override T ReadFromStore<T>(Func<DbConnection, DbCommand> commandFunc, Func<DbDataReader, string, T> resultFunc, string commandId)
-        {
-            using var connection = _connectionProvider.GetConnection();
-            using var command = commandFunc.Invoke(connection);
-
-            var result = command.ExecuteReader();
-            return resultFunc.Invoke(result, commandId);
-        }
-
-        protected override async Task<T> ReadFromStoreAsync<T>(Func<DbConnection, DbCommand> commandFunc, 
-            Func<DbDataReader, string, CancellationToken, Task<T>> resultFunc, 
-            string commandId, 
-            CancellationToken cancellationToken)
-        {
-            using var connection = await _connectionProvider.GetConnectionAsync(cancellationToken)
-                .ConfigureAwait(ContinueOnCapturedContext);
-            using var command = commandFunc.Invoke(connection);
-
-            var result = await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(ContinueOnCapturedContext);
-            return await resultFunc.Invoke(result, commandId, cancellationToken);
-        }
-
-        protected override IDbDataParameter[] CreateAddParameters<T>(T command, string contextKey)
-        {
-            var commandJson = JsonSerializer.Serialize(command, JsonSerialisationOptions.Options);
-            var parameters = new[]
-            {
-                CreateSqlParameter("CommandID", command.Id.Value),
-                CreateSqlParameter("CommandType", typeof (T).Name),
-                CreateSqlParameter("CommandBody", commandJson),
-                CreateSqlParameter("Timestamp", DateTime.UtcNow),
-                CreateSqlParameter("ContextKey", contextKey)
-            };
-            return parameters;
-        }
-
-        protected override IDbDataParameter[] CreateGetParameters(string commandId, string contextKey)
-        {
-            var parameters = new[]
-            {
-                CreateSqlParameter("CommandID", commandId),
-                CreateSqlParameter("ContextKey", contextKey)
-            };
-            return parameters;
-        }
-
-        protected override IDbDataParameter[] CreateExistsParameters(string commandId, string contextKey)
-        {
-            var parameters = new[]
-            {
-                CreateSqlParameter("CommandID", commandId),
-                CreateSqlParameter("ContextKey", contextKey)
-            };
-            return parameters;
-        }
-
-        private SqlParameter CreateSqlParameter(string parameterName, object value)
-        {
-            return new SqlParameter(parameterName, value ?? DBNull.Value);
-        }
-
-        protected override T MapFunction<T>(DbDataReader dr, string commandId)
-        {
-            try
-            {
-                if (dr.Read())
-                {
-                    var body = dr.GetString(dr.GetOrdinal("CommandBody"));
-                    return JsonSerializer.Deserialize<T>(body, JsonSerialisationOptions.Options)!;
-                }
-            }
-            finally
-            {
-                dr.Close();
-            }
-
-            throw new RequestNotFoundException<T>(commandId);
-        }
-
-        protected override async Task<T> MapFunctionAsync<T>(DbDataReader dr, string commandId, 
-            CancellationToken cancellationToken)
-        {
-            try
-            {
-                if (await dr.ReadAsync().ConfigureAwait(ContinueOnCapturedContext))
-                {
-                    var body = dr.GetString(dr.GetOrdinal("CommandBody"));
-                    return JsonSerializer.Deserialize<T>(body, JsonSerialisationOptions.Options)!;
-                }
-            }
-            finally
-            {
-#if NET462
-                dr.Close();
-#else
-                await dr.CloseAsync().ConfigureAwait(ContinueOnCapturedContext);
-#endif
-            }
+    }
 
-            throw new RequestNotFoundException<T>(commandId);
-        }
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="MsSqlInbox" /> class.
+    /// </summary>
+    /// <param name="configuration">The configuration.</param>
+    public MsSqlInbox(IAmARelationalDatabaseConfiguration configuration) : this(configuration,
+        new MsSqlConnectionProvider(configuration))
+    {
+    }
 
-        protected override bool MapBoolFunction(DbDataReader dr, string commandId)
-        {
-            try
-            {
-                return dr.HasRows;
-            }
-            finally
-            {
-                dr.Close();
-            }
-        }
+    /// <inheritdoc />
+    protected override bool IsExceptionUniqueOrDuplicateIssue(Exception ex)
+    {
+        return ex is SqlException { Number: MsSqlDuplicateKeyError_UniqueIndexViolation or MsSqlDuplicateKeyError_UniqueConstraintViolation };
+    }
 
-        protected override Task<bool> MapBoolFunctionAsync(DbDataReader dr, string commandId, 
-            CancellationToken cancellationToken)
-        {
-            try
-            {
-                return Task.FromResult(dr.HasRows);
-            }
-            finally
-            {
-                dr.Close();
-            }
-        }
+    /// <inheritdoc />
+    protected override IDbDataParameter CreateSqlParameter(string parameterName, object? value)
+    {
+        return new SqlParameter { ParameterName = parameterName, Value = value ?? DBNull.Value };
     }
 }