From 66e9f901874a0a07a44fda81bafd43f9c2f6b226 Mon Sep 17 00:00:00 2001
From: Menno van Lavieren <menno.van.lavieren@uname-it.nl>
Date: Thu, 27 Jul 2017 15:55:37 +0200
Subject: [PATCH] IFlowRepository aangepast. abstracter en simpeler

---
 Tapeti.Flow.SQL/ConfigExtensions.cs           |  2 +-
 .../SqlConnectionFlowRepository.cs            | 67 +++++--------------
 Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj        |  7 ++
 Tapeti.Flow.SQL/packages.config               |  4 ++
 Tapeti.Flow/Default/FlowStore.cs              | 15 ++---
 .../Default/NonPersistentFlowRepository.cs    | 10 +--
 Tapeti.Flow/FlowMiddleware.cs                 |  2 +-
 Tapeti.Flow/IFlowRepository.cs                |  8 +--
 8 files changed, 47 insertions(+), 68 deletions(-)
 create mode 100644 Tapeti.Flow.SQL/packages.config

diff --git a/Tapeti.Flow.SQL/ConfigExtensions.cs b/Tapeti.Flow.SQL/ConfigExtensions.cs
index c5e660d..70b1aff 100644
--- a/Tapeti.Flow.SQL/ConfigExtensions.cs
+++ b/Tapeti.Flow.SQL/ConfigExtensions.cs
@@ -30,7 +30,7 @@ namespace Tapeti.Flow.SQL
 
         public void RegisterDefaults(IDependencyContainer container)
         {
-            container.RegisterDefault<IFlowRepository>(() => new SqlConnectionFlowRepository(connectionString, serviceId, schema));
+            container.RegisterDefault<IFlowRepository<Default.FlowState>>(() => new SqlConnectionFlowRepository<Default.FlowState>(connectionString, serviceId, schema));
         }
 
 
