Multiple enhancements

Author: CSharpBender

License.txt

@@ -0,0 +1,7 @@
+Copyright 2021 CSharpBender
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

NHUnitExample/Controllers/TestController.cs

@@ -195,6 +195,12 @@ public async Task<IActionResult> TestProjections(CancellationToken token)
         [HttpGet("/testMultipleQueries")]
         public async Task<IActionResult> TestMultipleQueries(CancellationToken token)
         {
+            //notify framework we want the total number of products
+            var redProductsCountPromise = _dbContext.WrapQuery(
+                                            _dbContext.Products.All().Where(p => p.Colors.Any(c => c.Name == "Red")))
+                                                   .Count()
+                                                   .Deferred();
+
             // notify framework we need top 10 expensive products - no execution
             var expensiveProductsPromise = _dbContext.WrapQuery(
                     _dbContext.Products.All().OrderByDescending(p => p.Price).Take(10))
@@ -228,11 +234,13 @@ public async Task<IActionResult> TestMultipleQueries(CancellationToken token)
             // List/ListAsync shouldn't hit the Database unless it doesn't support futures. Ex: Oracle
             var expensiveProducts = await expensiveProductsPromise.ListAsync(token);
             var lastActiveCustomer = await lastActiveCustomerPromise.ValueAsync(token);
+            var numberOfRedProducts = await redProductsCountPromise.ValueAsync(token);
             return Ok(new
             {
-                LastActiveCustomer = lastActiveCustomer,
-                CustomersWithEmptyCart = customersWithEmptyCart,
+                NumberOfRedProducts = numberOfRedProducts,
                 Top10ExpensiveProducts = expensiveProducts,
+                LastActiveCustomer = lastActiveCustomer,
+                CustomersWithEmptyCart = customersWithEmptyCart
             });
         }
 

NHUnitExample/Entities/Country.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Security.Cryptography;
-using NHibernate.Mapping;
 
 namespace NHUnitExample.Entities
 {

NHUnitExample/Entities/CustomerPhone.cs

@@ -6,9 +6,7 @@ public CustomerPhone() { }
 
         public virtual int Id { get; set; }
         public virtual string PhoneNumber { get; set; }
-        //public virtual int CustomerId { get; set; }
         public virtual Customer Customer { get; set; }
-        //public virtual int PhoneNumberTypeId { get; set; }
         public virtual PhoneNumberType PhoneNumberType { get; set; }
     }
 }

README.md

@@ -3,7 +3,7 @@ NHUnit is a simple but powerful Unit of Work and Repository pattern implementati
 If at some point you decide to change the ORM, you just need to provide your own implementation for just two interfaces instead of rewriting the whole application.
 NHUnit provides sync and async versions for each method.
 
-##License
+## License
 MIT: Enjoy, share, contribute to the project.
 
 
