Merge pull request #17 from codepb/develop

Merging returning readonlycollection

Author: codepb

README.md

@@ -1,2 +1,2 @@
 # DDDToolkit
-preview: ![preview build status](https://ninthlight.visualstudio.com/_apis/public/build/definitions/2a0b2dd5-5fb3-41e4-a3bb-09ae80277b94/6/badge)
+[<img src="https://ninthlight.visualstudio.com/_apis/public/build/definitions/2a0b2dd5-5fb3-41e4-a3bb-09ae80277b94/6/badge"/>](https://ninthlight.visualstudio.com/2a0b2dd5-5fb3-41e4-a3bb-09ae80277b94/_build/index?definitionId=6)

src/DDDToolkit.Repository.Sql/ReadableRepository.cs

@@ -23,7 +23,7 @@ public ReadableRepository(TContext dbContext) : base(dbContext) { }
         protected virtual IQueryable<T> ApplyIncludes(IQueryable<T> query) => query.IncludeEverything();
         protected virtual IQueryable<T> Queryable => ApplyIncludes(Set.AsNoTracking());
 
-        public Task<IReadOnlyCollection<T>> GetAll() => Set.ToListAsync().ConvertTask().To<IReadOnlyCollection<T>>();
+        public Task<IReadOnlyCollection<T>> GetAll() => Set.ToListAsync().ToReadOnlyCollection();
 
         public Task<T> GetById(TId id)
         {
@@ -38,7 +38,7 @@ public Task<T> GetById(TId id)
 
         public Task<IReadOnlyCollection<T>> Query(Expression<Func<T, bool>> query)
         {
-            return Set.Where(query).ToListAsync().ConvertTask().To<IReadOnlyCollection<T>>();
+            return Set.Where(query).ToListAsync().ToReadOnlyCollection();
         }
     }
 }

src/DDDToolkit.Utilities/Extensions/TaskExtensions.cs

@@ -6,6 +6,9 @@ namespace DDDToolkit.Utilities.Extensions
 {
     public static class TaskExtensions
     {
+        public static Task<IReadOnlyCollection<T>> ToReadOnlyCollection<T>(this Task<List<T>> task)
+            => task.ContinueWith(t => t.Result.AsReadOnly()).ConvertTask().ToTaskOf<IReadOnlyCollection<T>>();
+
         public static TaskConverter<T> ConvertTask<T>(this Task<T> task)
         {
             return new TaskConverter<T>(task);
@@ -20,7 +23,7 @@ public TaskConverter(Task<T> task)
                 _task = task;
             }
 
-            public Task<TResult> To<TResult>()
+            public Task<TResult> ToTaskOf<TResult>()
                 where TResult : class
             {
                 if (!typeof(TResult).IsAssignableFrom(typeof(T)))
@@ -29,6 +32,10 @@ public Task<TResult> To<TResult>()
                 }
                 return _task.ContinueWith(t => t.Result as TResult);
             }
+
+            public Task<TResult> To<TResult>()
+                where TResult : class
+                => ToTaskOf<TResult>();
         }
 
     }