refactor storage

src/DotNetCore.CAP.EntityFrameworkCore/CAP.BuilderExtensions.cs

@@ -19,7 +19,6 @@ namespace Microsoft.Extensions.DependencyInjection
             where TContext : DbContext
         {
             builder.Services.AddScoped<ICapMessageStore, CapMessageStore<TContext>>();
-
             builder.Services.AddScoped<IStorage, EFStorage>();
             builder.Services.AddScoped<IStorageConnection, EFStorageConnection>();
 
@@ -27,15 +26,27 @@ namespace Microsoft.Extensions.DependencyInjection
         }
          
 
-        public static CapBuilder AddEntityFrameworkStores<TContext>(this CapBuilder builder, Action<EFOptions> options)
+        public static CapBuilder AddEntityFrameworkStores<TContext>(this CapBuilder builder, Action<EFOptions> actionOptions)
             where TContext : DbContext
         {
       
             builder.Services.AddScoped<ICapMessageStore, CapMessageStore<TContext>>();
-
-            builder.Services.AddScoped<IStorage, EFStorage>();
+            builder.Services.AddSingleton<IStorage, EFStorage>();
             builder.Services.AddScoped<IStorageConnection, EFStorageConnection>();
-            builder.Services.Configure(options);
+            builder.Services.Configure(actionOptions);
+            
+            var efOptions = new EFOptions();
+            actionOptions(efOptions);
+
+            builder.Services.AddDbContext<CapDbContext>(options =>
+            {
+                options.UseSqlServer(efOptions.ConnectionString, sqlOpts =>
+                {
+                    sqlOpts.MigrationsHistoryTable(
+                        efOptions.MigrationsHistoryTableName,
+                        efOptions.MigrationsHistoryTableSchema ?? efOptions.Schema);
+                });
+            });
 
             return builder;
         }

src/DotNetCore.CAP.EntityFrameworkCore/CAP.EFOptions.cs

@@ -7,11 +7,29 @@ namespace DotNetCore.CAP.EntityFrameworkCore
     public class EFOptions
     {
         public const string DefaultSchema = "cap";
+        public const string DefaultMigrationsHistoryTableName = "__EFMigrationsHistory";
+
+        /// <summary>
+        /// Gets or sets the database's connection string that will be used to store database entities.
+        /// </summary>
+        public string ConnectionString { get; set; }
 
         /// <summary>
         /// Gets or sets the schema to use when creating database objects.
         /// Default is <see cref="DefaultSchema"/>.
         /// </summary>
         public string Schema { get; set; } = DefaultSchema;
+
+        /// <summary>
+        /// Gets or sets the migrations history table's schema.
+        /// If this is null, <see cref="Schema"/> will be used.
+        /// </summary>
+        public string MigrationsHistoryTableSchema { get; set; }
+
+        /// <summary>
+        /// Gets or sets the migrations history table's name.
+        /// Default is <see cref="DefaultMigrationsHistoryTableName"/>.
+        /// </summary>
+        public string MigrationsHistoryTableName { get; set; } = DefaultMigrationsHistoryTableName;
     }
 }

src/DotNetCore.CAP.EntityFrameworkCore/CapMessageStore.cs

 using System;
 using System.Threading.Tasks;
-using DotNetCore.CAP.Infrastructure;
 using DotNetCore.CAP.Models;
 using Microsoft.EntityFrameworkCore;
 
@@ -25,8 +24,6 @@ namespace DotNetCore.CAP.EntityFrameworkCore
 
         private DbSet<CapSentMessage> SentMessages => Context.Set<CapSentMessage>();
 
-        private DbSet<CapReceivedMessage> ReceivedMessages => Context.Set<CapReceivedMessage>();
-
         /// <summary>
         /// Creates the specified <paramref name="message"/> in the cap message store.
         /// </summary>
@@ -39,158 +36,5 @@ namespace DotNetCore.CAP.EntityFrameworkCore
             await Context.SaveChangesAsync();
             return OperateResult.Success;
         }