@@ -64,6 +64,30 @@ var customer = await _dbContext.Customers
                     .ValueAsync(token); //this is where the query(s) get executed
 ```
 
+An unproxied object will contain the foreign key ids (One to One and Many to One relations).
+For example in the above query the Cart property will be instantiated and popuplated with the Id field.
+
+
+## Multi Queries
+Using `Deferred()` you can execute multiple queries in a single server trip.
+Bellow is an example with 3 different queries that get executed in one server trip.
+
+```csharp
+//product count future
+var prodCountP = _dbContext.WrapQuery(_dbContext.Products.All())
+                           .Count().Deferred();
+
+//most expensive 10 products future
+var expProdsP = _dbContext.WrapQuery(_dbContext.Products.All().OrderByDescending(p => p.Price).Take(10))
+                          .Deferred();
+
+//get customer by id - executes all queries
+var customer = await _dbContext.Customers.Get(customerId).Deferred().ValueAsync();
+var prodCount = await prodCountP.ValueAsync(); //returns value
+var expProds = await expProdsP.ListAsync(); //returns value
+```
+
+
 ## Transactions
 IUnitOfWork exposes:
 - BeginTransaction

src/NHUnit/Helper/NhibernateHelper.cs renamed to src/NHUnit/Helper/NHUnitHelper.cs

@@ -17,10 +17,11 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 
 namespace NHUnit
 {
-    internal static class NhibernateHelper
+    internal static class NHUnitHelper
     {
         public static List<T> Unproxy<T>(List<T> entityList, ISession session)
         {
@@ -48,7 +49,11 @@ private static T Unproxy<T>(T entity, ISession session, HashSet<object> resolved
             {
                 if (!NHibernateUtil.IsInitialized(entity))
                 {
-                    return default(T);
+                    var id = session.GetIdentifier(entity);
+                    var et = NHibernateProxyHelper.GetClassWithoutInitializingProxy(entity);
+                    entity = (T)Activator.CreateInstance(et);
+                    session.SessionFactory.GetClassMetadata(et).SetIdentifier(entity,id);
+                    return entity;
                 }
                 resolvedEntity = (T)session.GetSessionImplementation().PersistenceContext.Unproxy(entity);
             }
@@ -61,8 +66,8 @@ private static T Unproxy<T>(T entity, ISession session, HashSet<object> resolved
                 return resolvedEntity;
 
             resolvedEntities.Add(resolvedEntity);
-
             Type entityType = resolvedEntity.GetType();
+
             var entityMetadata = session.SessionFactory.GetClassMetadata(entityType);
             if (entityMetadata == null)
             {
@@ -75,6 +80,15 @@ private static T Unproxy<T>(T entity, ISession session, HashSet<object> resolved
                     }
                     return entity;
                 }
+                else if (IsList(entityType))
+                {
+                    var entityCollection = (IList)resolvedEntity;
+                    for (int i = 0; i < entityCollection.Count; i++)
+                    {
+                        entityCollection[i] = Unproxy(entityCollection[i], session, resolvedEntities);
+                    }
+                    return resolvedEntity;
+                }
                 else
                 {
                     return default(T);
@@ -152,6 +166,18 @@ public static void VisitNodes(object obj, ISession session, EntityNodeInfo inclu
             }
         }
 
+        private static bool IsList(Type t)
+        {
+            if (t.IsGenericType)
+            {
+                return t.GetInterfaces().Any(x =>
+                    x.IsGenericType &&
+                    x.GetGenericTypeDefinition() == typeof(IList<>));
+            }
+
+            return typeof(IList).IsAssignableFrom(t);
+        }
+
         public static EntityNodeInfo GetExpressionTreeInfo<T>(Expression<Func<T, object>>[] includeChildNodes, EntityNodeInfo rootNode, bool includeParent = false)
         {
             foreach (var includeChildExpression in includeChildNodes)

src/NHUnit/Interfaces/ICountWrapper.cs

@@ -0,0 +1,30 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace NHUnit
+{
+    public interface ICountWrapper<T>
+    {
+        /// <summary>
+        /// Notifies framework that multi queries should be used to fetch data, using a single server roundtrip.
+        /// This is just a configuration, the query is not executed until the Value is retrieved, which will execute the other deferred queries as well.
+        /// </summary>
+        /// <returns></returns>
+        ICountWrapper<T> Deferred();
+
+        /// <summary>
+        /// Executes Query and returns the number of rows
+        /// If Deferred execution was used, the query will be evaluated only once for the whole batch.
+        /// </summary>
+        /// <returns></returns>
+        int Value();
+
+        /// <summary>
+        /// Executes Query asynchronously and returns the number of rows
+        /// If Deferred execution was used, the query will be evaluated only once for the whole batch.
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task<int> ValueAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+}

src/NHUnit/Interfaces/IEntityListWrapper.cs

@@ -23,6 +23,13 @@ public interface IEntityListWrapper<T>
         /// <returns></returns>
         IEntityListWrapper<T> Unproxy();
 
+        /// <summary>
+        /// Instruct the framework to compute the number of results
+        /// This is just a configuration, the query is not executed until the Value is retrieved, which will execute the other deferred queries as well.
+        /// </summary>
+        /// <returns></returns>
+        ICountWrapper<T> Count();
+
         /// <summary>
         /// Notifies framework that multi queries should be used to fetch data, using a single server roundtrip.
         /// This is just a configuration, the query is not executed until the Value is retrieved, which will execute the other deferred queries as well.

src/NHUnit/NHUnit.csproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.1" />
     <PackageReference Include="NHibernate" Version="5.3.5" />
   </ItemGroup>
 
@@ -25,14 +24,18 @@
     <AssemblyName>NHUnit</AssemblyName>
     <Description>A powerful Unit of Work implementation for NHibernate which fixes proxy issues and simplifies child nodes loading.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>Release of NHibernate Unit of Work</PackageReleaseNotes>
+    <PackageReleaseNotes>NHUnit
+- populate unproxied objects with FK object Id
+- Count() functionality without loading the data
+- Unproxy() bug fix</PackageReleaseNotes>
     <PackageTags>Fluent, NHibernate, Unit of Work, ORM, DataBase, Core, Async</PackageTags>
     <RepositoryType>GitHub</RepositoryType>
     <RepositoryUrl>https://github.com/CSharpBender/NHUnit</RepositoryUrl>
     <PackageProjectUrl>https://github.com/CSharpBender/NHUnit</PackageProjectUrl>
     <PackageIcon>NHUnit.png</PackageIcon>
     <Copyright>CSharpBender</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Version>1.1.0</Version>
   </PropertyGroup>
 
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">

src/NHUnit/Repository.cs

@@ -34,12 +34,7 @@ public Repository(IUnitOfWork unitOfWork)
 
         public ISingleEntityWrapper<T> Get(object id)
         {
-            return new SingleEntityWrapper<T>()
-            {
-                Id = id,
-                Session = Session,
-                TimeoutInSeconds = _unitOfWork.CommandTimeout
-            };
+            return new SingleEntityWrapper<T>(id, Session, _unitOfWork.CommandTimeout);
         }
 
         public IQueryable<T> All()