[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 <[email protected]>
Ed-Fi-Alliance-OSS · Mar 24, 2021 · 56330e0 · 56330e0
1 parent 0e37980
commit 56330e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...ties/DataLoading/EdFi.LoadTools/BulkLoadClient/Application/BulkLoadClientConfiguration.cs b/...ties/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
@@ -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
@@ -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;
             }
         }