-
-        public async Task<OperateResult> ChangeSentMessageStateAsync(CapSentMessage message, string status,
-            bool autoSaveChanges = true)
-        {
-            Context.Attach(message);
-            message.LastRun = DateTime.Now;
-            message.StatusName = status;
-            try
-            {
-                if (autoSaveChanges)
-                {
-                    await Context.SaveChangesAsync();
-                }
-            }
-            catch (DbUpdateConcurrencyException ex)
-            {
-                return OperateResult.Failed(
-                    new OperateError()
-                    {
-                        Code = "DbUpdateConcurrencyException",
-                        Description = ex.Message
-                    });
-            }
-            return OperateResult.Success;
-        }
-
-        /// <summary>
-        /// First Enqueued Message.
-        /// </summary>
-        public async Task<CapSentMessage> GetNextSentMessageToBeEnqueuedAsync()
-        {
-            return await SentMessages.FirstOrDefaultAsync(x => x.StatusName == StatusName.Enqueued);
-        }
-
-        /// <summary>
-        /// Updates a message in a store as an asynchronous operation.
-        /// </summary>
-        /// <param name="message">The message to update in the store.</param>
-        public async Task<OperateResult> UpdateSentMessageAsync(CapSentMessage message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-
-            Context.Attach(message);
-            message.LastRun = DateTime.Now;
-            Context.Update(message);
-
-            try
-            {
-                await Context.SaveChangesAsync();
-                return OperateResult.Success;
-            }
-            catch (DbUpdateConcurrencyException ex)
-            {
-                return OperateResult.Failed(new OperateError()
-                {
-                    Code = "DbUpdateConcurrencyException",
-                    Description = ex.Message
-                });
-            }
-        }
-
-        /// <summary>
-        ///  Deletes the specified <paramref name="message"/> from the consistency message store.
-        /// </summary>
-        /// <param name="message">The message to delete.</param>
-        public async Task<OperateResult> RemoveSentMessageAsync(CapSentMessage message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-
-            Context.Remove(message);
-            try
-            {
-                await Context.SaveChangesAsync();
-                return OperateResult.Success;
-            }
-            catch (DbUpdateConcurrencyException ex)
-            {
-                return OperateResult.Failed(new OperateError()
-                {
-                    Code = "DbUpdateConcurrencyException",
-                    Description = ex.Message
-                });
-            }
-        }
-
-        /// <summary>
-        /// Creates the specified <paramref name="message"/> in the consistency message store.
-        /// </summary>
-        /// <param name="message">The message to create.</param>
-        public async Task<OperateResult> StoreReceivedMessageAsync(CapReceivedMessage message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-
-            Context.Add(message);
-            await Context.SaveChangesAsync();
-            return OperateResult.Success;
-        }
-
-        public async Task<OperateResult> ChangeReceivedMessageStateAsync(CapReceivedMessage message, string status,
-            bool autoSaveChanges = true)
-        {
-            Context.Attach(message);
-            message.LastRun = DateTime.Now;
-            message.StatusName = status;
-            try
-            {
-                if (autoSaveChanges)
-                {
-                    await Context.SaveChangesAsync();
-                }
-            }
-            catch (DbUpdateConcurrencyException ex)
-            {
-                return OperateResult.Failed(new OperateError()
-                {
-                    Code = "DbUpdateConcurrencyException",
-                    Description = ex.Message
-                });
-            }
-            return OperateResult.Success;
-        }
-
-        public async Task<CapReceivedMessage> GetNextReceivedMessageToBeExcuted()
-        {
-            return await ReceivedMessages.FirstOrDefaultAsync(x => x.StatusName == StatusName.Enqueued);
-        }
-
-        /// <summary>
-        /// Updates the specified <paramref name="message"/> in the message store.
-        /// </summary>
-        /// <param name="message">The message to update.</param>
-        public async Task<OperateResult> UpdateReceivedMessageAsync(CapReceivedMessage message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-
-            Context.Attach(message);
-            message.LastRun = DateTime.Now;
-            Context.Update(message);
-
-            try
-            {
-                await Context.SaveChangesAsync();
-                return OperateResult.Success;
-            }
-            catch (DbUpdateConcurrencyException ex)
-            {
-                return OperateResult.Failed(new OperateError()
-                {
-                    Code = "DbUpdateConcurrencyException",
-                    Description = ex.Message
-                });
-            }
-        }
     }
 }
