Lots of clean-up. Added support for synchronizing workitem ordinal to…

… get correct order
jorn-ola-birkeland-zz · Nov 11, 2009 · 6f95fb5 · 6f95fb5
1 parent 7ede38d
commit 6f95fb5
Show file tree

Hide file tree

Showing 37 changed files with 1,314 additions and 1,099 deletions.
diff --git a/Example/simple.css b/Example/simple.css
@@ -135,6 +135,7 @@ h1
 	border-left:solid 1px black;
 }
 
+
 .tasks h1
 {
 	left:0px;

diff --git a/WhiskWork.Core/AdvancedWorkflowRepository.cs b/WhiskWork.Core/AdvancedWorkflowRepository.cs
diff --git a/WhiskWork.Core/IWorkflow.cs b/WhiskWork.Core/IWorkflow.cs
@@ -0,0 +1,15 @@
+using System.Collections.Specialized;
+
+namespace WhiskWork.Core
+{
+    public interface IWorkflow
+    {
+        bool ExistsWorkItem(string workItemId);
+        bool ExistsWorkStep(string path);
+        void UpdateWorkItem(WorkItem workItem);
+        void CreateWorkStep(WorkStep workStep);
+        void CreateWorkItem(WorkItem workItem);
+        WorkItem GetWorkItem(string workItemId);
+        void DeleteWorkItem(string workItemId);
+    }
+}
diff --git a/WhiskWork.Core/Synchronization/CachingSynchronizationAgent.cs b/WhiskWork.Core/Synchronization/CachingSynchronizationAgent.cs
@@ -48,9 +48,9 @@ public void UpdateStatus(SynchronizationEntry entry)
             _getAllCache[index] = entry;
         }
 
-        public void UpdateProperties(SynchronizationEntry entry)
+        public void UpdateData(SynchronizationEntry entry)
         {
-            _innerAgent.UpdateProperties(entry);
+            _innerAgent.UpdateData(entry);
             var index = IndexOf(entry.Id);
             _getAllCache[index] = entry;
         }

diff --git a/WhiskWork.Core/Synchronization/CreationSynchronizer.cs b/WhiskWork.Core/Synchronization/CreationSynchronizer.cs
@@ -53,7 +53,8 @@ private bool TryGetSlaveEntry(SynchronizationEntry masterEntry, out Synchronizat
 
             var slaveStatus = _map.GetMappedValue(_master, masterEntry.Status);
 
-            slaveEntry = new SynchronizationEntry(masterEntry.Id, slaveStatus, masterEntry.Properties);
+            slaveEntry = new SynchronizationEntry(masterEntry.Id, slaveStatus, masterEntry.Properties)
+                             {Ordinal = masterEntry.Ordinal};
 
             return true;
         }

diff --git a/WhiskWork.Core/Synchronization/DataSynchronizer.cs b/WhiskWork.Core/Synchronization/DataSynchronizer.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+
+namespace WhiskWork.Core.Synchronization
+{
+    public class DataSynchronizer
+    {
+        private readonly ISynchronizationAgent _master;
+        private readonly ISynchronizationAgent _slave;
+
+        public DataSynchronizer(ISynchronizationAgent master, ISynchronizationAgent slave)
+        {
+            _master = master;
+            _slave = slave;
+        }
+
+        public void Synchronize()
+        {
+            var masterEntries = _master.GetAll().ToDictionary(e => e.Id);
+            var slaveEntries = _slave.GetAll().ToDictionary(e => e.Id);
+
+            foreach (var masterId in masterEntries.Keys)
+            {
+                if (slaveEntries.ContainsKey(masterId))
+                {
+                    var slaveEntry = slaveEntries[masterId];
+
+                    var updateEntry = new SynchronizationEntry(masterId, slaveEntry.Status,
+                                                               masterEntries[masterId].Properties)
+                                          {Ordinal = masterEntries[masterId].Ordinal};
+
+                    _slave.UpdateData(updateEntry);
+                }
+            }
+
+        }
+    }
+}
diff --git a/WhiskWork.Core/Synchronization/ISynchronizationAgent.cs b/WhiskWork.Core/Synchronization/ISynchronizationAgent.cs
@@ -9,6 +9,6 @@ public interface ISynchronizationAgent
         void Create(SynchronizationEntry entry);
         void Delete(SynchronizationEntry entry);
         void UpdateStatus(SynchronizationEntry entry);
-        void UpdateProperties(SynchronizationEntry entry);
+        void UpdateData(SynchronizationEntry entry);
     }
 }
diff --git a/WhiskWork.Core/Synchronization/StatusSynchronizer.cs b/WhiskWork.Core/Synchronization/StatusSynchronizer.cs
@@ -26,15 +26,15 @@ public void Synchronize()
                 if(slaveEntries.ContainsKey(masterId))
                 {
                     SynchronizationEntry masterMappedSlaveEntry;
-                    if(!TryToMasterEntry(slaveEntries[masterId],out masterMappedSlaveEntry))
+                    if(!TryGetMasterEntry(slaveEntries[masterId],out masterMappedSlaveEntry))
                     {
                         continue;
                     }
 
                     if (masterMappedSlaveEntry.Status != masterEntries[masterId].Status)
                     {
                         SynchronizationEntry slaveEntry;
-                        if (TryToSlaveEntry(masterEntries[masterId], out slaveEntry))
+                        if (TryGetSlaveEntry(masterEntries[masterId], out slaveEntry))
                         {
                             _slave.UpdateStatus(slaveEntry);
                         }
@@ -43,7 +43,7 @@ public void Synchronize()
             }
         }
 
