Show lesson marks and attendance on the person card.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-21 13:42:37 +03:00
parent 564776883a
commit db6e60929d
18 changed files with 800 additions and 20 deletions
@@ -0,0 +1,126 @@
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace HSchool.AppHost.Tests;
+
+[Collection(AppHostCollection.Name)]
+public class GradebookApiTests(AppHostFixture fixture)
+{
+    private static readonly DateTime Start = new(2012, 4, 3, 6, 0, 0, DateTimeKind.Utc);
+
+    [Fact]
+    public async Task PostAttendanceAndMarks_AreNotAccepted()
+    {
+        using var client = fixture.App.CreateHttpClient("server");
+        await SchoolApiTests.ResetAsync(client);
+        var school = await SchoolApiTests.CreateAsync(client, "Журнал API", Start, seed: 75);
+        var page = await client.GetFromJsonAsync<PeoplePage>(
+            $"/api/schools/{school.Id}/people?role=student&pageSize=1",
+            TestContext.Current.CancellationToken);
+        Assert.NotNull(page);
+        Assert.NotEmpty(page.People);
+        var personId = page.People[0].Id;
+
+        using var markPost = await client.PostAsJsonAsync(
+            $"/api/schools/{school.Id}/people/{personId}/marks",
+            new { subject = "Mathematics", value = 5, period = 1 },
+            TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.NotFound, markPost.StatusCode);
+
+        using var markPut = await client.PutAsJsonAsync(
+            $"/api/schools/{school.Id}/people/{personId}/marks",
+            new { subject = "Mathematics", value = 5, period = 1 },
+            TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.NotFound, markPut.StatusCode);
+
+        using var attendancePost = await client.PostAsJsonAsync(
+            $"/api/schools/{school.Id}/people/{personId}/attendance",
+            new { subject = "Mathematics", status = "absent", period = 1 },
+            TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.NotFound, attendancePost.StatusCode);
+
+        using var attendancePut = await client.PutAsJsonAsync(
+            $"/api/schools/{school.Id}/people/{personId}/attendance",
+            new { subject = "Mathematics", status = "present", period = 1 },
+            TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.NotFound, attendancePut.StatusCode);
+    }
+
+    [Fact]
+    public async Task PeopleList_DoesNotIncludeGradebookFields()
+    {
+        using var client = fixture.App.CreateHttpClient("server");
+        await SchoolApiTests.ResetAsync(client);
+        var school = await SchoolApiTests.CreateAsync(client, "Список без журнала", Start, seed: 75);
+
+        using var response = await client.GetAsync(
+            $"/api/schools/{school.Id}/people?role=student&pageSize=1&lang=ru",
+            TestContext.Current.CancellationToken);
+        response.EnsureSuccessStatusCode();
+        await using var stream = await response.Content.ReadAsStreamAsync(TestContext.Current.CancellationToken);
+        using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: TestContext.Current.CancellationToken);
+        var person = doc.RootElement.GetProperty("people")[0];
+        Assert.False(person.TryGetProperty("lessonMarks", out _));
+        Assert.False(person.TryGetProperty("attendance", out _));
+        Assert.False(person.TryGetProperty("averageMark", out _));
+    }
+
+    [Fact]
+    public async Task PersonCard_IncludesEmptyGradebookArrays()
+    {
+        using var client = fixture.App.CreateHttpClient("server");
+        await SchoolApiTests.ResetAsync(client);
+        var school = await SchoolApiTests.CreateAsync(client, "Карточка журнал", Start, seed: 75);
+        var page = await client.GetFromJsonAsync<PeoplePage>(
+            $"/api/schools/{school.Id}/people?role=student&pageSize=1",
+            TestContext.Current.CancellationToken);
+        Assert.NotNull(page);
+        var personId = page.People[0].Id;
+
+        var card = await client.GetFromJsonAsync<PersonCardDto>(
+            $"/api/schools/{school.Id}/people/{Uri.EscapeDataString(personId)}?lang=ru",
+            TestContext.Current.CancellationToken);
+        Assert.NotNull(card);
+        Assert.NotNull(card!.LessonMarks);
+        Assert.NotNull(card.Attendance);
+        Assert.Empty(card.LessonMarks);
+        Assert.Empty(card.Attendance);
+    }
+
+    [Fact]
+    public async Task Guest_CanReadPersonCardGradebook_ButNotWrite()
+    {
+        using var owner = fixture.App.CreateHttpClient("server");
+        await SchoolApiTests.ResetAsync(owner);
+        var school = await SchoolApiTests.CreateAsync(owner, "Гость журнал", Start, seed: 75);
+        var page = await owner.GetFromJsonAsync<PeoplePage>(
+            $"/api/schools/{school.Id}/people?role=student&pageSize=1",
+            TestContext.Current.CancellationToken);
+        Assert.NotNull(page);
+        var personId = page.People[0].Id;
+
+        using var guest = await SchoolApiTests.CreateIsolatedClientAsync(fixture.App, "GradebookGuest");
+        var card = await guest.GetFromJsonAsync<PersonCardDto>(
+            $"/api/schools/{school.Id}/people/{Uri.EscapeDataString(personId)}?lang=ru",
+            TestContext.Current.CancellationToken);
+        Assert.NotNull(card);
+        Assert.NotNull(card!.LessonMarks);
+        Assert.NotNull(card.Attendance);
+
+        using var write = await guest.PostAsJsonAsync(
+            $"/api/schools/{school.Id}/people/{personId}/marks",
+            new { subject = "Mathematics", value = 5, period = 1 },
+            TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.NotFound, write.StatusCode);
+    }
+
+    private sealed record PeoplePage(IReadOnlyList<PersonRow> People);
+
+    private sealed record PersonRow(string Id);
+
+    private sealed record PersonCardDto(
+        string Id,
+        IReadOnlyList<object> LessonMarks,
+        IReadOnlyList<object> Attendance);
+}
@@ -0,0 +1,120 @@
+using HSchool.Content;
+using HSchool.People;
+using HSchool.Server.Api;
+using HSchool.Server.Game;
+using HSchool.Simulation;
+
+namespace HSchool.Server.Tests;
+
+public class PersonCardReaderGradebookTests
+{
+    private static readonly DateTime Start = new(2012, 4, 3, 9, 0, 0, DateTimeKind.Utc);
+
+    [Fact]
+    public void Card_ReturnsLessonMarksAndAttendanceInSameOrderAsPerson()
+    {
+        var (catalog, map) = Vanilla();
+        var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 75, "Russia", Start);
+        var pupil = roster.People.First(person => person.IsStudent && !person.IsParent);
+        var rules = catalog.BehaviorRules!;
+        var t0 = new DateTime(2012, 4, 3, 10, 0, 0, DateTimeKind.Utc);
+
+        Assert.True(LessonMarkMemory.Record(pupil, "Mathematics", 5, t0, period: 1, rules));
+        Assert.True(LessonMarkMemory.Record(pupil, "Literature", 3, t0.AddHours(1), period: 2, rules));
+        Assert.True(AttendanceMemory.Record(
+            pupil, "Mathematics", AttendanceStatuses.Present, t0, period: 1, rules));
+        Assert.True(AttendanceMemory.Record(
+            pupil, "Literature", AttendanceStatuses.Late, t0.AddHours(1), period: 2, rules));
+        Assert.True(AttendanceMemory.Record(
+            pupil, "History", AttendanceStatuses.Absent, t0.AddHours(2), period: 3, rules));
+
+        var school = School.Create(75, "GradebookCard", Start, catalog, map);
+        using (school)
+        {
+            school.InstallPeople(roster, 75, "Russia", ApplicantPool.Empty);
+            var card = PersonCardReader.Read(school, pupil.Id, "ru");
+            Assert.NotNull(card);
+            Assert.NotNull(card!.LessonMarks);
+            Assert.NotNull(card.Attendance);
+
+            Assert.Equal(
+                pupil.LessonMarks!.Select(row => (row.Subject, row.Value, row.Period)).ToArray(),
+                card.LessonMarks!.Select(row => (row.Subject, row.Value, row.Period)).ToArray());
+            Assert.Equal(5, card.LessonMarks[0].Value);
+            Assert.Equal("Математика", card.LessonMarks[0].SubjectLabel);
+            Assert.Equal(3, card.LessonMarks[1].Value);
+
+            Assert.Equal(
+                pupil.Attendance!.Select(row => (row.Subject, row.Status, row.Period)).ToArray(),
+                card.Attendance!.Select(row => (row.Subject, row.Status, row.Period)).ToArray());
+            Assert.Equal(AttendanceStatuses.Present, card.Attendance[0].Status);
+            Assert.Equal("был", card.Attendance[0].StatusLabel);
+            Assert.Equal(AttendanceStatuses.Late, card.Attendance[1].Status);
+            Assert.Equal("опоздал", card.Attendance[1].StatusLabel);
+            Assert.Equal(AttendanceStatuses.Absent, card.Attendance[2].Status);
+            Assert.Equal("отсутствовал", card.Attendance[2].StatusLabel);
+            Assert.Equal(AbsenceReasons.Truancy, card.Attendance[2].AbsenceReason);
+        }
+    }
+
+    [Fact]
+    public void Staffing_ClassSlot_SummarisesMarksAndAbsences()
+    {
+        var (catalog, map) = Vanilla();
+        var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 75, "Russia", Start);
+        var schoolClass = roster.Classes[0];
+        var pupils = roster.People
+            .Where(person => person.IsStudent
+                && person.ClassId is { } id
+                && id.Equals(schoolClass.Id, StringComparison.Ordinal))
+            .Take(2)
+            .ToArray();
+        Assert.True(pupils.Length >= 2);
+
+        var rules = catalog.BehaviorRules!;
+        var t0 = new DateTime(2012, 4, 3, 10, 0, 0, DateTimeKind.Utc);
+        Assert.True(LessonMarkMemory.Record(pupils[0], "Mathematics", 4, t0, period: 1, rules));
+        Assert.True(LessonMarkMemory.Record(pupils[1], "Mathematics", 2, t0, period: 1, rules));
+        for (var i = 0; i < 3; i++)
+        {
+            Assert.True(AttendanceMemory.Record(
+                pupils[0],
+                "Mathematics",
+                AttendanceStatuses.Absent,
+                t0.AddDays(i),
+                period: 1,
+                rules));
+        }
+
+        var staffing = StaffingMapper.From(roster, ApplicantPool.Empty, catalog, Start, allocated: 100_000, "ru");
+        var slot = Assert.Single(staffing.Classes, row => row.Id == schoolClass.Id);
+        Assert.Equal(3f, slot.AverageMark);
+        Assert.Equal(3, slot.AbsentLessons);
+        Assert.Equal(1, slot.FrequentAbsentees);
+    }
+
+    private static (DefCatalog Catalog, MapLayout Map) Vanilla()
+    {
+        var root = Path.Combine(AppContext.BaseDirectory, "vanilla");
+        Assert.True(Directory.Exists(root), $"Vanilla pack missing at {root}.");
+        var documents = new List<ContentDocument>();
+        foreach (var path in Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories))
+        {
+            if (!path.EndsWith(".jsonc", StringComparison.OrdinalIgnoreCase)
+                && !path.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            documents.Add(new ContentDocument(
+                CatalogLoader.CorePackId,
+                Path.GetRelativePath(root, path).Replace('\\', '/'),
+                File.ReadAllText(path)));
+        }
+
+        var catalog = new CatalogLoader().Load([CatalogLoader.CorePackId], documents);
+        var map = CatalogLoader.LastDefaultMap([CatalogLoader.CorePackId], documents);
+        Assert.NotNull(map);
+        return (catalog, map);
+    }
+}