\ No newline at end of file

src/DotNetCore.CAP.EntityFrameworkCore/DotNetCore.CAP.EntityFrameworkCore.csproj

@@ -16,7 +16,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/DotNetCore.CAP.EntityFrameworkCore/EFStorageConnection.cs

@@ -31,16 +31,6 @@ namespace DotNetCore.CAP.EntityFrameworkCore
             return new EFStorageTransaction(this);
         }   
 
-        public Task StoreSentMessageAsync(CapSentMessage message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
-
-            message.LastRun = NormalizeDateTime(message.LastRun);
-
-            _context.Add(message);
-            return _context.SaveChangesAsync();
-        }
-
         public Task<CapSentMessage> GetSentMessageAsync(string id)
         {
             return _context.CapSentMessages.FirstOrDefaultAsync(x => x.Id == id);

src/DotNetCore.CAP.RabbitMQ/IProcessor.RabbitJobProcessor.cs

@@ -5,6 +5,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Infrastructure;
 using DotNetCore.CAP.Job;
+using DotNetCore.CAP.Job.States;
+using DotNetCore.CAP.Models;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -16,21 +18,24 @@ namespace DotNetCore.CAP.RabbitMQ
     {
         private readonly RabbitMQOptions _rabbitMqOptions;
         private readonly CancellationTokenSource _cts;
-
+        private readonly IStateChanger _stateChanger;
         private readonly IServiceProvider _provider;
         private readonly ILogger _logger;
 
         private readonly TimeSpan _pollingDelay;
+        internal static readonly AutoResetEvent PulseEvent = new AutoResetEvent(true);
 
         public RabbitJobProcessor(
             IOptions<CapOptions> capOptions,
             IOptions<RabbitMQOptions> rabbitMQOptions,
             ILogger<RabbitJobProcessor> logger,
+            IStateChanger stateChanger,
             IServiceProvider provider)
         {
             _logger = logger;
             _rabbitMqOptions = rabbitMQOptions.Value;
             _provider = provider;
+            _stateChanger = stateChanger;
             _cts = new CancellationTokenSource();
 
             var capOptions1 = capOptions.Value;
@@ -62,7 +67,7 @@ namespace DotNetCore.CAP.RabbitMQ
                     var token = GetTokenToWaitOn(context);
                 }
 
-                await WaitHandleEx.WaitAnyAsync(WaitHandleEx.PulseEvent, 
+                await WaitHandleEx.WaitAnyAsync(PulseEvent,
                     context.CancellationToken.WaitHandle, _pollingDelay);
             }
             finally
@@ -78,39 +83,93 @@ namespace DotNetCore.CAP.RabbitMQ
 
         private async Task<bool> Step(ProcessingContext context)
         {
+            var fetched = default(IFetchedMessage);
             using (var scopedContext = context.CreateScope())
             {
                 var provider = scopedContext.Provider;
                 var messageStore = provider.GetRequiredService<ICapMessageStore>();
-                var message = await messageStore.GetNextSentMessageToBeEnqueuedAsync();
-                try
+                var connection = provider.GetRequiredService<IStorageConnection>();
+                
+                if ((fetched = await connection.FetchNextSentMessageAsync()) != null)
                 {
-                    if (message != null)
+                    using (fetched)
+                    {
+                        var message = await connection.GetSentMessageAsync(fetched.MessageId);
+                        try
                         {
                             var sp = Stopwatch.StartNew();
-                        message.StatusName = StatusName.Processing;
-                        await messageStore.UpdateSentMessageAsync(message);
-
-                        ExecuteJob(message.KeyName, message.Content);
+                            await _stateChanger.ChangeStateAsync(message, new ProcessingState(), connection);
 
+                            if (message.Retries > 0)
+                            {
+                                _logger.JobRetrying(message.Retries);
+                            }
+                            var result = ExecuteJob(message.KeyName, message.Content);
                             sp.Stop();
 
-                        message.StatusName = StatusName.Succeeded;
-                        await messageStore.UpdateSentMessageAsync(message);
+                            var newState = default(IState);
+                            if (!result.Succeeded)
+                            {
+                                var shouldRetry = await UpdateJobForRetryAsync(message, connection);
+                                if (shouldRetry)
+                                {
+                                    newState = new ScheduledState();
+                                    _logger.JobFailedWillRetry(result.Exception);
+                                }
+                                else
+                                {
+                                    newState = new FailedState();
+                                    _logger.JobFailed(result.Exception);
+                                }
+                            }
+                            else
+                            {
+                                newState = new SucceededState();
+                            }
+                            await _stateChanger.ChangeStateAsync(message, newState, connection);
+
+                            fetched.RemoveFromQueue();
 
+                            if (result.Succeeded)
+                            {
                                 _logger.JobExecuted(sp.Elapsed.TotalSeconds);
                             }
                         }
+
                         catch (Exception ex)
                         {
                             _logger.ExceptionOccuredWhileExecutingJob(message?.KeyName, ex);
                             return false;
                         }
+
+                    }
+                } 
+            }
+            return fetched != null;
+        }
+
+        private async Task<bool> UpdateJobForRetryAsync(CapSentMessage message, IStorageConnection connection)
+        {
+            var retryBehavior = RetryBehavior.DefaultRetry;
+
+            var now = DateTime.UtcNow;
+            var retries = ++message.Retries;
+            if (retries >= retryBehavior.RetryCount)
+            {
+                return false;
+            }
+
+            var due = message.Added.AddSeconds(retryBehavior.RetryIn(retries));
+            message.LastRun = due;
+            using (var transaction = connection.CreateTransaction())
+            {
+                transaction.UpdateMessage(message);
+                await transaction.CommitAsync();
             }
             return true;
         }
 
-        private void ExecuteJob(string topic, string content)
+        private OperateResult ExecuteJob(string topic, string content)
         {
             var factory = new ConnectionFactory()
             {
@@ -124,6 +183,8 @@ namespace DotNetCore.CAP.RabbitMQ
                 SocketWriteTimeout = _rabbitMqOptions.SocketWriteTimeout
             };
 
+            try
+            {
                 using (var connection = factory.CreateConnection())
                 using (var channel = connection.CreateModel())
                 {
@@ -135,6 +196,13 @@ namespace DotNetCore.CAP.RabbitMQ
                                          basicProperties: null,
                                          body: body);
                 }
+                return OperateResult.Success;
+            }
+            catch (Exception ex)
+            {
+                return OperateResult.Failed(ex, new OperateError() { Code = ex.HResult.ToString(), Description = ex.Message });
+            }
+
         }
     }
 }