-        private bool TryToSlaveEntry(SynchronizationEntry masterEntry, out SynchronizationEntry slaveEntry)
+        private bool TryGetSlaveEntry(SynchronizationEntry masterEntry, out SynchronizationEntry slaveEntry)
         {
             if (!_map.ContainsKey(_master, masterEntry.Status))
             {
@@ -58,7 +58,7 @@ private bool TryToSlaveEntry(SynchronizationEntry masterEntry, out Synchronizati
             return true;
         }
 
-        private bool TryToMasterEntry(SynchronizationEntry slaveEntry, out SynchronizationEntry masterEntry)
+        private bool TryGetMasterEntry(SynchronizationEntry slaveEntry, out SynchronizationEntry masterEntry)
         {
             if(!_map.ContainsKey(_slave, slaveEntry.Status))
             {
@@ -73,37 +73,4 @@ private bool TryToMasterEntry(SynchronizationEntry slaveEntry, out Synchronizati
         }
 
     }
-
-    public class PropertySynchronizer
-    {
-        private readonly ISynchronizationAgent _master;
-        private readonly ISynchronizationAgent _slave;
-
-        public PropertySynchronizer(ISynchronizationAgent master, ISynchronizationAgent slave)
-        {
-            _master = master;
-            _slave = slave;
-        }
-
-        public void Synchronize()
-        {
-            var masterEntries = _master.GetAll().ToDictionary(e => e.Id);
-            var slaveEntries = _slave.GetAll().ToDictionary(e => e.Id);
-
-            foreach (var masterId in masterEntries.Keys)
-            {
-                if (slaveEntries.ContainsKey(masterId))
-                {
-                    var slaveEntry = slaveEntries[masterId];
-
-                    var updateEntry = new SynchronizationEntry(masterId, slaveEntry.Status,
-                                                               masterEntries[masterId].Properties);
-
-                    _slave.UpdateProperties(updateEntry);
-                }
-            }
-
-        }
-   }
-
 }
diff --git a/WhiskWork.Core/Synchronization/SynchronizationEntry.cs b/WhiskWork.Core/Synchronization/SynchronizationEntry.cs
@@ -28,6 +28,11 @@ public string Status
             get { return _status; }
         }
 
+        public int? Ordinal
+        {
+            get; set;
+        }
+
         public Dictionary<string, string> Properties
         {
             get { return new Dictionary<string, string>(_properties); }
@@ -47,6 +52,7 @@ public override bool Equals(object obj)
             result &= _id == entry._id;
             result &= _status == entry._status;
             result &= _properties.SequenceEqual(entry._properties);
+            result &= Ordinal == entry.Ordinal;
 
             return result;
         }
@@ -56,6 +62,7 @@ public override int GetHashCode()
             var hc = _id != null ? _id.GetHashCode() : 1;
             hc ^= _status != null ? _status.GetHashCode() : 2;
             hc ^= _properties.Count > 0 ? _properties.Select(kv => kv.Key.GetHashCode() ^ kv.Value.GetHashCode()).Aggregate((hash, next) => hash ^ next) : 4;
+            hc ^= Ordinal.HasValue ? Ordinal.Value.GetHashCode() : 8;
 
             return hc;
         }
@@ -65,7 +72,8 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.AppendFormat("Id={0},", _id);
             sb.AppendFormat("Status={0},", _status);
-            sb.AppendFormat("Properties={0}", _properties.Count() > 0 ? _properties.Select(kv => kv.Key + ":" + kv.Value).Aggregate((current, next) => current + "&" + next) : string.Empty);
+            sb.AppendFormat("Properties={0},", _properties.Count() > 0 ? _properties.Select(kv => kv.Key + ":" + kv.Value).Aggregate((current, next) => current + "&" + next) : string.Empty);
+            sb.AppendFormat("Ordinal={0}", Ordinal.HasValue ? Ordinal.Value.ToString() : "<undefined>");
 
             return sb.ToString();
         }

diff --git a/WhiskWork.Core/WhiskWork.Core.csproj b/WhiskWork.Core/WhiskWork.Core.csproj
@@ -45,8 +45,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdvancedWorkflowRepository.cs" />
+    <Compile Include="WorkItemCreator.cs" />
+    <Compile Include="WorkItemMover.cs" />
+    <Compile Include="WorkItemRemover.cs" />
+    <Compile Include="WorkItemRepositoryExtension.cs" />
+    <Compile Include="WorkStepRepositoryExtensions.cs" />
     <Compile Include="FileWorkItemLogger.cs" />
+    <Compile Include="IWorkflow.cs" />
     <Compile Include="IWorkStepRepository.cs" />
     <Compile Include="IWorkItemLogger.cs" />
     <Compile Include="IWorkItemRepository.cs" />
@@ -58,16 +63,16 @@
     <Compile Include="Synchronization\CachingSynchronizationAgent.cs" />
     <Compile Include="Synchronization\CreationSynchronizer.cs" />
     <Compile Include="Synchronization\ISynchronizationAgent.cs" />
+    <Compile Include="Synchronization\DataSynchronizer.cs" />
     <Compile Include="Synchronization\StatusSynchronizer.cs" />
     <Compile Include="Synchronization\SynchronizationEntry.cs" />
     <Compile Include="Synchronization\StatusSynchronizationMap.cs" />
     <Compile Include="WorkItem.cs" />
     <Compile Include="WorkItemClass.cs" />
-    <Compile Include="WorkItemQuery.cs" />
     <Compile Include="WorkItemStatus.cs" />
     <Compile Include="Workflow.cs" />
+    <Compile Include="WorkItemTransition.cs" />
     <Compile Include="WorkStep.cs" />
-    <Compile Include="WorkStepQuery.cs" />
     <Compile Include="WorkStepType.cs" />
   </ItemGroup>
   <ItemGroup>