feat: подтянул занятость из Modeus

backend/UniVerse.Infrastructure/Data/Configurations/LectureConfiguration.cs

@@ -22,6 +22,7 @@ public class LectureConfiguration : IEntityTypeConfiguration<Lecture>
         builder.Property(l => l.EndsAt).HasColumnName("ends_at");
         builder.Property(l => l.IsOpen).HasColumnName("is_open").HasDefaultValue(true);
         builder.Property(l => l.MaxEnrollments).HasColumnName("max_enrollments").HasDefaultValue(0);
+        builder.Property(l => l.MandatoryAttendeesCount).HasColumnName("mandatory_attendees_count").HasDefaultValue(0);
         builder.Property(l => l.ExternalId).HasColumnName("external_id").HasMaxLength(255);
         builder.Property(l => l.OnlineUrl).HasColumnName("online_url").HasMaxLength(500);
         builder.Property(l => l.CreatedAt).HasColumnName("created_at").HasDefaultValueSql("NOW()");

backend/UniVerse.Infrastructure/ExternalServices/ModeusApiClient.cs

@@ -42,12 +42,11 @@ public class ModeusApiClient : IModeusApiClient
         AddNonEmpty(body, "curriculumId", request.CurriculumId);
         AddNonEmpty(body, "typeId", request.TypeId);
 
-        var response = await _http.PostAsJsonAsync("/api/proxy/events/search", body);
         var requestJson = JsonSerializer.Serialize(body);
-        await EnsureSuccessAsync(response, "Modeus events search",
-            BuildEventsRequestSummary(requestJson));
-        return await ReadJsonAsync<ModeusEventsResponse>(response, "Modeus events search",
-            BuildEventsRequestSummary(requestJson))
+        var requestSummary = $"POST /api/ictis?includeCounts=true. Request JSON: {requestJson}";
+        var response = await _http.PostAsJsonAsync("/api/ictis?includeCounts=true", body);
+        await EnsureSuccessAsync(response, "ICTIS events search", requestSummary);
+        return await ReadJsonAsync<ModeusEventsResponse>(response, "ICTIS events search", requestSummary)
             ?? new ModeusEventsResponse();
     }
 
@@ -98,8 +97,6 @@ public class ModeusApiClient : IModeusApiClient
             response.StatusCode);
     }
 
-    private static string BuildEventsRequestSummary(string requestJson) => $"Request JSON: {requestJson}";
-
     private static void AddNonEmpty<T>(
         IDictionary<string, object?> body,
         string key,

backend/UniVerse.Infrastructure/Migrations/20260530105758_MandatoryAttendeesCount.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace UniVerse.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class MandatoryAttendeesCount : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "mandatory_attendees_count",
+                table: "lectures",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "mandatory_attendees_count",
+                table: "lectures");
+        }
+    }
+}

backend/UniVerse.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace UniVerse.Infrastructure.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("ProductVersion", "10.0.8")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "coin_transaction_type", "coin_transaction_type", new[] { "review_reward", "achievement_reward", "attendance_reward", "admin_adjustment" });
@@ -250,6 +250,12 @@ namespace UniVerse.Infrastructure.Migrations
                         .HasColumnType("integer")
                         .HasColumnName("location_id");
 
+                    b.Property<int>("MandatoryAttendeesCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("mandatory_attendees_count");
+
                     b.Property<int>("MaxEnrollments")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("integer")

backend/UniVerse.Infrastructure/Services/LectureService.cs

@@ -122,7 +122,8 @@ public class LectureService : ILectureService
             .FirstOrDefaultAsync(l => l.Id == lectureId) ?? throw new NotFoundException("Lecture", lectureId);
         var user = await _db.Users.FindAsync(userId) ?? throw new NotFoundException("User", userId);
         if (!lecture.IsOpen) throw new ConflictException("Lecture is not open for enrollment.");
-        if (lecture.MaxEnrollments > 0 && lecture.Enrollments.Count >= lecture.MaxEnrollments)
+        var occupiedSeatsCount = Math.Max(0, lecture.MandatoryAttendeesCount) + lecture.Enrollments.Count;
+        if (lecture.MaxEnrollments > 0 && occupiedSeatsCount >= lecture.MaxEnrollments)
             throw new ConflictException("Lecture is full.");
         if (lecture.Enrollments.Any(e => e.UserId == userId))
             throw new ConflictException("Already enrolled.");

backend/UniVerse.Infrastructure/Services/ScheduleSyncService.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using System.Text.Json;
 using UniVerse.Application.DTOs.Sync;
 using UniVerse.Application.Interfaces;
 using UniVerse.Domain.Entities;
@@ -55,6 +54,7 @@ public class ScheduleSyncService : IScheduleSyncService
                 }
 
                 var lectureCapacity = maxEnrollments ?? GetEventTeamSize(events, ev.Id) ?? 0;
