Closes #9

Author: johelvisguzman

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>

src/DotNetToolkit.Repository/Properties/Resources.resx

@@ -2,10 +2,12 @@
 {
     using FetchStrategies;
     using Helpers;
+    using Properties;
     using Queries;
     using Specifications;
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.Linq;
     using System.Linq.Expressions;
 
@@ -166,7 +168,7 @@ protected virtual bool GetExist(ISpecification<TEntity> criteria)
         // https://github.com/SharpRepository/SharpRepository/blob/develop/SharpRepository.Repository/RepositoryBase.cs
         protected virtual ISpecification<TEntity> GetByPrimaryKeySpecification(TKey key, IFetchStrategy<TEntity> fetchStrategy = null)
         {
-            var propInfo = ConventionHelper.GetPrimaryKeyPropertyInfo(GetType());
+            var propInfo = ConventionHelper.GetPrimaryKeyPropertyInfo(typeof(TEntity));
             var parameter = Expression.Parameter(typeof(TEntity), "x");
             var lambda = Expression.Lambda<Func<TEntity, bool>>(
                     Expression.Equal(
@@ -302,7 +304,7 @@ public void Delete(TKey key)
 
             var entity = Get(key);
             if (entity == null)
-                throw new InvalidOperationException($"No entity found in the repository with the '{key}' key.");
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.EntityKeyNotFound, key));
 
             DeleteItem(entity);
             SaveChanges();

src/DotNetToolkit.Repository/RepositoryBase.cs

@@ -10,5 +10,12 @@ public class TestDbContext : DbContext
         public TestDbContext(DbConnection connection) : base(connection, true)
         {
         }
+
+        protected override void OnModelCreating(DbModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<Customer>()
+                 .HasOptional(s => s.Address)
+                 .WithRequired(ad => ad.Customer);
+        }
     }
 }

test/DotNetToolkit.Repository.Integration.Test/Data/TestDbContext.cs

@@ -4,5 +4,15 @@ public class Customer
     {
         public int Id { get; set; }
         public string Name { get; set; }
+        public CustomerAddress Address { get; set; }
+    }
+
+    public class CustomerAddress
+    {
+        public int Id { get; set; }
+        public string Street { get; set; }
+        public string City { get; set; }
+        public string State { get; set; }
+        public Customer Customer { get; set; }
     }
 }

test/DotNetToolkit.Repository.Integration.Test/Data/TestEntity.cs

@@ -2,12 +2,13 @@
 {
     using Data;
     using EntityFramework;
+    using FetchStrategies;
     using Queries;
     using Specifications;
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using FetchStrategies;
     using Xunit;
 
     public class EfRepositoryTests
@@ -912,14 +913,19 @@ public void Get()
                 int key = 1;
                 const string name = "Random Name";
 
+                var fetchStrategy = new FetchStrategy<Customer>();
+                fetchStrategy.Include(x => x.Address);
+
                 var entity = new Customer { Id = key, Name = name };
                 var repo = new EfRepository<Customer>(context);
 
                 Assert.Null(repo.Get(key));
+                Assert.Null(repo.Get(key, fetchStrategy));
 
                 repo.Add(entity);
 
                 Assert.NotNull(repo.Get(key));
+                Assert.NotNull(repo.Get(key, fetchStrategy));
             }
         }
 
@@ -931,14 +937,19 @@ public async Task Get_Async()
                 int key = 1;
                 const string name = "Random Name";
 
+                var fetchStrategy = new FetchStrategy<Customer>();
+                fetchStrategy.Include(x => x.Address);
+
                 var entity = new Customer { Id = key, Name = name };
                 var repo = new EfRepository<Customer>(context);
 
                 Assert.Null(await repo.GetAsync(key));
+                Assert.Null(await repo.GetAsync(key, fetchStrategy));
 
                 await repo.AddAsync(entity);
 
                 Assert.NotNull(await repo.GetAsync(key));
+                Assert.NotNull(await repo.GetAsync(key, fetchStrategy));
             }
         }