Merge pull request #60 from bergerb/51-add-missing-demographicscsv-columns-white-demographicracetwoormoreraces-hispanicorlatinoethnicity

51 add missing demographicscsv columns white demographicracetwoormoreraces hispanicorlatinoethnicity

Author: bergerb

OneRosterSampleDataGenerator/Models/Demographic.cs

@@ -5,10 +5,11 @@ namespace OneRosterSampleDataGenerator.Models;
 public class Demographic : BaseModel
 {
     public bool AmericanIndianOrAlaskaNative { get; set; }
+    public bool Asian { get; set; }
     public bool BlackOrAfricanAmerican { get; set; }
     public bool NativeHawaiianOrOtherPacificIslander { get; set; }
     public bool DemographicRaceTwoOrMoreRaces { get; set; }
-    public bool HispanicOrLationEthnicity { get; set; }
+    public bool HispanicOrLatinoEthnicity { get; set; }
     public bool White { get; set; }
     public DateTime BirthDate { get; set; }
     public DateTime DateLastModified { get; set; }

OneRosterSampleDataGenerator/Models/Exports/ClassFile.cs

@@ -32,7 +32,7 @@ public class ClassFile : IExportable<Class, ClassFile>
     public string TermSourcedId { get; set; } = null!;
     [Name("subjects")]
     public string Subjects { get; set; } = null!;
-    [Name("SubjectCodes")]
+    [Name("subjectCodes")]
     public string SubjectCodes { get; set; } = null!;
     [Name("periods")]
     public string Periods { get; set; } = null!;

OneRosterSampleDataGenerator/Models/Exports/DemographicFile.cs

@@ -25,8 +25,14 @@ public class DemographicFile : IExportable<Demographic, DemographicFile>
     public string Asian { get; set; } = null!;
     [Name("blackOrAfricanAmerican")]
     public string BlackOrAfricanAmerican { get; set; } = null!;
-    [Name("nativeAmericanOrOtherPacificIslander")]
-    public string NativeAmericanOrOtherPacificIslander { get; set; } = null!;
+    [Name("nativeHawaiianOrOtherPacificIslander")]
+    public string NativeHawaiianOrOtherPacificIslander { get; set; } = null!;
+    [Name("white")]
+    public string White { get; set; } = null!;
+    [Name("demographicRaceTwoOrMoreRaces")]
+    public string DemographicRaceTwoOrMoreRaces { get; set; } = null!;
+    [Name("hispanicOrLatinoEthnicity")]
+    public string HispanicOrLatinoEthnicity { get; set; } = null!;
     [Name("countryOfBirthCode")]
     public string CountryOfBirthCode { get; set; } = null!;
     [Name("stateofBirthAbbreviation")]
@@ -40,11 +46,22 @@ public DemographicFile Map(Demographic item)
     {
         return new()
         {
+            AmericanIndianOrAlaskaNative = item.AmericanIndianOrAlaskaNative.ToString().ToLower(),
+            Asian = item.Asian.ToString().ToLower(),
             BirthDate = item.BirthDate,
+            BlackOrAfricanAmerican = item.BlackOrAfricanAmerican.ToString().ToLower(),
+            CityOfBirth = item.CityOfBirth,
+            CountryOfBirthCode = item.CountryOfBirthCode,
             DateLastModified = item.DateLastModified,
+            DemographicRaceTwoOrMoreRaces = item.DemographicRaceTwoOrMoreRaces.ToString().ToLower(),
+            HispanicOrLatinoEthnicity = item.HispanicOrLatinoEthnicity.ToString().ToLower(),
+            NativeHawaiianOrOtherPacificIslander = item.NativeHawaiianOrOtherPacificIslander.ToString().ToLower(),
+            PublicSchoolResidenceStatus = item.PublicSchoolResidenceStatus,
             Sex = item.Sex,
             SourcedId = item.SourcedId.ToString(),
+            StateofBirthAbbreviation = item.StateOfBirthAbbreviation,
             Status = item.Status.ToString(),
+            White = item.White.ToString().ToLower(),
         };
     }
 }

OneRosterSampleDataGenerator/Models/Exports/EnrollmentFile.cs

@@ -30,12 +30,15 @@ public class EnrollmentFile : IExportable<Enrollment, EnrollmentFile>
     [Name("endDate")]
     [Format("yyyy-MM-dd")]
     public DateTime? EndDate { get; set; }
+    [Name("courseSourcedId")]
+    public string CourseSourcedId { get; set; } = null!;
 
     public EnrollmentFile Map(Enrollment item)
     {
         return new()
         {
             ClassSourcedId = item.ClassSourcedId.ToString(),
+            CourseSourcedId = item.CourseSourcedId.ToString(),
             DateLastModified = item.DateLastModified,
             Role = item.Role.ToString(),
             SchoolSourcedId = item.SchoolSourcedId.ToString(),

OneRosterSampleDataGenerator/OneRosterSampleDataGenerator.csproj

@@ -40,7 +40,7 @@
     <OutputType>library</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <PackageId>OneRosterSampleDataGenerator</PackageId>
-    <Version>2.1.0-beta</Version>
+    <Version>2.1.1-beta</Version>
     <Authors>bergerb</Authors>
     <Company></Company>
     <PackageDescription>OneRoster Sample Data Generator Class Library</PackageDescription>

README.md

@@ -97,6 +97,10 @@ Brent Berger
 
 ## Version History
 
+* 2.1.1-beta
+    * Fix demographics.csv column names and add missing columns
+    * Fix classes.csv SubjectCodes -> subjectCodes casing
+    * Add missing courseSourcedId column to enrollments.csv
 * 2.1.0-beta
     * Refactor IExportable to reduce maintenance cost for new file specs
 * 2.0.0-beta