Merging 0.18.0

Etherna · Sep 12, 2019 · 6f30683 · 6f30683
2 parents 84825a1 + 8adc34b
commit 6f30683
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 29 deletions.
diff --git a/src/MongoDM/Extensions/EnumerableExtensions.cs b/src/MongoDM/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,115 @@
+using MongoDB.Driver.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Digicando.MongoDM.Extensions
+{
+    public static class EnumerableExtensions
+    {
+        /// <summary>
+        /// Order and paginate a list of elements
+        /// </summary>
+        /// <typeparam name="TSource">Source type</typeparam>
+        /// <typeparam name="TKey">Ordering key type</typeparam>
+        /// <param name="values">Source values</param>
+        /// <param name="orderKeySelector">Ordering key selector</param>
+        /// <param name="page">Page to take</param>
+        /// <param name="take">Elements per page</param>
+        /// <returns>Selected elements page</returns>
+        public static IEnumerable<TSource> Paginate<TSource, TKey>(
+            this IEnumerable<TSource> values,
+            Func<TSource, TKey> orderKeySelector,
+            int page,
+            int take)
+		{
+            if (page < 0)
+                throw new ArgumentOutOfRangeException(nameof(page));
+            if (take < 1)
+                throw new ArgumentOutOfRangeException(nameof(take));
+
+            return values.OrderBy(orderKeySelector)
+                         .Skip(page * take)
+                         .Take(take);
+        }
+
+        /// <summary>
+        /// Order and paginate a list of elements
+        /// </summary>
+        /// <typeparam name="TSource">Source type</typeparam>
+        /// <typeparam name="TKey">Ordering key type</typeparam>
+        /// <param name="values">Source values</param>
+        /// <param name="orderKeySelector">Ordering key selector</param>
+        /// <param name="page">Page to take</param>
+        /// <param name="take">Elements per page</param>
+        /// <returns>Selected elements page</returns>
+        public static IMongoQueryable<TSource> Paginate<TSource, TKey>(
+            this IMongoQueryable<TSource> values,
+            Expression<Func<TSource, TKey>> orderKeySelector,
+            int page,
+            int take)
+        {
+            if (page < 0)
+                throw new ArgumentOutOfRangeException(nameof(page));
+            if (take < 1)
+                throw new ArgumentOutOfRangeException(nameof(take));
+
+            return values.OrderBy(orderKeySelector)
+                         .Skip(page * take)
+                         .Take(take);
+        }
+
+        /// <summary>
+        /// Descending order and paginate a list of elements
+        /// </summary>
+        /// <typeparam name="TSource">Source type</typeparam>
+        /// <typeparam name="TKey">Ordering key type</typeparam>
+        /// <param name="values">Source values</param>
+        /// <param name="orderKeySelector">Ordering key selector</param>
+        /// <param name="page">Page to take</param>
+        /// <param name="take">Elements per page</param>
+        /// <returns>Selected elements page</returns>
+        public static IEnumerable<TSource> PaginateDescending<TSource, TKey>(
+            this IEnumerable<TSource> values,
+            Func<TSource, TKey> orderKeySelector,
+            int page,
+            int take)
+        {
+            if (page < 0)
+                throw new ArgumentOutOfRangeException(nameof(page));
+            if (take < 1)
+                throw new ArgumentOutOfRangeException(nameof(take));
+
+            return values.OrderByDescending(orderKeySelector)
+                         .Skip(page * take)
+                         .Take(take);
+        }
+
+        /// <summary>
+        /// Descending order and paginate a list of elements
+        /// </summary>
+        /// <typeparam name="TSource">Source type</typeparam>
+        /// <typeparam name="TKey">Ordering key type</typeparam>
+        /// <param name="values">Source values</param>
+        /// <param name="orderKeySelector">Ordering key selector</param>
+        /// <param name="page">Page to take</param>
+        /// <param name="take">Elements per page</param>
+        /// <returns>Selected elements page</returns>
+        public static IMongoQueryable<TSource> PaginateDescending<TSource, TKey>(
+            this IMongoQueryable<TSource> values,
+            Expression<Func<TSource, TKey>> orderKeySelector,
+            int page,
+            int take)
+        {
+            if (page < 0)
+                throw new ArgumentOutOfRangeException(nameof(page));
+            if (take < 1)
+                throw new ArgumentOutOfRangeException(nameof(take));
+
+            return values.OrderByDescending(orderKeySelector)
+                         .Skip(page * take)
+                         .Take(take);
+        }
+    }
+}
diff --git a/src/MongoDM/Extensions/MongoQueryableExtensions.cs b/src/MongoDM/Extensions/MongoQueryableExtensions.cs
diff --git a/src/MongoDM/MongoDM.csproj b/src/MongoDM/MongoDM.csproj
@@ -5,18 +5,18 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>Digicando.MongoDM</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.18.0-dev</Version>
+    <Version>0.18.0</Version>
     <Authors>Digicando Srl</Authors>
     <Description>ODM framework for MongoDB</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="DomainHelper" Version="0.18.0-dev" />
-    <PackageReference Include="Hangfire.Mongo" Version="0.6.2" />
+    <PackageReference Include="Hangfire.Mongo" Version="0.6.3" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
-    <PackageReference Include="MongoDB.Driver.GridFS" Version="2.8.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.9.1" />
+    <PackageReference Include="MongoDB.Driver.GridFS" Version="2.9.1" />
     <PackageReference Include="morelinq" Version="3.2.0" />
   </ItemGroup>
 

diff --git a/src/MongoDM/Repositories/CollectionRepositoryBase.cs b/src/MongoDM/Repositories/CollectionRepositoryBase.cs
@@ -158,7 +158,7 @@ protected override async Task<TModel> FindOneOnDBAsync(TKey id, CancellationToke
             var filter = Builders<TModel>.Filter.Eq(m => m.Id, id);
             var element = await Collection.Find(filter).SingleOrDefaultAsync(cancellationToken);
             if (element as TModel == default(TModel))
-                throw new KeyNotFoundException();
+                throw new KeyNotFoundException($"Can't find key {id}");
 
             return element as TModel;
         }

diff --git a/src/MongoDM/Repositories/GridFSRepositoryBase.cs b/src/MongoDM/Repositories/GridFSRepositoryBase.cs
@@ -80,7 +80,7 @@ protected override async Task<TModel> FindOneOnDBAsync(string id, CancellationTo
             var filter = Builders<GridFSFileInfo>.Filter.Eq("_id", ObjectId.Parse(id));
             var mongoFile = await GridFSBucket.Find(filter).SingleOrDefaultAsync(cancellationToken);
             if (mongoFile == null)
-                throw new KeyNotFoundException();
+                throw new KeyNotFoundException($"Can't find key {id}");
 
             var file = ProxyGenerator.CreateInstance<TModel>();
             ReflectionHelper.SetValue(file, m => m.Id, mongoFile.Id.ToString());

diff --git a/test/MongoDM.Tests/MongoDM.Tests.csproj b/test/MongoDM.Tests/MongoDM.Tests.csproj
@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.13.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>