\ No newline at end of file

src/DotNetCore.CAP/ICapMessageStore.cs

@@ -14,62 +14,5 @@ namespace DotNetCore.CAP
         /// </summary>
         /// <param name="message">The message to create in the store.</param>
         Task<OperateResult> StoreSentMessageAsync(CapSentMessage message);
-
-        /// <summary>
-        /// Change <see cref="CapSentMessage"/> model status name.
-        /// </summary>
-        /// <param name="message">The type of <see cref="CapSentMessage"/>.</param>
-        /// <param name="statusName">The status name.</param>
-        /// <param name="autoSaveChanges">auto save dbcontext changes.</param>
-        /// <returns></returns>
-        Task<OperateResult> ChangeSentMessageStateAsync(CapSentMessage message, string statusName,
-            bool autoSaveChanges = true);
-
-        /// <summary>
-        /// Fetches the next message to be executed.
-        /// </summary>
-        /// <returns></returns>
-        Task<CapSentMessage> GetNextSentMessageToBeEnqueuedAsync();
-
-        /// <summary>
-        /// Updates a message in a store as an asynchronous operation.
-        /// </summary>
-        /// <param name="message">The message to update in the store.</param>
-        Task<OperateResult> UpdateSentMessageAsync(CapSentMessage message);
-
-        /// <summary>
-        /// Deletes a message from the store as an asynchronous operation.
-        /// </summary>
-        /// <param name="message">The message to delete in the store.</param>
-        Task<OperateResult> RemoveSentMessageAsync(CapSentMessage message);
-
-
-        /// <summary>
-        /// Creates a new message in a store as an asynchronous operation.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        Task<OperateResult> StoreReceivedMessageAsync(CapReceivedMessage message);
-
-        /// <summary>
-        /// Change <see cref="CapReceivedMessage"/> model status name.
-        /// </summary>
-        /// <param name="message">The type of <see cref="CapReceivedMessage"/>.</param>
-        /// <param name="statusName">The status name.</param>
-        /// <param name="autoSaveChanges">auto save dbcontext changes.</param>
-        /// <returns></returns>
-        Task<OperateResult> ChangeReceivedMessageStateAsync(CapReceivedMessage message, string statusName,
-            bool autoSaveChanges = true);
-
-        /// <summary>
-        /// Fetches the next message to be executed.
-        /// </summary>
-        Task<CapReceivedMessage> GetNextReceivedMessageToBeExcuted();
-
-        /// <summary>
-        /// Updates a message in a store as an asynchronous operation.
-        /// </summary>
-        /// <param name="message">The message to update in the store.</param>
-        Task<OperateResult> UpdateReceivedMessageAsync(CapReceivedMessage message);
     }
 }
