From 56330e0f4bb3a09c59fa3c6fe05996d68e718282 Mon Sep 17 00:00:00 2001
From: Jim McKay <jamessmckay@users.noreply.github.com>
Date: Wed, 24 Mar 2021 14:21:29 -0500
Subject: [PATCH] [ODS-4903] Load tool - year specific mode issue (#305)

* fixed the regex to support numbers in the server name

* fixed year for xml lookup

* fixed year for smoke tests

* remove trailing slash from regex

* fix regex replacement value

* update regex link

Co-authored-by: travis.meador <t.meador@wearedoubleline.com>
---
 .../BulkLoadClient/Application/BulkLoadClientConfiguration.cs | 4 +++-
 .../Application/SmokeTestsConfiguration.cs                    | 4 +++-
 .../Application/XmlLookupConfiguration.cs                     | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Utilities/DataLoading/EdFi.LoadTools/BulkLoadClient/Application/BulkLoadClientConfiguration.cs b/Utilities/DataLoading/EdFi.LoadTools/BulkLoadClient/Application/BulkLoadClientConfiguration.cs
index 2d20bd44d1..9aee5a015b 100644
--- a/Utilities/DataLoading/EdFi.LoadTools/BulkLoadClient/Application/BulkLoadClientConfiguration.cs
+++ b/Utilities/DataLoading/EdFi.LoadTools/BulkLoadClient/Application/BulkLoadClientConfiguration.cs
@@ -171,7 +171,9 @@ string ResolvedUrl(string url)
             {
                 return apiMode == ApiMode.YearSpecific
                     ? Regex.Replace(
-                        url, @"(?<year>\d{4})\b", configuration.GetValue<string>("OdsApi:SchoolYear"), RegexOptions.None)
+
+                        // https://regex101.com/r/KywmUK/1
+                        url, @"\/(?<year>\b\d{4}\b)", $"/{configuration.GetValue<string>("OdsApi:SchoolYear")}", RegexOptions.None)
                     : url;
             }
         }
diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/Application/SmokeTestsConfiguration.cs b/Utilities/DataLoading/EdFi.SmokeTest.Console/Application/SmokeTestsConfiguration.cs
index d4f1aab11c..fdcff01ad8 100644
--- a/Utilities/DataLoading/EdFi.SmokeTest.Console/Application/SmokeTestsConfiguration.cs
+++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/Application/SmokeTestsConfiguration.cs
@@ -141,7 +141,9 @@ string ResolvedUrl(string url)
             {
                 return apiMode == ApiMode.YearSpecific
                     ? Regex.Replace(
-                        url, @"(?<year>\d{4})\b", configuration.GetValue<string>("OdsApi:SchoolYear"), RegexOptions.None)
+
+                        // https://regex101.com/r/KywmUK/1
+                        url, @"\/(?<year>\b\d{4}\b)", $"/{configuration.GetValue<string>("OdsApi:SchoolYear")}", RegexOptions.None)
                     : url;
             }
         }
diff --git a/Utilities/DataLoading/EdFi.XmlLookup.Console/Application/XmlLookupConfiguration.cs b/Utilities/DataLoading/EdFi.XmlLookup.Console/Application/XmlLookupConfiguration.cs
index 261703ca41..c437667a62 100644
--- a/Utilities/DataLoading/EdFi.XmlLookup.Console/Application/XmlLookupConfiguration.cs
+++ b/Utilities/DataLoading/EdFi.XmlLookup.Console/Application/XmlLookupConfiguration.cs
@@ -163,7 +163,9 @@ string ResolvedUrl(string url)
             {
                 return apiMode == ApiMode.YearSpecific
                     ? Regex.Replace(
-                        url, @"(?<year>\d{4})\b", configuration.GetValue<string>("OdsApi:SchoolYear"), RegexOptions.None)
+
+                        // https://regex101.com/r/KywmUK/1
+                        url, @"\/(?<year>\b\d{4}\b)", $"/{configuration.GetValue<string>("OdsApi:SchoolYear")}", RegexOptions.None)
                     : url;
             }
         }