Define repo ID with unbound type TId

Author: ethanhann

IntegrationEngine.Core/Storage/DatabaseRepository.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using IntegrationEngine.Model;
 
 namespace IntegrationEngine.Core.Storage
 {
@@ -21,23 +22,23 @@ public DatabaseRepository(IntegrationEngineContext db)
             this.db = db;
         }
 
-        public IEnumerable<TItem> SelectAll<TItem>() where TItem : class
+        public IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasLongId
         {
             return db.Set<TItem>().ToList<TItem>();
         }
 
-        public TItem SelectById<TItem>(object id) where TItem : class
+        public TItem SelectById<TItem>(object id) where TItem : class, IHasLongId
         {
             return db.Set<TItem>().Find(id);
 
         }
 
-        public TItem Insert<TItem>(TItem item) where TItem : class
+        public TItem Insert<TItem>(TItem item) where TItem : class, IHasLongId
         {
             return db.Set<TItem>().Add(item);
         }
 
-        public TItem Update<TItem>(TItem item) where TItem : class
+        public TItem Update<TItem>(TItem item) where TItem : class, IHasLongId
         {
             db.Set<TItem>().Attach(item);
             db.Entry(item).State = EntityState.Modified;

IntegrationEngine.Core/Storage/ElasticsearchRepository.cs

@@ -48,7 +48,7 @@ public TItem Update<TItem>(TItem item) where TItem : class, IHasStringId
             );
             return response as TItem;
         }
-
+            
         public void Delete<TItem>(object id) where TItem : class
         {
             ElasticClient.Delete<TItem>(x => x.Id(id.ToString()));

IntegrationEngine.Core/Storage/IDatabaseRepository.cs

@@ -1,9 +1,10 @@
-using System;
+using IntegrationEngine.Model;
+using System;
 using System.Data.Entity;
 
 namespace IntegrationEngine.Core.Storage
 {
-    public interface IDatabaseRepository : IRepository, IDisposable
+    public interface IDatabaseRepository : IRepository<IHasLongId>, IDisposable
     {
         void Save();
         void SetState<TItem>(TItem item, EntityState entityState) where TItem : class;

IntegrationEngine.Core/Storage/IElasticsearchRepository.cs

@@ -4,12 +4,7 @@
 
 namespace IntegrationEngine.Core.Storage
 {
-    public interface IElasticsearchRepository : IRepository
-    {
-        new IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasStringId;
-        new TItem SelectById<TItem>(object id) where TItem : class, IHasStringId;
-        new TItem Update<TItem>(TItem item) where TItem : class, IHasStringId;
-        new TItem Insert<TItem>(TItem item) where TItem : class, IHasStringId;
-    }
+    public interface IElasticsearchRepository : IRepository<IHasStringId>
+    {}
 }
 

IntegrationEngine.Core/Storage/IRepository.cs

@@ -7,12 +7,12 @@
 
 namespace IntegrationEngine.Core.Storage
 {
-    public interface IRepository
+    public interface IRepository<TId>
     {
-        IEnumerable<TItem> SelectAll<TItem>() where TItem : class;
-        TItem SelectById<TItem>(object id) where TItem : class;
-        TItem Insert<TItem>(TItem item) where TItem : class;
-        TItem Update<TItem>(TItem item) where TItem : class;
+        IEnumerable<TItem> SelectAll<TItem>() where TItem : class, TId;
+        TItem SelectById<TItem>(object id) where TItem : class, TId;
+        TItem Insert<TItem>(TItem item) where TItem : class, TId;
+        TItem Update<TItem>(TItem item) where TItem : class, TId;
         void Delete<TItem>(object id) where TItem : class;
         bool Exists<TItem>(object id) where TItem : class;
         bool IsServerAvailable();

IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj

@@ -103,6 +103,9 @@
     <Compile Include="..\IntegrationEngine.Model\IHealthStatus.cs">
       <Link>IHealthStatus.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\IHasLongId.cs">
+      <Link>IHasLongId.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

IntegrationEngine.Model/IHasLongId.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasLongId
+    {
+        long Id { get; set; }
+    }
+}
+

IntegrationEngine.Model/IntegrationEngine.Model.csproj

@@ -73,6 +73,7 @@
     <Compile Include="IHealthStatus.cs" />
     <Compile Include="TriggerPropertyExtension.cs" />
     <Compile Include="TriggerStateDescription.cs" />
+    <Compile Include="IHasLongId.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="package.nuspec">