Merge pull request #1909 from HicServices/bugfix/RDMP-288

RDMP-228 Reorder YAML Data Load
HicServices · Jul 29, 2024 · a9e022b · a9e022b
2 parents 084a9ce + cdbcd6d
commit a9e022b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix issue with whitespace confusing encryption key paths
 - Add ability to add description to new cohort versions
 - Add functionality to revert to historical cohort version
+- Fix issue with YAML mode object load ordering
 
 ## [8.2.1] - 2024-07-18
 

diff --git a/Rdmp.Core/Repositories/YamlRepository.cs b/Rdmp.Core/Repositories/YamlRepository.cs
@@ -47,9 +47,7 @@ public YamlRepository(DirectoryInfo dir)
 
         // Build the serializer
         _serializer = CreateSerializer(GetCompatibleTypes());
-
-        LoadObjects();
-
+
         if (File.Exists(GetEncryptionKeyPathFile()))
         {
             EncryptionKeyPath = File.ReadLines(GetEncryptionKeyPathFile()).First();
@@ -60,6 +58,8 @@ public YamlRepository(DirectoryInfo dir)
                 if (File.Exists(trimmed)) EncryptionKeyPath = trimmed;
             }
         }
+
+        LoadObjects();      
 
         // Don't create new objects with the ID of existing objects
         NextObjectId = Objects.IsEmpty ? 0 : Objects.Max(o => o.Key.ID);