save new subscriberEndindex after re-running aborted changelog

minor refactoring
kartverket · Jan 30, 2019 · 2a3d266 · 2a3d266
1 parent a08c7d4
commit 2a3d266
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/CORESubscriber/Changelog.cs b/CORESubscriber/Changelog.cs
@@ -53,8 +53,6 @@ internal static void Run()
             directoryInfo.GetDirectories().ToList().ForEach(ReadFiles);
 
             ReadFiles(directoryInfo);
-
-            Dataset.ResetAbortedChangelog();
         }
 
         private static void ReadFiles(DirectoryInfo directoryInfo)

diff --git a/CORESubscriber/Dataset.cs b/CORESubscriber/Dataset.cs
@@ -44,15 +44,15 @@ internal class Dataset
 
         public static string Version { get; set; }
 
-        internal static void UpdateSettings()
+        internal static void SaveFinalSettings()
         {
-            OrderedChangelogId = EmptyValue;
+            ResetAbortedChangelog();
 
-            SetSubscriberLastIndexToProviderLastIndex();
+            SetOrderedChangelogId(EmptyValue);
 
-            SetAbortedchangelogToChangelogId();
+            SetSubscriberLastIndexToProviderLastIndex();
 
-            Provider.Save();
+            ResetAbortedchangelogId();
         }
 
         private static void SetSubscriberLastIndexToProviderLastIndex()
@@ -98,6 +98,15 @@ public static string GetAbortedChangelogId()
                 .Value;
         }
 
+        public static long GetProviderLastIndex()
+        {
+            var endIndex = GetDatasetConfigFirstDescendant(XmlElements.AbortedChangelog)
+                .Attribute(XmlAttributes.EndIndex)
+                .Value;
+
+            return string.IsNullOrEmpty(endIndex) ? Convert.ToInt64(EmptyValue) : Convert.ToInt64(endIndex);
+        }
+
         public static void SetChangelogPath(string dataFolder)
         {
             GetDatasetConfigFirstDescendant(XmlElements.AbortedChangelog)
@@ -138,7 +147,7 @@ public static int GetTransaction()
                 .Attribute(XmlAttributes.Transaction).Value);
         }
 
-        private static void SetAbortedchangelogToChangelogId()
+        private static void ResetAbortedchangelogId()
         {
             GetDatasetConfigFirstDescendant(XmlElements.AbortedChangelog)
                 .SetAttributeValue(XmlAttributes.ChangelogId, EmptyValue);

diff --git a/CORESubscriber/Program.cs b/CORESubscriber/Program.cs
@@ -122,7 +122,9 @@ private static string SynchronizeDataset(XObject subscribed)
 
             Changelog.Run();
 
-            Dataset.UpdateSettings();
+            Dataset.ProviderLastIndex = Dataset.GetProviderLastIndex();
+
+            Dataset.SaveFinalSettings();
 
             return Dataset.GetDatasetIdFromElement(subscribed);
         }
@@ -144,16 +146,21 @@ private static void GetChangelog()
             {
                 Dataset.OrderedChangelogId = abortedChangelogId;
 
-                GetChangelogStatus.Run();
-
-                Changelog.Get(SoapAction.GetChangelog.Run()).Wait();
+                WaitForChangelogAndDownload();
 
                 return;
             }
 
             Changelog.DataFolder = changelogPath;
         }
 
+        private static void WaitForChangelogAndDownload()
+        {
+            GetChangelogStatus.Run();
+
+            Changelog.Get(SoapAction.GetChangelog.Run()).Wait();
+        }
+
         private static void WriteDatasetInformation()
         {
             Console.WriteLine(
@@ -166,9 +173,7 @@ private static void GetChangelogFromProvider()
 
             else OrderChangelog2.Run();
 
-            GetChangelogStatus.Run();
-
-            Changelog.Get(SoapAction.GetChangelog.Run()).Wait();
+            WaitForChangelogAndDownload();
         }
 
         private static Stopwatch StartTimer()