Use generic type for storage IDs in repos

Author: ethanhann

IntegrationEngine.Core/Storage/DatabaseRepository.cs

@@ -29,7 +29,7 @@ public IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasLongId
             return db.Set<TItem>().ToList<TItem>();
         }
 
-        public TItem SelectById<TItem>(object id) where TItem : class, IHasLongId
+        public TItem SelectById<TItem>(long id) where TItem : class, IHasLongId
         {
             return db.Set<TItem>().Find(id);
 
@@ -47,7 +47,7 @@ public TItem Update<TItem>(TItem item) where TItem : class, IHasLongId
             return db.Entry(item).Entity;
         }
 
-        public void Delete<TItem>(object id) where TItem : class
+        public void Delete<TItem>(long id) where TItem : class
         {
             TItem existing = db.Set<TItem>().Find(id);
             db.Set<TItem>().Remove(existing);
@@ -58,7 +58,7 @@ public void Save()
             db.SaveChanges();
         }
 
-        public bool Exists<TItem>(object id) where TItem : class
+        public bool Exists<TItem>(long id) where TItem : class
         {
             return db.Set<TItem>().Find(id) != null;
         }

IntegrationEngine.Core/Storage/ElasticsearchRepository.cs

@@ -71,7 +71,7 @@ public IEnumerable<TItem> Search<TItem, TKey>(string query,
             return documents.AsEnumerable();
         }
 
-        public TItem SelectById<TItem>(object id) where TItem : class, IHasStringId
+        public TItem SelectById<TItem>(string id) where TItem : class, IHasStringId
         {
             var response = ElasticClient.Get<TItem>(x => x.Id(id.ToString()));
             if (response.Source == null)
@@ -95,15 +95,15 @@ public TItem Update<TItem>(TItem item) where TItem : class, IHasStringId
             );
             return SelectById<TItem>(updateResponse.Id);
         }
-            
-        public void Delete<TItem>(object id) where TItem : class
+
+        public void Delete<TItem>(string id) where TItem : class
         {
             ElasticClient.Delete<TItem>(x => x.Id(id.ToString()));
         }
 
-        public bool Exists<TItem>(object id) where TItem : class
+        public bool Exists<TItem>(string id) where TItem : class
         {
-            return ElasticClient.DocumentExists<TItem>(x => x.Id(id.ToString())).Exists;
+            return ElasticClient.DocumentExists<TItem>(x => x.Id(id)).Exists;
         }
 
         public bool IsServerAvailable()

IntegrationEngine.Core/Storage/IDatabaseRepository.cs

@@ -4,7 +4,7 @@
 
 namespace IntegrationEngine.Core.Storage
 {
-    public interface IDatabaseRepository : IRepository<IHasLongId>, IDisposable
+    public interface IDatabaseRepository : IRepository<IHasLongId, long>, IDisposable
     {
         void Save();
         void SetState<TItem>(TItem item, EntityState entityState) where TItem : class;

IntegrationEngine.Core/Storage/IElasticsearchRepository.cs

@@ -6,7 +6,7 @@
 
 namespace IntegrationEngine.Core.Storage
 {
-    public interface IElasticsearchRepository : IRepository<IHasStringId>
+    public interface IElasticsearchRepository : IRepository<IHasStringId, string>
     {
         IEnumerable<TItem> SelectAll<TItem, TKey>(Expression<Func<TItem, TKey>> orderBy, bool ascending = true, int pageIndex = 0, int rowCount = 10) where TItem : class, IHasStringId;
         IEnumerable<TItem> Search<TItem, TKey>(string query, Expression<Func<TItem, TKey>> orderBy, bool ascending = true, int pageIndex = 0, int rowCount = 10) where TItem : class, IHasStringId;

IntegrationEngine.Core/Storage/IRepository.cs

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