\ No newline at end of file

src/DotNetCore.CAP/IConsumerHandler.Default.cs

@@ -114,7 +114,7 @@ namespace DotNetCore.CAP
         private CapReceivedMessage StoreMessage(IServiceScope serviceScope, MessageContext messageContext)
         {
             var provider = serviceScope.ServiceProvider;
-            var messageStore = provider.GetRequiredService<ICapMessageStore>();
+            var messageStore = provider.GetRequiredService<IStorageConnection>();
             var receivedMessage = new CapReceivedMessage(messageContext)
             {
                 StatusName = StatusName.Enqueued,
@@ -126,13 +126,17 @@ namespace DotNetCore.CAP
         private void ProcessMessage(IServiceScope serviceScope, CapReceivedMessage receivedMessage)
         {
             var provider = serviceScope.ServiceProvider;
-            var messageStore = provider.GetRequiredService<ICapMessageStore>();
+            var messageStore = provider.GetRequiredService<IStorageConnection>();
             try
             {
                 var executeDescriptorGroup = _selector.GetTopicExector(receivedMessage.KeyName);
 
                 if (executeDescriptorGroup.ContainsKey(receivedMessage.Group))
                 {
+                    messageStore.FetchNextReceivedMessageAsync
+
+
+
                     messageStore.ChangeReceivedMessageStateAsync(receivedMessage, StatusName.Processing).Wait();
 
                     // If there are multiple consumers in the same group, we will take the first

src/DotNetCore.CAP/IStorageConnection.cs

@@ -12,12 +12,6 @@ namespace DotNetCore.CAP
 
         //Sent messages        
 
-        /// <summary>
-        /// Stores the message.
-        /// </summary>
-        /// <param name="message">The message to store.</param>
-        Task StoreSentMessageAsync(CapSentMessage message);
-
         /// <summary>
         /// Returns the message with the given id.
         /// </summary>
@@ -56,7 +50,7 @@ namespace DotNetCore.CAP
         /// <summary>
         /// Returns the next message to be enqueued.
         /// </summary>
-        Task<CapSentMessage> GetNextReceviedMessageToBeEnqueuedAsync();
+        Task<CapReceivedMessage> GetNextReceviedMessageToBeEnqueuedAsync();
          
         //-----------------------------------------
 

src/DotNetCore.CAP/Job/IJobProcessor.JobQueuer.cs

+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNetCore.CAP.Job.States;
+using DotNetCore.CAP.Models;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace DotNetCore.CAP.Job
+{
+	public class JobQueuer : IJobProcessor
+    {
+		private ILogger _logger;
+		private JobsOptions _options;
+		private IStateChanger _stateChanger;
+		private IServiceProvider _provider;
+
+		internal static readonly AutoResetEvent PulseEvent = new AutoResetEvent(true);
+		private TimeSpan _pollingDelay;
+
+		public JobQueuer(
+			ILogger<JobQueuer> logger,
+			JobsOptions options,
+			IStateChanger stateChanger,
+			IServiceProvider provider)
+		{
+			_logger = logger;
+			_options = options;
+			_stateChanger = stateChanger;
+			_provider = provider;
+
+			_pollingDelay = TimeSpan.FromSeconds(_options.PollingDelay);
+		}
+
+		public async Task ProcessAsync(ProcessingContext context)
+		{
+			using (var scope = _provider.CreateScope())
+			{
+                CapSentMessage sentMessage;
+                CapReceivedMessage receivedMessage;
+				var provider = scope.ServiceProvider;
+				var connection = provider.GetRequiredService<IStorageConnection>();
+
+				while (
+					!context.IsStopping &&
+					(sentMessage = await connection.GetNextSentMessageToBeEnqueuedAsync()) != null)
+
+                {
+					var state = new EnqueuedState();
+
+					using (var transaction = connection.CreateTransaction())
+					{
+						_stateChanger.ChangeState(sentMessage, state, transaction);
+						await transaction.CommitAsync();
+					}
+				}
+			}
+
+			context.ThrowIfStopping();
+
+			DelayedJobProcessor.PulseEvent.Set();
+			await WaitHandleEx.WaitAnyAsync(PulseEvent, context.CancellationToken.WaitHandle, _pollingDelay);
+		}
+	}
+}

src/DotNetCore.CAP/Job/States/IState.Enqueued.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class EnqueuedState : IState
+    {
+        public const string StateName = "Enqueued";
+
+        public TimeSpan? ExpiresAfter => null;
+
+        public string Name => StateName;
+
+        public void Apply(CapSentMessage message, IStorageTransaction transaction)
+        {
+            transaction.EnqueueMessage(message);
+        }
+
+        public void Apply(CapReceivedMessage message, IStorageTransaction transaction)
+        {
+            transaction.EnqueueMessage(message);
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IState.Failed.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class FailedState : IState
+    {
+        public const string StateName = "Failed";
+
+        public TimeSpan? ExpiresAfter => TimeSpan.FromDays(15);
+
+        public string Name => StateName;
+
+        public void Apply(CapSentMessage message, IStorageTransaction transaction)
+        {
+        }
+
+        public void Apply(CapReceivedMessage message, IStorageTransaction transaction)
+        {
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IState.Processing.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class ProcessingState : IState
+    {
+        public const string StateName = "Processing";
+
+        public TimeSpan? ExpiresAfter => null;
+
+        public string Name => StateName;
+
+        public void Apply(CapSentMessage message, IStorageTransaction transaction)
+        {
+        }
+
+        public void Apply(CapReceivedMessage message, IStorageTransaction transaction)
+        {
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IState.Scheduled.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class ScheduledState : IState
+    {
+        public const string StateName = "Scheduled";
+
+        public TimeSpan? ExpiresAfter => null;
+
+        public string Name => StateName;
+
+        public void Apply(CapSentMessage message, IStorageTransaction transaction)
+        {
+        }
+
+        public void Apply(CapReceivedMessage message, IStorageTransaction transaction)
+        {
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IState.Succeeded.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class SucceededState : IState
+    {
+        public const string StateName = "Succeeded";
+
+        public TimeSpan? ExpiresAfter => TimeSpan.FromHours(1);
+
+        public string Name => StateName;
+
+        public void Apply(CapSentMessage message, IStorageTransaction transaction)
+        {
+        }
+
+        public void Apply(CapReceivedMessage message, IStorageTransaction transaction)
+        {
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IState.cs

+using System;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public interface IState
+    {
+        TimeSpan? ExpiresAfter { get; }
+
+        string Name { get; }
+
+        void Apply(CapSentMessage message, IStorageTransaction transaction);
+
+        void Apply(CapReceivedMessage message, IStorageTransaction transaction);
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IStateChanger.Default.cs

+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public class StateChanger : IStateChanger
+    {
+        public void ChangeState(CapSentMessage message, IState state, IStorageTransaction transaction)
+        {
+            //var now = DateTime.UtcNow;
+            //if (state.ExpiresAfter != null)
+            //{
+            //    message.ExpiresAt = now.Add(state.ExpiresAfter.Value);
+            //}
+            //else
+            //{
+            //    message.ExpiresAt = null;
+            //}
+
+            message.StatusName = state.Name;
+            state.Apply(message, transaction);
+            transaction.UpdateMessage(message);
+        }
+
+        public void ChangeState(CapReceivedMessage message, IState state, IStorageTransaction transaction)
+        {
+            //var now = DateTime.UtcNow;
+            //if (state.ExpiresAfter != null)
+            //{
+            //    job.ExpiresAt = now.Add(state.ExpiresAfter.Value);
+            //}
+            //else
+            //{
+            //    job.ExpiresAt = null;
+            //}
+
+            message.StatusName = state.Name;
+            state.Apply(message, transaction);
+            transaction.UpdateMessage(message);
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IStateChanger.Extensions.cs

+using System.Threading.Tasks;
+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public static class StateChangerExtensions
+    {
+        public static async Task ChangeStateAsync(
+            this IStateChanger @this, CapSentMessage message, IState state, IStorageConnection connection)
+        {
+            using (var transaction = connection.CreateTransaction())
+            {
+                @this.ChangeState(message, state, transaction);
+                await transaction.CommitAsync();
+            }
+        }
+
+        public static async Task ChangeStateAsync(
+            this IStateChanger @this, CapReceivedMessage message, IState state, IStorageConnection connection)
+        {
+            using (var transaction = connection.CreateTransaction())
+            {
+                @this.ChangeState(message, state, transaction);
+                await transaction.CommitAsync();
+            }
+        }
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/Job/States/IStateChanger.cs

+using DotNetCore.CAP.Models;
+
+namespace DotNetCore.CAP.Job.States
+{
+    public interface IStateChanger
+    {
+        void ChangeState(CapSentMessage message, IState state, IStorageTransaction transaction);
+
+        void ChangeState(CapReceivedMessage message, IState state, IStorageTransaction transaction);
+    }
+}
\ No newline at end of file

src/DotNetCore.CAP/OperateResult.cs

-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace DotNetCore.CAP
@@ -18,6 +19,8 @@ namespace DotNetCore.CAP
         /// </summary>
         public bool Succeeded { get; set; }
 
+        public Exception Exception { get; set; }
+
         /// <summary>
         /// An <see cref="IEnumerable{T}"/> of <see cref="OperateError"/>s containing an errors
         /// that occurred during the operation.
@@ -46,6 +49,17 @@ namespace DotNetCore.CAP
             return result;
         }
 
+        public static OperateResult Failed(Exception ex, params OperateError[] errors)
+        {
+            var result = new OperateResult { Succeeded = false };
+            result.Exception = ex;
+            if (errors != null)
+            {
+                result._errors.AddRange(errors);
+            }
+            return result;
+        }
+
         /// <summary>
         /// Converts the value of the current <see cref="OperateResult"/> object to its equivalent string representation.
         /// </summary>