+                var mandatoryAttendeesCount = GetMandatoryAttendeesCount(ev.IctisStats);
                 var startsAt = EnsureUtc(ev.StartsAt);
                 var endsAt = EnsureUtc(ev.EndsAt);
 
@@ -68,6 +68,7 @@ public class ScheduleSyncService : IScheduleSyncService
                     existing.LocationId = location?.Id;
                     existing.TeacherId = teacher?.Id;
                     existing.MaxEnrollments = lectureCapacity;
+                    existing.MandatoryAttendeesCount = mandatoryAttendeesCount;
                     existing.UpdatedAt = DateTime.UtcNow;
                     updated++;
                 }
@@ -91,7 +92,8 @@ public class ScheduleSyncService : IScheduleSyncService
                         ExternalId = ev.Id,
                         StartsAt = startsAt,
                         EndsAt = endsAt,
-                        MaxEnrollments = lectureCapacity
+                        MaxEnrollments = lectureCapacity,
+                        MandatoryAttendeesCount = mandatoryAttendeesCount
                     });
                     created++;
                 }
@@ -111,7 +113,7 @@ public class ScheduleSyncService : IScheduleSyncService
                 updated,
                 skipped,
                 [
-                    $"requestJson={BuildScheduleRequestJson(request)}",
+                    "endpoint=POST /api/ictis?includeCounts=true",
                     $"timeMin={request.TimeMin:O}",
                     $"timeMax={request.TimeMax:O}"
                 ]));
@@ -443,6 +445,9 @@ public class ScheduleSyncService : IScheduleSyncService
     private static int? NormalizeCapacity(int? capacity) =>
         capacity is > 0 ? capacity : null;
 
+    private static int GetMandatoryAttendeesCount(ModeusIctisStats? stats) =>
+        Math.Max(0, stats?.StudentCount ?? 0) + Math.Max(0, stats?.TeacherCount ?? 0);
+
     private static string BuildModeusTeacherEmail(string personId) =>
         $"modeus-{personId}@modeus.local".ToLowerInvariant();
 
@@ -488,37 +493,6 @@ public class ScheduleSyncService : IScheduleSyncService
         return details;
     }
 
-    private static string BuildScheduleRequestJson(SyncScheduleRequest request)
-    {
-        var body = new Dictionary<string, object?>
-        {
-            ["size"] = request.Size is > 0 ? request.Size.Value : 900,
-            ["timeMin"] = request.TimeMin,
-            ["timeMax"] = request.TimeMax
-        };
-
-        AddNonEmpty(body, "roomId", request.RoomId);
-        AddNonEmpty(body, "attendeePersonId", request.AttendeePersonId);
-        AddNonEmpty(body, "courseUnitRealizationId", request.CourseUnitRealizationId);
-        AddNonEmpty(body, "cycleRealizationId", request.CycleRealizationId);
-        AddNonEmpty(body, "specialtyCode", request.SpecialtyCode);
-        AddNonEmpty(body, "learningStartYear", request.LearningStartYear);
-        AddNonEmpty(body, "profileName", request.ProfileName);
-        AddNonEmpty(body, "curriculumId", request.CurriculumId);
-        AddNonEmpty(body, "typeId", request.TypeId);
-
-        return JsonSerializer.Serialize(body);
-    }
-
-    private static void AddNonEmpty<T>(
-        IDictionary<string, object?> body,
-        string key,
-        IReadOnlyList<T>? values)
-    {
-        if (values is { Count: > 0 })
-            body[key] = values;
-    }
-
     private static string? GetHrefId(string? href)
     {
         if (string.IsNullOrWhiteSpace(href))