diff --git a/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs b/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs
index 15c351a..35e9078 100644
--- a/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs
+++ b/Tapeti.Flow.SQL/SqlConnectionFlowRepository.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Tapeti.Flow.SQL
 {
@@ -11,30 +13,18 @@ namespace Tapeti.Flow.SQL
         Assumes the following table layout (schema configurable):
          
      
-        create table dbo.Flow
+        create table shared.Flow
         (
 	        FlowID uniqueidentifier not null,
 	        ServiceID int not null,
 	        CreationTime datetime2(3) not null,
-	        Metadata nvarchar(max) null,
 	        Flowdata nvarchar(max) null,
 
 	        constraint PK_Flow primary key clustered (FlowID)
         );
-	
-        create table dbo.FlowContinuation
-        (
-	        FlowID uniqueidentifier not null,
-	        ContinuationID uniqueidentifier not null,
-	        Metadata nvarchar(max) null,
-
-	        constraint PK_FlowContinuation primary key clustered (FlowID, ContinuationID)
-        );
         go;
-
-        alter table shared.FlowContinuation with check add constraint FK_FlowContinuation_Flow foreign key (FlowID) references shared.Flow (FlowID);
     */
-    public class SqlConnectionFlowRepository : IFlowRepository
+    public class SqlConnectionFlowRepository<T> : IFlowRepository<T>
     {
         private readonly string connectionString;
         private readonly int serviceId;
@@ -49,65 +39,44 @@ namespace Tapeti.Flow.SQL
         }
 
 
-        public async Task<IQueryable<FlowStateRecord>> GetStates()
+        public async Task<List<KeyValuePair<Guid, T>>> GetStates()
         {
-            var result = new List<FlowStateRecord>();
-
             using (var connection = await GetConnection())
             {
-                var flowQuery = new SqlCommand($"select FlowID, Metadata, Flowdata from {schema}.Flow " +
+                var flowQuery = new SqlCommand($"select FlowID, StateJson from {schema}.Flow " +
                                                 "where ServiceID = @ServiceID " +
                                                 "order by FlowID", connection);
                 var flowServiceParam = flowQuery.Parameters.Add("@ServiceID", SqlDbType.Int);
 
-                var continuationQuery = new SqlCommand($"select FlowID, ContinuationID, Metadata from {schema}.FlowContinuation " +
-                                                        "where ServiceID = @ServiceID " +
-                                                        "order by FlowID", connection);
-                var continuationQueryParam = flowQuery.Parameters.Add("@ServiceID", SqlDbType.Int);
-
-
                 flowServiceParam.Value = serviceId;
-                continuationQueryParam.Value = serviceId;
 
 
                 var flowReader = await flowQuery.ExecuteReaderAsync();
-                var continuationReader = await continuationQuery.ExecuteReaderAsync();
-                var hasContinuation = await continuationReader.ReadAsync();
+
+                var result = new List<KeyValuePair<Guid, T>>();
 
                 while (await flowReader.ReadAsync())
                 {
-                    var flowStateRecord = new FlowStateRecord
-                    {
-                        FlowID = flowReader.GetGuid(0),
-                        Metadata = flowReader.GetString(1),
-                        Data = flowReader.GetString(2),
-                        ContinuationMetadata = new Dictionary<Guid, string>()
-                    };
+                    var flowID = flowReader.GetGuid(0);
+                    var stateJson = flowReader.GetString(1);
 
-                    while (hasContinuation && continuationReader.GetGuid(0) == flowStateRecord.FlowID)
-                    {
-                        flowStateRecord.ContinuationMetadata.Add(
-                            continuationReader.GetGuid(1),
-                            continuationReader.GetString(2)
-                        );
-
-                        hasContinuation = await continuationReader.ReadAsync();
-                    }
-
-                    result.Add(flowStateRecord);
+                    var state = JsonConvert.DeserializeObject<T>(stateJson);
+                    result.Add(new KeyValuePair<Guid, T>(flowID, state));
                 }
+
+                return result;
             }
 
-            return result.AsQueryable();
         }
 
-
-        public Task CreateState(FlowStateRecord stateRecord, DateTime timestamp)
+        public Task CreateState(Guid flowID, T state, DateTime timestamp)
         {
+            var stateJason = JsonConvert.SerializeObject(state);
+
             throw new NotImplementedException();
         }
 
-        public Task UpdateState(FlowStateRecord stateRecord)
+        public Task UpdateState(Guid flowID, T state)
         {
             throw new NotImplementedException();
         }
diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
index 8674a4d..8d54f56 100644
--- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
+++ b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
@@ -33,6 +33,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -57,6 +61,9 @@
       <Name>Tapeti</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Tapeti.Flow.SQL/packages.config b/Tapeti.Flow.SQL/packages.config
new file mode 100644
index 0000000..e4ac9c6
--- /dev/null
+++ b/Tapeti.Flow.SQL/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Tapeti.Flow/Default/FlowStore.cs b/Tapeti.Flow/Default/FlowStore.cs
index eee3a18..8bb1061 100644
--- a/Tapeti.Flow/Default/FlowStore.cs
+++ b/Tapeti.Flow/Default/FlowStore.cs
@@ -13,10 +13,10 @@ namespace Tapeti.Flow.Default
         private static readonly ConcurrentDictionary<Guid, FlowState> FlowStates = new ConcurrentDictionary<Guid, FlowState>();
         private static readonly ConcurrentDictionary<Guid, Guid> ContinuationLookup = new ConcurrentDictionary<Guid, Guid>();
 
-        private readonly IFlowRepository repository;
+        private readonly IFlowRepository<FlowState> repository;
 
 
-        public FlowStore(IFlowRepository repository) 
+        public FlowStore(IFlowRepository<FlowState> repository) 
         {
             this.repository = repository;
         }
@@ -29,11 +29,10 @@ namespace Tapeti.Flow.Default
 
             foreach (var flowStateRecord in await repository.GetStates())
             {
-                var flowState = ToFlowState(flowStateRecord);
-                FlowStates.GetOrAdd(flowStateRecord.FlowID, flowState);
+                FlowStates.TryAdd(flowStateRecord.Key, flowStateRecord.Value);
 
-                foreach (var continuation in flowStateRecord.ContinuationMetadata)
-                    ContinuationLookup.GetOrAdd(continuation.Key, flowStateRecord.FlowID);
+                foreach (var continuation in flowStateRecord.Value.Continuations)
+                    ContinuationLookup.GetOrAdd(continuation.Key, flowStateRecord.Key);
             }
         }
 
@@ -139,11 +138,11 @@ namespace Tapeti.Flow.Default
                 {
                     isNew = false;
                     var now = DateTime.UtcNow;
-                    await owner.repository.CreateState(ToFlowStateRecord(flowID, flowState), now);
+                    await owner.repository.CreateState(flowID, flowState, now);
                 }
                 else
                 {
-                    await owner.repository.UpdateState(ToFlowStateRecord(flowID, flowState));
+                    await owner.repository.UpdateState(flowID, flowState);
                 }
             }
 
