[BIA-1352] - Adds support for Data Standard 5.0

.github/workflows/build.yml

@@ -25,13 +25,15 @@ env:
   SQLSERVER_DATABASE_DS32: "AnalyticsMiddleTier_Testing_Ds32"
   SQLSERVER_DATABASE_DS33: "AnalyticsMiddleTier_Testing_Ds33"
   SQLSERVER_DATABASE_DS40: "AnalyticsMiddleTier_Testing_Ds40"
+  SQLSERVER_DATABASE_DS50: "AnalyticsMiddleTier_Testing_Ds50"
   SQLSERVER_INTEGRATED_SECURITY: "false"
   SQLSERVER_USER: "sa" 
   SQLSERVER_PASS: ${{ secrets.MSSQL_PWD }}
   POSTGRES_HOST: "localhost"
   POSTGRES_DATABASE_DS32: "edfi_ods_tests_ds32"
   POSTGRES_DATABASE_DS33: "edfi_ods_tests_ds33"
   POSTGRES_DATABASE_DS40: "edfi_ods_tests_ds40"
+  POSTGRES_DATABASE_DS50: "edfi_ods_tests_ds50"
   POSTGRES_PORT: "5432"
   POSTGRES_USER: "postgres"
   POSTGRES_PASS: ${{ secrets.POSTGRESQL_PWD }}
@@ -140,6 +142,13 @@ jobs:
         env:
           PGPASSWORD: ${{ env.POSTGRES_PASS }}
 
+      - name: Create Postgres DB DS v5.0
+        run: |
+          .\eng\CreateTestDbAndSchema.ps1 -port ${{ env.POSTGRES_PORT }} -d ${{ env.POSTGRES_DATABASE_DS50 }} -ds 5.0
+        shell: pwsh
+        env:
+          PGPASSWORD: ${{ env.POSTGRES_PASS }}
+
       - name: Building AMT
         run: |
           .\build.ps1 build -Configuration ${{ env.CONFIGURATION }} -Version ${{ env.BUILD_VERSION }} -BuildCounter ${{ github.run_number }}

eng/CreateTestDbAndSchema.ps1

@@ -71,7 +71,7 @@ param ( [string][Alias('h')]$pghost="localhost",
 		[string][Alias('u')]$user="postgres",
 		[string][Alias('p')]$port="5432",
         [string][Alias('ds')]
-        [ValidateSet("3.2", "3.3", "4.0")]
+        [ValidateSet("3.2", "3.3", "4.0", "5.0")]
         $datastandard,
 		[string][Alias('d')]$database="edfi_ods_tests_ds32",
         [string][Alias('s')]$script="$PSScriptRoot/../src/EdFi.AnalyticsMiddleTier.Tests/EdFi.Ods32.Minimal.Template.sql")
@@ -88,6 +88,10 @@ elseif($datastandard -eq "4.0"){
     $script="$PSScriptRoot/../src/EdFi.AnalyticsMiddleTier.Tests/EdFi.Ods40.Minimal.Template.sql"
     $database="edfi_ods_tests_ds40"
 }
+elseif($datastandard -eq "5.0"){
+    $script="$PSScriptRoot/../src/EdFi.AnalyticsMiddleTier.Tests/EdFi.Ods50.Minimal.Template.sql"
+    $database="edfi_ods_tests_ds50"
+}
 
 $dropDatabase = "DROP DATABASE IF EXISTS" +" " + $database +";"
 $createDatabase = "CREATE DATABASE" +" " + $database +";"

src/EdFi.AnalyticsMiddleTier.Common/Component.cs

@@ -32,7 +32,8 @@ public enum DataStandard
         Ds31,
         Ds32,
         Ds33,
-        Ds40
+        Ds40,
+        Ds50
     }
     [SuppressMessage("ReSharper", "InconsistentNaming")]
     public enum Engine

src/EdFi.AnalyticsMiddleTier.Common/PostgresMigrationStrategy.cs

@@ -16,6 +16,12 @@ public class PostgresMigrationStrategy : IDatabaseMigrationStrategy
         public const string JournalingVersionsTable = "AnalyticsMiddleTierSchemaVersion";
         public const string DataStandardVersionTemplate =
             @"SELECT CASE 
