ApprovalTest CodeFix

Ed-Fi-Alliance-OSS · Nov 20, 2024 · dbb6121 · dbb6121
1 parent 3fb95bc
commit dbb6121
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 106 deletions.
diff --git a/...520_ApprovalTests.Verify.Standard_Std_5.2.0_Controllers_Controllers.generated.approved.cs b/...520_ApprovalTests.Verify.Standard_Std_5.2.0_Controllers_Controllers.generated.approved.cs
@@ -10629,6 +10629,8 @@ protected override void MapAll(Api.Common.Models.Requests.StudentAssessmentRegis
             specification.Namespace = request.Namespace;
             specification.PlatformTypeDescriptor = request.PlatformTypeDescriptor;
             specification.ReportingEducationOrganizationId = request.ReportingEducationOrganizationId;
+            specification.ScheduledEducationOrganizationId = request.ScheduledEducationOrganizationId;
+            specification.ScheduledStudentUniqueId = request.ScheduledStudentUniqueId;
             specification.SchoolId = request.SchoolId;
             specification.StudentUniqueId = request.StudentUniqueId;
             specification.TestingEducationOrganizationId = request.TestingEducationOrganizationId;

diff --git a/...y.Standard_Std_5.2.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/...y.Standard_Std_5.2.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -16519,6 +16519,8 @@
     <property name="EntryDate" column="EntryDate" type="date" not-null="true" />
     <property name="PlatformTypeDescriptorId" column="PlatformTypeDescriptorId" type="int" />
     <property name="ReportingEducationOrganizationId" column="ReportingEducationOrganizationId" type="long" />
+    <property name="ScheduledEducationOrganizationId" column="ScheduledEducationOrganizationId" type="long" />
+    <property name="ScheduledStudentUSI" column="ScheduledStudentUSI" type="int" />
     <property name="SchoolId" column="SchoolId" type="long" not-null="true" />
     <property name="TestingEducationOrganizationId" column="TestingEducationOrganizationId" type="long" />
 
@@ -16532,9 +16534,9 @@
     <many-to-one name="ReportingEducationOrganizationReferenceData" class="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganizationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
       <column name="ReportingEducationOrganizationId" />
     </many-to-one>
-    <many-to-one name="StudentEducationOrganizationAssessmentAccommodationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
-      <column name="EducationOrganizationId" />
-      <column name="StudentUSI" />
+    <many-to-one name="ScheduledStudentEducationOrganizationAssessmentAccommodationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
+      <column name="ScheduledEducationOrganizationId" />
+      <column name="ScheduledStudentUSI" />
     </many-to-one>
     <many-to-one name="StudentEducationOrganizationAssociationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
       <column name="EducationOrganizationId" />

diff --git a/..._Std_5.2.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/..._Std_5.2.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -21403,6 +21403,8 @@
     <property name="EntryDate" column="EntryDate" type="date" not-null="true" />
     <property name="PlatformTypeDescriptorId" column="PlatformTypeDescriptorId" type="int" />
     <property name="ReportingEducationOrganizationId" column="ReportingEducationOrganizationId" type="long" />
+    <property name="ScheduledEducationOrganizationId" column="ScheduledEducationOrganizationId" type="long" />
+    <property name="ScheduledStudentUSI" column="ScheduledStudentUSI" type="int" />
     <property name="SchoolId" column="SchoolId" type="long" not-null="true" />
     <property name="TestingEducationOrganizationId" column="TestingEducationOrganizationId" type="long" />
 
@@ -21424,9 +21426,9 @@
     <many-to-one name="ReportingEducationOrganization" class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
         <column name="ReportingEducationOrganizationId" />
     </many-to-one>
-    <many-to-one name="StudentEducationOrganizationAssessmentAccommodation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
-        <column name="EducationOrganizationId" />
-        <column name="StudentUSI" />
+    <many-to-one name="ScheduledStudentEducationOrganizationAssessmentAccommodation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
+        <column name="ScheduledEducationOrganizationId" />
+        <column name="ScheduledStudentUSI" />
     </many-to-one>
     <many-to-one name="StudentEducationOrganizationAssociation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
         <column name="EducationOrganizationId" />
@@ -22264,8 +22266,8 @@
     <!-- Collections -->
     <set name="StudentAssessmentRegistrations" cascade="none" lazy="true">
       <key>
-        <column name="EducationOrganizationId" />
-        <column name="StudentUSI" />
+        <column name="ScheduledEducationOrganizationId" />
+        <column name="ScheduledStudentUSI" />
       </key>
       <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentRegistrationAggregate.EdFi.StudentAssessmentRegistrationQ" />
     </set>

diff --git a/...y.Standard_Std_5.2.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/...y.Standard_Std_5.2.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -16519,6 +16519,8 @@
     <property name="EntryDate" column="EntryDate" type="date" not-null="true" />
     <property name="PlatformTypeDescriptorId" column="PlatformTypeDescriptorId" type="int" />
     <property name="ReportingEducationOrganizationId" column="ReportingEducationOrganizationId" type="long" />
+    <property name="ScheduledEducationOrganizationId" column="ScheduledEducationOrganizationId" type="long" />
+    <property name="ScheduledStudentUSI" column="ScheduledStudentUSI" type="int" />
     <property name="SchoolId" column="SchoolId" type="long" not-null="true" />
     <property name="TestingEducationOrganizationId" column="TestingEducationOrganizationId" type="long" />
 
@@ -16532,9 +16534,9 @@
     <many-to-one name="ReportingEducationOrganizationReferenceData" class="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganizationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
       <column name="ReportingEducationOrganizationId" />
     </many-to-one>
-    <many-to-one name="StudentEducationOrganizationAssessmentAccommodationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
-      <column name="EducationOrganizationId" />
-      <column name="StudentUSI" />
+    <many-to-one name="ScheduledStudentEducationOrganizationAssessmentAccommodationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
+      <column name="ScheduledEducationOrganizationId" />
+      <column name="ScheduledStudentUSI" />
     </many-to-one>
     <many-to-one name="StudentEducationOrganizationAssociationReferenceData" class="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationReferenceData" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
       <column name="EducationOrganizationId" />

diff --git a/..._Std_5.2.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/..._Std_5.2.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -21403,6 +21403,8 @@
     <property name="EntryDate" column="EntryDate" type="date" not-null="true" />
     <property name="PlatformTypeDescriptorId" column="PlatformTypeDescriptorId" type="int" />
     <property name="ReportingEducationOrganizationId" column="ReportingEducationOrganizationId" type="long" />
+    <property name="ScheduledEducationOrganizationId" column="ScheduledEducationOrganizationId" type="long" />
+    <property name="ScheduledStudentUSI" column="ScheduledStudentUSI" type="int" />
     <property name="SchoolId" column="SchoolId" type="long" not-null="true" />
     <property name="TestingEducationOrganizationId" column="TestingEducationOrganizationId" type="long" />
 
@@ -21424,9 +21426,9 @@
     <many-to-one name="ReportingEducationOrganization" class="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
         <column name="ReportingEducationOrganizationId" />
     </many-to-one>
-    <many-to-one name="StudentEducationOrganizationAssessmentAccommodation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
-        <column name="EducationOrganizationId" />
-        <column name="StudentUSI" />
+    <many-to-one name="ScheduledStudentEducationOrganizationAssessmentAccommodation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
+        <column name="ScheduledEducationOrganizationId" />
+        <column name="ScheduledStudentUSI" />
     </many-to-one>
     <many-to-one name="StudentEducationOrganizationAssociation" class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" fetch="join" insert="false" update="false" cascade="none" lazy="proxy">
         <column name="EducationOrganizationId" />
@@ -22264,8 +22266,8 @@
     <!-- Collections -->
     <set name="StudentAssessmentRegistrations" cascade="none" lazy="true">
       <key>
-        <column name="EducationOrganizationId" />
-        <column name="StudentUSI" />
+        <column name="ScheduledEducationOrganizationId" />
+        <column name="ScheduledStudentUSI" />
       </key>
       <one-to-many class="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentRegistrationAggregate.EdFi.StudentAssessmentRegistrationQ" />
     </set>

diff --git a/...lTests.Verify.Standard_Std_5.2.0_ExceptionHandling_DatabaseMetadata.generated.approved.cs b/...lTests.Verify.Standard_Std_5.2.0_ExceptionHandling_DatabaseMetadata.generated.approved.cs
@@ -1255,7 +1255,7 @@ public IndexDetails GetIndexDetails(string indexName)
             { "FK_StudentAssessmentRegistration_EducationOrganization1", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_EducationOrganization1", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "TestingEducationOrganizationId" } } },
             { "FK_StudentAssessmentRegistration_GradeLevelDescriptor", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_GradeLevelDescriptor", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "AssessmentGradeLevelDescriptorId" } } },
             { "FK_StudentAssessmentRegistration_PlatformTypeDescriptor", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_PlatformTypeDescriptor", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "PlatformTypeDescriptorId" } } },
-            { "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssessmentAccommodation", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssessmentAccommodation", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "EducationOrganizationId", "StudentUSI" } } },
+            { "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssessmentAccommodation", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssessmentAccommodation", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "ScheduledEducationOrganizationId", "ScheduledStudentUSI" } } },
             { "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssociation", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_StudentEducationOrganizationAssociation", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "EducationOrganizationId", "StudentUSI" } } },
             { "FK_StudentAssessmentRegistration_StudentSchoolAssociation", new IndexDetails { IndexName = "FK_StudentAssessmentRegistration_StudentSchoolAssociation", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "EntryDate", "SchoolId", "StudentUSI" } } },
             { "StudentAssessmentRegistration_PK", new IndexDetails { IndexName = "StudentAssessmentRegistration_PK", TableName = "StudentAssessmentRegistration", ColumnNames = new List<string> { "AdministrationIdentifier", "AssessmentIdentifier", "AssigningEducationOrganizationId", "EducationOrganizationId", "Namespace", "StudentUSI" } } },

diff --git a/...20_ApprovalTests.Verify.Standard_Std_5.2.0_Models_Entities_Entities.generated.approved.cs b/...20_ApprovalTests.Verify.Standard_Std_5.2.0_Models_Entities_Entities.generated.approved.cs
@@ -125645,6 +125645,59 @@ public virtual string PlatformTypeDescriptor
             }
         }
         public virtual long? ReportingEducationOrganizationId  { get; set; }
+        public virtual long? ScheduledEducationOrganizationId  { get; set; }
+        public virtual int? ScheduledStudentUSI 
+        {
+            get
+            {
+                if (_scheduledStudentUSI == default(int?) && _scheduledStudentUniqueId != null)
+                {
+                    if (GeneratedArtifactStaticDependencies.UsiLookupsByUniqueIdContextProvider.Get().UsiByUniqueIdByPersonType.TryGetValue("Student", out var usiByUniqueId)
+                        && usiByUniqueId.TryGetValue(_scheduledStudentUniqueId, out var usi))
+                    {
+                        _scheduledStudentUSI = usi;
+                    }
+                }
+
+                return _scheduledStudentUSI;
+            } 
+            set
+            {
+                _scheduledStudentUSI = value;
+
+                if (value != null)
+                {
+                    GeneratedArtifactStaticDependencies.UniqueIdLookupsByUsiContextProvider.Get().AddLookup("Student", value.Value);
+                }
+            }
+        }
+
+        private int? _scheduledStudentUSI;
+        private string _scheduledStudentUniqueId;
+
+        public virtual string ScheduledStudentUniqueId
+        {
+            get
+            {
+                if (_scheduledStudentUniqueId == null && _scheduledStudentUSI.HasValue)
+                {
+                    if (GeneratedArtifactStaticDependencies.UniqueIdLookupsByUsiContextProvider.Get().UniqueIdByUsiByPersonType.TryGetValue("Student", out var uniqueIdByUsi)
+                        && uniqueIdByUsi.TryGetValue(_scheduledStudentUSI.Value, out var uniqueId))
+                    {
+                        _scheduledStudentUniqueId = uniqueId;
+                    }
+                }
+
+                return _scheduledStudentUniqueId;
+            }
+            set
+            {
+                if (_scheduledStudentUniqueId != value)
+                        _scheduledStudentUSI = default(int?);
+
+                _scheduledStudentUniqueId = value;
+            }
+        }
         public virtual long SchoolId  { get; set; }
         public virtual long? TestingEducationOrganizationId  { get; set; }
         // -------------------------------------------------------------
@@ -125731,23 +125784,23 @@ string Entities.Common.EdFi.IStudentAssessmentRegistration.ReportingEducationOrg
             set { }
         }
 
-        public virtual NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData StudentEducationOrganizationAssessmentAccommodationReferenceData { get; set; }
+        public virtual NHibernate.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationReferenceData ScheduledStudentEducationOrganizationAssessmentAccommodationReferenceData { get; set; }
 
         /// <summary>
-        /// Read-only property that allows the StudentEducationOrganizationAssessmentAccommodation discriminator value to be mapped to the resource reference.
+        /// Read-only property that allows the ScheduledStudentEducationOrganizationAssessmentAccommodation discriminator value to be mapped to the resource reference.
         /// </summary>
-        string Entities.Common.EdFi.IStudentAssessmentRegistration.StudentEducationOrganizationAssessmentAccommodationDiscriminator
+        string Entities.Common.EdFi.IStudentAssessmentRegistration.ScheduledStudentEducationOrganizationAssessmentAccommodationDiscriminator
         {
-            get { return StudentEducationOrganizationAssessmentAccommodationReferenceData?.Discriminator; }
+            get { return ScheduledStudentEducationOrganizationAssessmentAccommodationReferenceData?.Discriminator; }
             set { }
         }
 
         /// <summary>
-        /// Read-only property that allows the StudentEducationOrganizationAssessmentAccommodation resource identifier value to be mapped to the resource reference.
+        /// Read-only property that allows the ScheduledStudentEducationOrganizationAssessmentAccommodation resource identifier value to be mapped to the resource reference.
         /// </summary>
-        Guid? Entities.Common.EdFi.IStudentAssessmentRegistration.StudentEducationOrganizationAssessmentAccommodationResourceId
+        Guid? Entities.Common.EdFi.IStudentAssessmentRegistration.ScheduledStudentEducationOrganizationAssessmentAccommodationResourceId
         {
-            get { return StudentEducationOrganizationAssessmentAccommodationReferenceData?.Id; }
+            get { return ScheduledStudentEducationOrganizationAssessmentAccommodationReferenceData?.Id; }
             set { }
         }
 

diff --git a/...lTests.Verify.Standard_Std_5.2.0_Models_Entities_EntitiesForQueries.generated.approved.cs b/...lTests.Verify.Standard_Std_5.2.0_Models_Entities_EntitiesForQueries.generated.approved.cs
@@ -23997,6 +23997,8 @@ public class StudentAssessmentRegistrationQ : AggregateRootWithCompositeKey
         public virtual DateTime EntryDate  { get; set; }
         public virtual int? PlatformTypeDescriptorId  { get; set; }
         public virtual long? ReportingEducationOrganizationId  { get; set; }
+        public virtual long? ScheduledEducationOrganizationId  { get; set; }
+        public virtual int? ScheduledStudentUSI  { get; set; }
         public virtual long SchoolId  { get; set; }
         public virtual long? TestingEducationOrganizationId  { get; set; }
         // -------------------------------------------------------------
@@ -24023,7 +24025,7 @@ public class StudentAssessmentRegistrationQ : AggregateRootWithCompositeKey
         protected virtual NHibernate.QueryModels.GradeLevelDescriptorAggregate.EdFi.GradeLevelDescriptorQ AssessmentGradeLevelDescriptor { get; set; }
         protected virtual NHibernate.QueryModels.PlatformTypeDescriptorAggregate.EdFi.PlatformTypeDescriptorQ PlatformTypeDescriptor { get; set; }
         protected virtual NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ ReportingEducationOrganization { get; set; }
-        protected virtual NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ StudentEducationOrganizationAssessmentAccommodation { get; set; }
+        protected virtual NHibernate.QueryModels.StudentEducationOrganizationAssessmentAccommodationAggregate.EdFi.StudentEducationOrganizationAssessmentAccommodationQ ScheduledStudentEducationOrganizationAssessmentAccommodation { get; set; }
         protected virtual NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ StudentEducationOrganizationAssociation { get; set; }
         protected virtual NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ StudentSchoolAssociation { get; set; }
         protected virtual NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ TestingEducationOrganization { get; set; }