diff --git a/Tapeti.Flow/Default/NonPersistentFlowRepository.cs b/Tapeti.Flow/Default/NonPersistentFlowRepository.cs
index 304899a..dee4e78 100644
--- a/Tapeti.Flow/Default/NonPersistentFlowRepository.cs
+++ b/Tapeti.Flow/Default/NonPersistentFlowRepository.cs
@@ -5,19 +5,19 @@ using System.Threading.Tasks;
 
 namespace Tapeti.Flow.Default
 {
-    public class NonPersistentFlowRepository : IFlowRepository
+    public class NonPersistentFlowRepository<T> : IFlowRepository<T>
     {
-        public Task<IQueryable<FlowStateRecord>> GetStates()
+        Task<List<KeyValuePair<Guid, T>>> IFlowRepository<T>.GetStates()
         {
-            return Task.FromResult(new List<FlowStateRecord>().AsQueryable());
+            return Task.FromResult(new List<KeyValuePair<Guid, T>>());
         }
 
-        public Task CreateState(FlowStateRecord stateRecord, DateTime timestamp)
+        public Task CreateState(Guid flowID, T state, DateTime timestamp)
         {
             return Task.CompletedTask;
         }
 
-        public Task UpdateState(FlowStateRecord stateRecord)
+        public Task UpdateState(Guid flowID, T state)
         {
             return Task.CompletedTask;
         }
diff --git a/Tapeti.Flow/FlowMiddleware.cs b/Tapeti.Flow/FlowMiddleware.cs
index 2c1dcc6..739d0b8 100644
--- a/Tapeti.Flow/FlowMiddleware.cs
+++ b/Tapeti.Flow/FlowMiddleware.cs
@@ -11,7 +11,7 @@ namespace Tapeti.Flow
             container.RegisterDefault<IFlowProvider, FlowProvider>();
             container.RegisterDefault<IFlowStarter, FlowStarter>();
             container.RegisterDefault<IFlowHandler, FlowProvider>();
-            container.RegisterDefault<IFlowRepository, NonPersistentFlowRepository>();
+            container.RegisterDefault<IFlowRepository<FlowState>, NonPersistentFlowRepository<FlowState>>();
             container.RegisterDefault<IFlowStore, FlowStore>();
         }
 
diff --git a/Tapeti.Flow/IFlowRepository.cs b/Tapeti.Flow/IFlowRepository.cs
index 476623a..ce026d9 100644
--- a/Tapeti.Flow/IFlowRepository.cs
+++ b/Tapeti.Flow/IFlowRepository.cs
@@ -5,11 +5,11 @@ using System.Threading.Tasks;
 
 namespace Tapeti.Flow
 {
-    public interface IFlowRepository
+    public interface IFlowRepository<T>
     {
-        Task<IQueryable<FlowStateRecord>> GetStates();
-        Task CreateState(FlowStateRecord stateRecord, DateTime timestamp);
-        Task UpdateState(FlowStateRecord stateRecord);
+        Task<List<KeyValuePair<Guid, T>>> GetStates();
+        Task CreateState(Guid flowID, T state, DateTime timestamp);
+        Task UpdateState(Guid flowID, T state);
         Task DeleteState(Guid flowID);
     }