+				WHEN EXISTS (
+		            SELECT FROM information_schema.tables 
+		            WHERE  table_schema = 'edfi' AND table_name = 'contact'
+	            )
+	            THEN 
+		            'Ds50'
 	            WHEN EXISTS (
 		            SELECT FROM information_schema.tables 
 		            WHERE  table_schema = 'edfi' AND table_name = 'localbudget'

src/EdFi.AnalyticsMiddleTier.Common/SqlServerMigrationStrategy.cs

@@ -22,11 +22,16 @@ public class SqlServerMigrationStrategy : IDatabaseMigrationStrategy
              ELSE IF (SELECT OBJECT_ID('dbo.VersionLevel')) IS NOT NULL
              BEGIN
             	SELECT 'Ds31' AS version
+             END
+			 ELSE IF (SELECT OBJECT_ID('edfi.Contact')) IS NOT NULL
+             BEGIN
+            	SELECT 'Ds50' AS version
              END
 			 ELSE IF (SELECT OBJECT_ID('edfi.LocalBudget')) IS NOT NULL
              BEGIN
             	SELECT 'Ds40' AS version
              END
+
 			 ELSE IF (SELECT OBJECT_ID('edfi.Survey')) IS NOT NULL
              BEGIN
             	SELECT 'Ds33' AS version
@@ -38,7 +43,8 @@ ELSE IF (SELECT OBJECT_ID('dbo.DeployJournal'))  IS NOT NULL
              ELSE
              BEGIN
             	SELECT 'InvalidDs' AS version
-             END";
+             END
+";
 
         private readonly IOrm _orm;
         public SqlServerMigrationStrategy(IOrm orm){

src/EdFi.AnalyticsMiddleTier.Console/EdFi.AnalyticsMiddleTier.Console.csproj

@@ -29,6 +29,7 @@
     <ProjectReference Include="..\EdFi.AnalyticsMiddleTier.DataStandard32\EdFi.AnalyticsMiddleTier.DataStandard32.csproj" />
     <ProjectReference Include="..\EdFi.AnalyticsMiddleTier.DataStandard33\EdFi.AnalyticsMiddleTier.DataStandard33.csproj" />
     <ProjectReference Include="..\EdFi.AnalyticsMiddleTier.DataStandard40\EdFi.AnalyticsMiddleTier.DataStandard40.csproj" />
+    <ProjectReference Include="..\EdFi.AnalyticsMiddleTier.DataStandard50\EdFi.AnalyticsMiddleTier.DataStandard50.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/EdFi.AnalyticsMiddleTier.Console/Program.cs

@@ -17,6 +17,7 @@
 using Ds32 = EdFi.AnalyticsMiddleTier.DataStandard32;
 using Ds33 = EdFi.AnalyticsMiddleTier.DataStandard33;
 using Ds40 = EdFi.AnalyticsMiddleTier.DataStandard40;
+using Ds50 = EdFi.AnalyticsMiddleTier.DataStandard50;
 using System.Text.RegularExpressions;
 
 namespace EdFi.AnalyticsMiddleTier.Console
@@ -143,6 +144,9 @@ void RunWithOptions(Options options)
                             case DataStandard.Ds40:
                                 install = new Ds40.Install(migrationStrategy);
                                 break;
+                            case DataStandard.Ds50:
+                                install = new Ds50.Install(migrationStrategy);
+                                break;
                             default:
                                 message = _odsVersionNotSupportedMessage;
                                 break;

src/EdFi.AnalyticsMiddleTier.DataStandard50/Asmt/MSSQL/0000-View-AssessmentFact-Create.sql

@@ -0,0 +1,107 @@
+-- SPDX-License-Identifier: Apache-2.0
+-- Licensed to the Ed-Fi Alliance under one or more agreements.
+-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+-- See the LICENSE and NOTICES files in the project root for more information.
+
+CREATE VIEW analytics.asmt_AssessmentFact
+AS
+    SELECT CONCAT (
+            Assessment.AssessmentIdentifier
+            ,'-'
+            ,Assessment.Namespace
+            ,'-'
+            ,AssessmentAssessedGradeLevel.GradeLevelDescriptorId
+            ,'-'
+            ,AssessmentScore.AssessmentReportingMethodDescriptorId
+            ,'-'
+            ,AssessmentAcademicSubject.AcademicSubjectDescriptorId
+            ,'-'
+            ,ObjectiveAssessment.IdentificationCode
+            ,'-'
+            ,ObjectiveAssessment.ParentIdentificationCode
+            ,'-'
+            ,ObjectiveAssessmentScore.AssessmentReportingMethodDescriptorId
+            ,'-'
+            ,ObjectiveAssessmentLearningStandard.LearningStandardId
+            ) AS AssessmentFactKey
+        ,CONCAT (
+            Assessment.AssessmentIdentifier
+            ,'-'
+            ,Assessment.Namespace
+            ) AS AssessmentKey
+        ,Assessment.AssessmentIdentifier
+        ,Assessment.Namespace
+        ,Assessment.AssessmentTitle AS Title
+        ,COALESCE(Assessment.AssessmentVersion, 0) AS Version
+        ,COALESCE(CategoryDescriptor.Description, '') AS Category
+        ,COALESCE(Descriptor.Description, '') AS AssessedGradeLevel
+        ,COALESCE(AcademicSubjectDescriptor.Description, '') AS AcademicSubject
+        ,COALESCE(ResultDataTypeDescriptorAssessment.Description, ResultDataTypeDescriptorObjectiveAssessment.Description, '') AS ResultDataType
+        ,COALESCE(AssessmentReportingMethodDescriptorDist.Description, ReportingMethodDescriptorObjectiveAssessment.Description, '') AS ReportingMethod
+        ,CASE 
+            WHEN ObjectiveAssessment.AssessmentIdentifier IS NOT NULL
+                THEN CONCAT (
+                        ObjectiveAssessment.AssessmentIdentifier
+                        ,'-'
+                        ,ObjectiveAssessment.IdentificationCode
+                        ,'-'
+                        ,ObjectiveAssessment.Namespace
+                        )
+            ELSE ''
+            END AS ObjectiveAssessmentKey
+        ,COALESCE(ObjectiveAssessment.IdentificationCode, '') AS IdentificationCode
+        ,CASE 
+            WHEN ObjectiveAssessment.ParentIdentificationCode IS NOT NULL
+                THEN CONCAT (
+                        ParentAssesment.AssessmentIdentifier
+                        ,'-'
+                        ,ParentAssesment.IdentificationCode
+                        ,'-'
+                        ,ParentAssesment.Namespace
+                        )
+            ELSE ''
+            END AS ParentObjectiveAssessmentKey
+        ,COALESCE(ObjectiveAssessment.Description, '') AS ObjectiveAssessmentDescription
+        ,COALESCE(ObjectiveAssessment.PercentOfAssessment, 0) AS PercentOfAssessment
+        ,COALESCE(AssessmentScore.MinimumScore, ObjectiveAssessmentScore.MinimumScore, '') AS MinScore
+        ,COALESCE(AssessmentScore.MaximumScore, ObjectiveAssessmentScore.MaximumScore, '') AS MaxScore
+        ,COALESCE(ObjectiveAssessmentLearningStandard.LearningStandardId, '') AS LearningStandard
+    FROM edfi.Assessment
+    LEFT JOIN edfi.AssessmentAssessedGradeLevel
+        ON Assessment.AssessmentIdentifier = AssessmentAssessedGradeLevel.AssessmentIdentifier
+            AND Assessment.Namespace = AssessmentAssessedGradeLevel.Namespace
+    LEFT JOIN edfi.AssessmentScore
+        ON Assessment.AssessmentIdentifier = AssessmentScore.AssessmentIdentifier
+            AND Assessment.Namespace = AssessmentScore.Namespace
+    LEFT JOIN edfi.Descriptor AS AssessmentReportingMethodDescriptorDist
+        ON AssessmentScore.AssessmentReportingMethodDescriptorId = AssessmentReportingMethodDescriptorDist.DescriptorId
+    LEFT JOIN edfi.Descriptor
+        ON Descriptor.DescriptorId = AssessmentAssessedGradeLevel.GradeLevelDescriptorId
+    LEFT JOIN edfi.AssessmentAcademicSubject
+        ON Assessment.AssessmentIdentifier = AssessmentAcademicSubject.AssessmentIdentifier
+            AND Assessment.Namespace = AssessmentAcademicSubject.Namespace
+    LEFT JOIN edfi.Descriptor AcademicSubjectDescriptor
+        ON AcademicSubjectDescriptor.DescriptorId = AssessmentAcademicSubject.AcademicSubjectDescriptorId
+    LEFT JOIN edfi.Descriptor CategoryDescriptor
+        ON CategoryDescriptor.DescriptorId = Assessment.AssessmentCategoryDescriptorId
+    LEFT JOIN edfi.Descriptor AS ResultDataTypeDescriptorAssessment
+        ON AssessmentScore.ResultDatatypeTypeDescriptorId = ResultDataTypeDescriptorAssessment.DescriptorId
+    LEFT JOIN edfi.ObjectiveAssessment
+        ON Assessment.AssessmentIdentifier = ObjectiveAssessment.AssessmentIdentifier
+            AND Assessment.Namespace = ObjectiveAssessment.Namespace
+    LEFT JOIN edfi.ObjectiveAssessmentScore
+        ON ObjectiveAssessment.AssessmentIdentifier = ObjectiveAssessmentScore.AssessmentIdentifier
+            AND ObjectiveAssessment.IdentificationCode = ObjectiveAssessmentScore.IdentificationCode
+            AND ObjectiveAssessment.Namespace = ObjectiveAssessmentScore.Namespace
+    LEFT JOIN edfi.Descriptor AS ResultDataTypeDescriptorObjectiveAssessment
+        ON ObjectiveAssessmentScore.ResultDatatypeTypeDescriptorId = ResultDataTypeDescriptorObjectiveAssessment.DescriptorId
+    LEFT JOIN edfi.Descriptor AS ReportingMethodDescriptorObjectiveAssessment
+        ON ObjectiveAssessmentScore.AssessmentReportingMethodDescriptorId = ReportingMethodDescriptorObjectiveAssessment.DescriptorId
+    LEFT JOIN edfi.ObjectiveAssessment ParentAssesment
+        ON ParentAssesment.AssessmentIdentifier = ObjectiveAssessment.AssessmentIdentifier
+            AND ParentAssesment.IdentificationCode = ObjectiveAssessment.ParentIdentificationCode
+            AND ParentAssesment.Namespace = ObjectiveAssessment.Namespace
+    LEFT JOIN edfi.ObjectiveAssessmentLearningStandard
+        ON ObjectiveAssessment.AssessmentIdentifier = ObjectiveAssessmentLearningStandard.AssessmentIdentifier
+            AND ObjectiveAssessment.IdentificationCode = ObjectiveAssessmentLearningStandard.IdentificationCode
+            AND ObjectiveAssessment.Namespace = ObjectiveAssessmentLearningStandard.Namespace;