Merge pull request #11 from johelvisguzman/dev

Merge changes for v1.2.0 release

Author: johelvisguzman

appveyor.yml

@@ -11,6 +11,7 @@ pull_requests:
 
 branches:
   only:
+  - dev
   - master
 
 # Do not build on tags (GitHub only)

src/DotNetToolkit.Repository.EntityFramework/EfRepositoryBase.cs

@@ -1,14 +1,20 @@
 namespace DotNetToolkit.Repository.EntityFramework
 {
     using FetchStrategies;
+    using Queries;
+    using Specifications;
     using System;
+    using System.Collections.Generic;
     using System.Data.Entity;
     using System.Linq;
+    using System.Linq.Expressions;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Represents a repository for entity framework.
     /// </summary>
-    public abstract class EfRepositoryBase<TEntity, TKey> : RepositoryBase<TEntity, TKey> where TEntity : class
+    public abstract class EfRepositoryBase<TEntity, TKey> : RepositoryAsyncBase<TEntity, TKey> where TEntity : class
     {
         #region Fields
 
@@ -116,9 +122,9 @@ protected override IQueryable<TEntity> GetQuery(IFetchStrategy<TEntity> fetchStr
         /// <summary>
         /// Gets an entity query with the given primary key value from the repository.
         /// </summary>
-        protected override TEntity GetQuery(TKey key, IFetchStrategy<TEntity> fetchStrategy)
+        protected override TEntity GetEntity(TKey key, IFetchStrategy<TEntity> fetchStrategy)
         {
-            return fetchStrategy == null ? DbSet.Find(key) : base.GetQuery(key, fetchStrategy);
+            return fetchStrategy == null ? DbSet.Find(key) : base.GetEntity(key, fetchStrategy);
         }
 
         /// <summary>
@@ -131,5 +137,94 @@ public override void Dispose()
         }
 
         #endregion
+
+        #region Overrides of RepositoryAsyncBase<TEntity,TKey>
+
+        /// <summary>
+        /// A protected asynchronous overridable method for saving changes made in the current unit of work in the repository.
+        /// </summary>
+        protected override Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
+        {
+            return Context.SaveChangesAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// Gets an entity query with the given primary key value from the repository.
+        /// </summary>
+        protected override Task<TEntity> GetEntityAsync(TKey key, IFetchStrategy<TEntity> fetchStrategy, CancellationToken cancellationToken = new CancellationToken())
+        {
+            var dbSet = (DbSet<TEntity>)DbSet;
+
+            return fetchStrategy == null ? dbSet.FindAsync(cancellationToken, key) : base.GetEntityAsync(key, fetchStrategy, cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for getting an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<TEntity> GetEntityAsync(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, CancellationToken cancellationToken = new CancellationToken())
+        {
+            if (criteria == null)
+                throw new ArgumentNullException(nameof(criteria));
+
+            return GetQuery(criteria, options).FirstOrDefaultAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for getting an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<TResult> GetEntityAsync<TResult>(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, Expression<Func<TEntity, TResult>> selector, CancellationToken cancellationToken = new CancellationToken())
+        {
+            if (criteria == null)
+                throw new ArgumentNullException(nameof(criteria));
+
+            return GetQuery(criteria, options).Select(selector).FirstOrDefaultAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for getting a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<List<TEntity>> GetEntitiesAsync(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, CancellationToken cancellationToken = new CancellationToken())
+        {
+            if (criteria == null)
+                throw new ArgumentNullException(nameof(criteria));
+
+            return GetQuery(criteria, options).ToListAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for getting a collection of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<List<TResult>> GetEntitiesAsync<TResult>(ISpecification<TEntity> criteria, IQueryOptions<TEntity> options, Expression<Func<TEntity, TResult>> selector, CancellationToken cancellationToken = new CancellationToken())
+        {
+            if (criteria == null)
+                throw new ArgumentNullException(nameof(criteria));
+
+            return GetQuery(criteria, options).Select(selector).ToListAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for getting a the number of entities that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<int> GetCountAsync(ISpecification<TEntity> criteria, CancellationToken cancellationToken = new CancellationToken())
+        {
+            var predicate = criteria?.Predicate;
+
+            return predicate == null ? GetQuery().CountAsync(cancellationToken) : GetQuery().CountAsync(predicate, cancellationToken);
+        }
+
+        /// <summary>
+        /// A protected asynchronous overridable method for determining whether the repository contains an entity that satisfies the criteria specified by the <paramref name="criteria" /> from the repository.
+        /// </summary>
+        protected override Task<bool> GetExistAsync(ISpecification<TEntity> criteria, CancellationToken cancellationToken = new CancellationToken())
+        {
+            if (criteria == null)
+                throw new ArgumentNullException(nameof(criteria));
+
+            var predicate = criteria?.Predicate;
+
+            return predicate == null ? GetQuery().AnyAsync(cancellationToken) : GetQuery().AnyAsync(predicate, cancellationToken);
+        }
+
+        #endregion
     }
 }

src/DotNetToolkit.Repository/IRepositoryAsync.cs

@@ -0,0 +1,23 @@
+namespace DotNetToolkit.Repository
+{
+    using System;
+    using Traits;
+
+    /// <summary>
+    /// Represents an asynchronous repository.
+    /// </summary>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    /// <typeparam name="TKey">The type of the primary key.</typeparam>
+    public interface IRepositoryAsync<TEntity, in TKey> : IRepository<TEntity, TKey>, ICanAggregateAsync<TEntity>, ICanAddAsync<TEntity>, ICanUpdateAsync<TEntity>, ICanDeleteAsync<TEntity, TKey>, ICanGetAsync<TEntity, TKey>, ICanFindAsync<TEntity>, IDisposable
+        where TEntity : class
+    {
+    }
+
+    /// <summary>
+    /// Represents an asynchronous repository with a default primary key value of type integer.
+    /// </summary>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    public interface IRepositoryAsync<TEntity> : IRepositoryAsync<TEntity, int> where TEntity : class
+    {
+    }
+}

src/DotNetToolkit.Repository/Properties/Resources.Designer.cs

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="EntityKeyNotFound" xml:space="preserve">
+    <value>No entity found in the repository with the '{0}' key.</value>
+  </data>
   <data name="EntityRequiresPrimaryKey" xml:space="preserve">
     <value>The instance of entity type '{0}' requires a primary key to be defined.</value>
   </data>