Allow Multiple EDfi ODS in path

Ed-Fi-Alliance-OSS · Feb 28, 2024 · 18c886e · 18c886e
1 parent 5e9b730
commit 18c886e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml
@@ -73,7 +73,7 @@ jobs:
             $ErrorActionPreference = 'Stop'
             $PSVersionTable
             . $env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1
-            Invoke-CodeGen -Engine SQLServer -RepositoryRoot $env:GITHUB_WORKSPACE/Ed-Fi-ODS/
+            Invoke-CodeGen -Engine SQLServer -RepositoryRoot $env:GITHUB_WORKSPACE
 
       - name: build
         shell: pwsh

diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs
@@ -32,6 +32,16 @@ public CodeRepositoryHelper(string codeRepositoryPath)
                 Path.DirectorySeparatorChar,
                 dirList.TakeWhile(x => !x.EqualsIgnoreCase(CodeRepositoryConventions.EdFiOdsFolderName)));
 
+            if (Directory.Exists(codeRepositoryPath))
+            {
+                bool IsEdFiOdsFolderExist = Directory.GetDirectories(codeRepositoryPath).Where(s => s.Equals(codeRepositoryPath + CodeRepositoryConventions.EdFiOdsFolderName)).Any();
+
+                if (IsEdFiOdsFolderExist)
+                {
+                    root = codeRepositoryPath;
+                }
+            }
+
             _repositoryByName.Add(CodeRepositoryConventions.Root, root);
             _repositoryByName.Add(CodeRepositoryConventions.Ods, Path.Combine(root, CodeRepositoryConventions.EdFiOdsFolderName));