Manuellen WebUntis-Abgleich für Unterrichtsnummern und Stundenplan ergänzen
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
This commit is contained in:
1 parent
d9eac0d1d2
commit
f56caced32
10 files changed
+273
-24
No files matched your search
@@ -273,6 +273,42 @@ public sealed partial class WebUntisClient : IAsyncDisposable
|
||||
Entities(entry, "ro"), entry.Clone())).ToList();
|
||||
}, cancellationToken);
|
||||
|
||||
/// <summary>Unterrichtsnummern des Wochenstundenplans für den manuell ausgelösten Abgleich.
|
||||
/// Die REST-Grid-IDs sind Perioden-IDs; erst dieser Endpunkt liefert die zugehörige lsid.</summary>
|
||||
public Task<IReadOnlyDictionary<int, int>> GetWeeklyLessonIdsAsync(int teacherId, DateOnly date,
|
||||
CancellationToken cancellationToken) => WithSessionAsync(async sessionId =>
|
||||
{
|
||||
var configuration = GetConfiguration();
|
||||
using var request = new HttpRequestMessage(HttpMethod.Get,
|
||||
$"https://{configuration.Host}/WebUntis/api/public/timetable/weekly/data" +
|
||||
$"?elementType=2&elementId={teacherId}&date={date:yyyy-MM-dd}&formatId=3");
|
||||
ApplyBrowserHeaders(request, configuration.Host);
|
||||
request.Headers.Add("Cookie", SessionCookie(sessionId));
|
||||
using var response = await SendAsync(request, TimeSpan.FromSeconds(20), cancellationToken);
|
||||
var payload = await ReadJsonAsync(response, cancellationToken);
|
||||
if (!response.IsSuccessStatusCode ||
|
||||
!TryProperty(payload, "data", out var data) || !TryProperty(data, "result", out var result) ||
|
||||
!TryProperty(result, "data", out var timetable) ||
|
||||
!TryProperty(timetable, "elementPeriods", out var elementPeriods) ||
|
||||
elementPeriods.ValueKind != JsonValueKind.Object)
|
||||
throw new WebUntisException("WebUntis hat keine gültigen Unterrichtsnummern geliefert.");
|
||||
var ids = new Dictionary<int, int>();
|
||||
foreach (var element in elementPeriods.EnumerateObject())
|
||||
{
|
||||
if (element.Value.ValueKind != JsonValueKind.Array)
|
||||
throw new WebUntisException("WebUntis hat ungültige Wochenstundenplan-Daten geliefert.");
|
||||
foreach (var period in element.Value.EnumerateArray())
|
||||
{
|
||||
var periodId = RequiredInt(period, "id");
|
||||
if (OptionalInt(period, "lessonId") is not { } lessonId || lessonId <= 0) continue;
|
||||
if (ids.TryGetValue(periodId, out var existing) && existing != lessonId)
|
||||
throw new WebUntisException("WebUntis liefert widersprüchliche Unterrichtsnummern.");
|
||||
ids[periodId] = lessonId;
|
||||
}
|
||||
}
|
||||
return (IReadOnlyDictionary<int, int>)ids;
|
||||
}, cancellationToken);
|
||||
|
||||
/// <summary>Ruft den neuen, von der WebUntis-Weboberfläche verwendeten Stundenplan ab. Der
|
||||
/// kurzlebige Bearer wird aus der vorhandenen JSON-RPC-Sitzung erzeugt und nie persistiert.</summary>
|
||||
public Task<IReadOnlyList<UntisTimetableGridEntry>> GetTimetableGridAsync(int teacherId, int schoolYearId,
|
||||
|
||||
Reference in new issue
Block a user