Implement yearly intake functionality in school simulation, allowing for the graduation of students and the addition of new first-year pupils. Update the roster management to reflect these changes, ensuring proper entity handling in the simulation. Enhance the API to support name sets during roster installation and revise related tests to validate the new intake process and roster updates.
This commit is contained in:
Leonid Pershin
@@ -0,0 +1,122 @@
|
||||
namespace HSchool.People.Tests;
|
||||
|
||||
public class YearlyIntakeTests
|
||||
{
|
||||
private static readonly DateTime September = new(2012, 9, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
|
||||
[Fact]
|
||||
public void DatesBetween_SkipsAStartAlreadyOnFirstSeptember()
|
||||
{
|
||||
var start = new DateTime(2012, 9, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
Assert.Empty(YearlyIntake.DatesBetween(start, start.AddMinutes(1)));
|
||||
Assert.Equal(
|
||||
[new DateTime(2012, 9, 1, 0, 0, 0, DateTimeKind.Utc)],
|
||||
YearlyIntake.DatesBetween(new DateTime(2012, 4, 3, 6, 0, 0, DateTimeKind.Utc), start));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void FourClassrooms_GraduatesTheOldestYearNotEleventh()
|
||||
{
|
||||
var map = Fixtures.Classrooms(4);
|
||||
var catalog = Fixtures.Catalog();
|
||||
var before = Fixtures.Generate(map);
|
||||
Assert.Equal(4, before.Classes.Max(schoolClass => schoolClass.Year));
|
||||
Assert.DoesNotContain(before.Classes, schoolClass => schoolClass.Year == 11);
|
||||
|
||||
var after = YearlyIntake.Apply(catalog, before, Fixtures.SchoolSeed, "Slavic", September);
|
||||
var demand = SchoolDemand.From(catalog, map);
|
||||
|
||||
Assert.True(RosterFit.Matches(after, demand));
|
||||
Assert.Equal(before.People.Count(person => person.IsStudent), after.People.Count(person => person.IsStudent));
|
||||
Assert.Equal(before.Classes.Sum(schoolClass => schoolClass.Capacity), after.Classes.Sum(schoolClass => schoolClass.Capacity));
|
||||
Assert.Equal(4, after.Classes.Max(schoolClass => schoolClass.Year));
|
||||
Assert.Contains(after.Classes, schoolClass => schoolClass.Year == 1);
|
||||
Assert.All(after.Classes, schoolClass => Assert.Equal(schoolClass.Capacity, schoolClass.PupilIds.Count));
|
||||
|
||||
var graduated = before.Classes
|
||||
.Where(schoolClass => schoolClass.Year == 4)
|
||||
.SelectMany(schoolClass => schoolClass.PupilIds)
|
||||
.ToHashSet(StringComparer.Ordinal);
|
||||
Assert.All(graduated, id => Assert.DoesNotContain(after.People, person => person.Id == id));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SameInputs_YieldTheSameIntake()
|
||||
{
|
||||
var map = Fixtures.Classrooms(4);
|
||||
var catalog = Fixtures.Catalog();
|
||||
var before = Fixtures.Generate(map);
|
||||
var a = Snapshot(YearlyIntake.Apply(catalog, before, Fixtures.SchoolSeed, "Slavic", September));
|
||||
var b = Snapshot(YearlyIntake.Apply(catalog, before, Fixtures.SchoolSeed, "Slavic", September));
|
||||
Assert.Equal(a, b);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void NewFirstYear_CanShareAFamilyWithAnOlderPupil()
|
||||
{
|
||||
var map = Fixtures.Classrooms(4);
|
||||
var catalog = Fixtures.Catalog();
|
||||
var before = Fixtures.Generate(map);
|
||||
var after = YearlyIntake.Apply(catalog, before, Fixtures.SchoolSeed, "Slavic", September);
|
||||
var people = after.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
|
||||
var yearOf = after.Classes.ToDictionary(schoolClass => schoolClass.Id, schoolClass => schoolClass.Year, StringComparer.Ordinal);
|
||||
|
||||
Assert.Contains(after.Families, family =>
|
||||
{
|
||||
var years = family.ChildIds
|
||||
.Select(id => people[id])
|
||||
.Where(person => person.IsStudent && person.ClassId is not null)
|
||||
.Select(person => yearOf[person.ClassId!])
|
||||
.ToHashSet();
|
||||
return years.Contains(1) && years.Any(year => year > 1);
|
||||
});
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ParentsOfOnlyGraduates_LeaveUnlessTheyWorkHere()
|
||||
{
|
||||
var map = Fixtures.Classrooms(4);
|
||||
var catalog = Fixtures.Catalog();
|
||||
var before = Fixtures.Generate(map);
|
||||
var people = before.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
|
||||
var graduating = before.Classes
|
||||
.Where(schoolClass => schoolClass.Year == 4)
|
||||
.SelectMany(schoolClass => schoolClass.PupilIds)
|
||||
.ToHashSet(StringComparer.Ordinal);
|
||||
|
||||
var shouldLeave = new List<string>();
|
||||
var staffWhoStay = new List<string>();
|
||||
foreach (var family in before.Families)
|
||||
{
|
||||
if (family.ChildIds.Count == 0 || family.ChildIds.Any(id => !graduating.Contains(id)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var parentId in family.ParentIds)
|
||||
{
|
||||
if (people[parentId].IsStaff)
|
||||
{
|
||||
staffWhoStay.Add(parentId);
|
||||
}
|
||||
else
|
||||
{
|
||||
shouldLeave.Add(parentId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var after = YearlyIntake.Apply(catalog, before, Fixtures.SchoolSeed, "Slavic", September);
|
||||
var afterIds = after.People.Select(person => person.Id).ToHashSet(StringComparer.Ordinal);
|
||||
Assert.NotEmpty(shouldLeave);
|
||||
Assert.All(shouldLeave, id => Assert.DoesNotContain(id, afterIds));
|
||||
Assert.All(staffWhoStay, id => Assert.Contains(id, afterIds));
|
||||
Assert.All(
|
||||
after.People.Where(person => staffWhoStay.Contains(person.Id)),
|
||||
person => Assert.False(person.IsParent));
|
||||
}
|
||||
|
||||
private static string Snapshot(Roster roster) =>
|
||||
string.Join('\n', roster.People.Select(person =>
|
||||
$"{person.Id}|{person.FamilyId}|{person.IsStudent}|{person.IsStaff}|{person.IsParent}|{person.ClassId}|{person.Name.Full}"));
|
||||
}
|
||||
@@ -94,6 +94,85 @@ public class PeopleInSchoolTests
|
||||
second.People.Select(person => $"{person.Name.Surname} {person.Name.Given} {person.Name.Patronymic}"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TickPastFirstSeptember_GraduatesTheOldestYearAndKeepsCapacity()
|
||||
{
|
||||
var catalog = Catalog();
|
||||
var map = Classrooms(4);
|
||||
var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 1, "Slavic", Start);
|
||||
var demand = SchoolDemand.From(catalog, map);
|
||||
var oldest = roster.Classes.Max(schoolClass => schoolClass.Year);
|
||||
var graduated = roster.Classes
|
||||
.Where(schoolClass => schoolClass.Year == oldest)
|
||||
.SelectMany(schoolClass => schoolClass.PupilIds)
|
||||
.ToHashSet(StringComparer.Ordinal);
|
||||
|
||||
using var school = School.Create(1, "Четыре кабинета", Start, catalog, map);
|
||||
school.InstallPeople(roster, seed: 1, "Slavic");
|
||||
|
||||
var sept = new DateTime(2012, 9, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
var changed = school.Tick((sept - Start).TotalMinutes / 5d, 5d);
|
||||
|
||||
Assert.True(changed);
|
||||
Assert.True(school.Clock.Time >= sept);
|
||||
Assert.NotNull(school.Roster);
|
||||
Assert.True(RosterFit.Matches(school.Roster, demand));
|
||||
Assert.Equal(roster.People.Count(person => person.IsStudent), school.Roster.People.Count(person => person.IsStudent));
|
||||
Assert.DoesNotContain(school.Roster.People, person => graduated.Contains(person.Id));
|
||||
Assert.Contains(school.Roster.Classes, schoolClass => schoolClass.Year == 1);
|
||||
|
||||
var peopleQuery = new QueryDescription().WithAll<PersonIdentity>();
|
||||
var classesQuery = new QueryDescription().WithAll<ClassIdentity>();
|
||||
Assert.Equal(school.Roster.People.Count, school.World.CountEntities(in peopleQuery));
|
||||
Assert.Equal(school.Roster.Classes.Count, school.World.CountEntities(in classesQuery));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TickOnCreateDateOfFirstSeptember_DoesNotIntake()
|
||||
{
|
||||
var start = new DateTime(2012, 9, 1, 6, 0, 0, DateTimeKind.Utc);
|
||||
var catalog = Catalog();
|
||||
var map = Classrooms(4);
|
||||
var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 3, "Slavic", start);
|
||||
using var school = School.Create(3, "Первое сентября", start, catalog, map);
|
||||
school.InstallPeople(roster, seed: 3, "Slavic");
|
||||
|
||||
var years = roster.Classes.Select(schoolClass => schoolClass.Year).OrderBy(year => year).ToArray();
|
||||
var changed = school.Tick(1d / 20d, 5d);
|
||||
|
||||
Assert.False(changed);
|
||||
Assert.Same(roster, school.Roster);
|
||||
Assert.Equal(years, school.Roster!.Classes.Select(schoolClass => schoolClass.Year).OrderBy(year => year));
|
||||
}
|
||||
|
||||
private static DefCatalog Catalog()
|
||||
{
|
||||
var root = Path.Combine(AppContext.BaseDirectory, "vanilla");
|
||||
return new CatalogLoader().Load([CatalogLoader.CorePackId], PackDocumentsFrom(root));
|
||||
}
|
||||
|
||||
private static MapLayout Classrooms(int count, int desks = 16)
|
||||
{
|
||||
var rooms = new RoomNode[count];
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
rooms[i] = new RoomNode
|
||||
{
|
||||
Id = $"classroom-{i:00}",
|
||||
Def = "Classroom",
|
||||
Building = "main",
|
||||
Floor = "floor-1",
|
||||
Label = $"{101 + i}",
|
||||
Slots =
|
||||
[
|
||||
new SlotFill { Key = "studentDesks", Thing = "StudentDesk", Count = desks },
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
return new MapLayout { Rooms = rooms };
|
||||
}
|
||||
|
||||
private static (DefCatalog Catalog, MapLayout Map) Vanilla()
|
||||
{
|
||||
var root = Path.Combine(AppContext.BaseDirectory, "vanilla");
|
||||
|
||||
Reference in New Issue
Block a user