начало работы построения динамического расписания и документация

2026-04-29 15:42:05 +03:00
parent 813e81be70
commit 8f71b9b2b5
43 changed files with 3894 additions and 457 deletions
--- a/backend/src/main/resources/db/migration/V1__init.sql
+++ b/backend/src/main/resources/db/migration/V1__init.sql
@@ -210,7 +210,227 @@ CREATE TABLE IF NOT EXISTS teacher_lesson_types (
 );

 -- ==========================================
-- Основная таблица Расписания (Lessons)
+-- Динамическое расписание: календарь, слоты и правила
+-- ==========================================
+
+CREATE TABLE IF NOT EXISTS time_slots (
+    id BIGSERIAL PRIMARY KEY,
+    order_number INT NOT NULL,
+    start_time TIME NOT NULL,
+    end_time TIME NOT NULL,
+    duration_minutes INT NOT NULL,
+    CONSTRAINT chk_time_slots_order_positive CHECK (order_number > 0),
+    CONSTRAINT chk_time_slots_time_range CHECK (start_time < end_time),
+    CONSTRAINT chk_time_slots_duration_positive CHECK (duration_minutes > 0),
+    CONSTRAINT uq_time_slots_order UNIQUE (order_number),
+    CONSTRAINT uq_time_slots_range UNIQUE (start_time, end_time)
+);
+
+INSERT INTO time_slots (order_number, start_time, end_time, duration_minutes) VALUES
+    (1, '08:00', '09:30', 90),
+    (2, '09:40', '11:10', 90),
+    (3, '11:40', '13:10', 90),
+    (4, '13:20', '14:50', 90),
+    (5, '15:00', '16:30', 90),
+    (6, '16:50', '18:20', 90),
+    (7, '18:30', '20:00', 90)
+ON CONFLICT (start_time, end_time) DO NOTHING;
+
+CREATE TABLE IF NOT EXISTS academic_years (
+    id BIGSERIAL PRIMARY KEY,
+    title VARCHAR(20) NOT NULL UNIQUE,
+    start_date DATE NOT NULL,
+    end_date DATE NOT NULL,
+    CONSTRAINT chk_academic_years_dates CHECK (start_date <= end_date)
+);
+
+INSERT INTO academic_years (title, start_date, end_date) VALUES
+    ('2024-2025', '2024-09-01', '2025-06-30'),
+    ('2025-2026', '2025-09-01', '2026-06-30')
+ON CONFLICT (title) DO NOTHING;
+
+CREATE TABLE IF NOT EXISTS semesters (
+    id BIGSERIAL PRIMARY KEY,
+    academic_year_id BIGINT NOT NULL REFERENCES academic_years(id) ON DELETE CASCADE,
+    semester_type VARCHAR(20) NOT NULL,
+    start_date DATE NOT NULL,
+    end_date DATE NOT NULL,
+    CONSTRAINT chk_semesters_type CHECK (semester_type IN ('autumn', 'spring')),
+    CONSTRAINT chk_semesters_dates CHECK (start_date <= end_date),
+    CONSTRAINT uq_semesters_year_type UNIQUE (academic_year_id, semester_type)
+);
+
+INSERT INTO semesters (academic_year_id, semester_type, start_date, end_date)
+SELECT id, 'autumn', start_date, MAKE_DATE(SPLIT_PART(title, '-', 2)::INT, 1, 31)
+FROM academic_years
+ON CONFLICT (academic_year_id, semester_type) DO NOTHING;
+
+INSERT INTO semesters (academic_year_id, semester_type, start_date, end_date)
+SELECT id, 'spring', MAKE_DATE(SPLIT_PART(title, '-', 2)::INT, 2, 1), end_date
+FROM academic_years
+ON CONFLICT (academic_year_id, semester_type) DO NOTHING;
+
+CREATE INDEX IF NOT EXISTS idx_semesters_dates ON semesters(start_date, end_date);
+
+CREATE TABLE IF NOT EXISTS holidays (
+    id BIGSERIAL PRIMARY KEY,
+    date DATE NOT NULL,
+    academic_year_id BIGINT NOT NULL REFERENCES academic_years(id) ON DELETE CASCADE,
+    description VARCHAR(255),
+    CONSTRAINT uq_holidays_year_date UNIQUE (academic_year_id, date)
+);
+
+CREATE INDEX IF NOT EXISTS idx_holidays_date ON holidays(date);
+
+CREATE TABLE IF NOT EXISTS academic_calendar_matrix (
+    id BIGSERIAL PRIMARY KEY,
+    semester_id BIGINT NOT NULL REFERENCES semesters(id) ON DELETE CASCADE,
+    course_number INT NOT NULL,
+    specialty_id BIGINT NOT NULL REFERENCES specialties(id),
+    week_number INT NOT NULL,
+    activity_type VARCHAR(20) NOT NULL,
+    CONSTRAINT chk_calendar_course_positive CHECK (course_number > 0),
+    CONSTRAINT chk_calendar_week_positive CHECK (week_number > 0),
+    CONSTRAINT chk_calendar_activity_type CHECK (activity_type IN ('THEORY', 'EXAM', 'VACATION', 'PRACTICE')),
+    CONSTRAINT uq_calendar_matrix UNIQUE (semester_id, course_number, specialty_id, week_number)
+);
+
+CREATE INDEX IF NOT EXISTS idx_calendar_lookup
+    ON academic_calendar_matrix(semester_id, course_number, specialty_id, week_number);
+
+INSERT INTO academic_calendar_matrix (semester_id, course_number, specialty_id, week_number, activity_type)
+SELECT
+    s.id,
+    SPLIT_PART(ay.title, '-', 1)::INT - sg.year_start_study + 1 AS course_number,
+    sg.specialty_code AS specialty_id,
+    weeks.week_number,
+    'THEORY'
+FROM semesters s
+JOIN academic_years ay ON ay.id = s.academic_year_id
+CROSS JOIN student_groups sg
+CROSS JOIN GENERATE_SERIES(1, 22) AS weeks(week_number)
+WHERE SPLIT_PART(ay.title, '-', 1)::INT - sg.year_start_study + 1 > 0
+ON CONFLICT (semester_id, course_number, specialty_id, week_number) DO NOTHING;
+
+CREATE TABLE IF NOT EXISTS schedule_rules (
+    id BIGSERIAL PRIMARY KEY,
+    subject_id BIGINT NOT NULL REFERENCES subjects(id),
+    semester_id BIGINT NOT NULL REFERENCES semesters(id) ON DELETE CASCADE,
+    active_from_date DATE NOT NULL,
+    total_academic_hours INT NOT NULL,
+    CONSTRAINT chk_schedule_rules_hours_positive CHECK (total_academic_hours > 0)
+);
+
+CREATE INDEX IF NOT EXISTS idx_schedule_rules_semester ON schedule_rules(semester_id);
+CREATE INDEX IF NOT EXISTS idx_schedule_rules_subject ON schedule_rules(subject_id);
+
+CREATE TABLE IF NOT EXISTS schedule_rule_groups (
+    schedule_rule_id BIGINT NOT NULL REFERENCES schedule_rules(id) ON DELETE CASCADE,
+    group_id BIGINT NOT NULL REFERENCES student_groups(id) ON DELETE CASCADE,
+    PRIMARY KEY (schedule_rule_id, group_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_schedule_rule_groups_group ON schedule_rule_groups(group_id);
+
+CREATE TABLE IF NOT EXISTS schedule_rule_slots (
+    id BIGSERIAL PRIMARY KEY,
+    schedule_rule_id BIGINT NOT NULL REFERENCES schedule_rules(id) ON DELETE CASCADE,
+    day_of_week INT NOT NULL,
+    parity VARCHAR(10) NOT NULL,
+    time_slot_id BIGINT NOT NULL REFERENCES time_slots(id),
+    subgroup_id BIGINT NULL REFERENCES subgroups(id) ON DELETE SET NULL,
+    teacher_id BIGINT NOT NULL REFERENCES users(id),
+    classroom_id BIGINT NOT NULL REFERENCES classrooms(id),
+    lesson_type_id BIGINT NOT NULL REFERENCES lesson_types(id),
+    lesson_format VARCHAR(30) NOT NULL,
+    CONSTRAINT chk_schedule_rule_slots_day CHECK (day_of_week BETWEEN 1 AND 7),
+    CONSTRAINT chk_schedule_rule_slots_parity CHECK (parity IN ('BOTH', 'EVEN', 'ODD')),
+    CONSTRAINT chk_schedule_rule_slots_format CHECK (lesson_format IN ('Очно', 'Онлайн'))
+);
+
+CREATE INDEX IF NOT EXISTS idx_schedule_rule_slots_rule ON schedule_rule_slots(schedule_rule_id);
+CREATE INDEX IF NOT EXISTS idx_schedule_rule_slots_teacher ON schedule_rule_slots(teacher_id);
+CREATE INDEX IF NOT EXISTS idx_schedule_rule_slots_classroom ON schedule_rule_slots(classroom_id);
+CREATE INDEX IF NOT EXISTS idx_schedule_rule_slots_time ON schedule_rule_slots(day_of_week, parity, time_slot_id);
+
+CREATE TEMP TABLE tmp_default_rules AS
+SELECT
+    NEXTVAL(PG_GET_SERIAL_SEQUENCE('schedule_rules', 'id')) AS schedule_rule_id,
+    rule_key,
+    subject_id,
+    semester_id,
+    active_from_date,
+    total_academic_hours
+FROM (
+    SELECT
+        data.rule_key,
+        subj.id AS subject_id,
+        sem.id AS semester_id,
+        data.active_from_date,
+        data.total_academic_hours
+    FROM (VALUES
+        ('stream_math', 'Высшая математика', '2025-2026', 'spring', DATE '2026-02-02', 72),
+        ('ivt_informatics_lab', 'Информатика', '2025-2026', 'spring', DATE '2026-02-02', 72),
+        ('ivt_databases_practice', 'Базы данных', '2025-2026', 'spring', DATE '2026-02-02', 72),
+        ('ib_philosophy', 'Философия', '2025-2026', 'spring', DATE '2026-02-02', 54)
+    ) AS data(rule_key, subject_name, year_title, semester_type, active_from_date, total_academic_hours)
+    JOIN subjects subj ON subj.name = data.subject_name
+    JOIN academic_years ay ON ay.title = data.year_title
+    JOIN semesters sem ON sem.academic_year_id = ay.id AND sem.semester_type = data.semester_type
+) prepared_rules;
+
+INSERT INTO schedule_rules (id, subject_id, semester_id, active_from_date, total_academic_hours)
+SELECT schedule_rule_id, subject_id, semester_id, active_from_date, total_academic_hours
+FROM tmp_default_rules;
+
+INSERT INTO schedule_rule_groups (schedule_rule_id, group_id)
+SELECT
+    rules.schedule_rule_id,
+    sg.id
+FROM (VALUES
+    ('stream_math', 'ИВТ-21-1'),
+    ('stream_math', 'ИБ-41м'),
+    ('ivt_informatics_lab', 'ИВТ-21-1'),
+    ('ivt_databases_practice', 'ИВТ-21-1'),
+    ('ib_philosophy', 'ИБ-41м')
+) AS data(rule_key, group_name)
+JOIN tmp_default_rules rules ON rules.rule_key = data.rule_key
+JOIN student_groups sg ON sg.name = data.group_name
+ON CONFLICT DO NOTHING;
+
+INSERT INTO schedule_rule_slots (
+    schedule_rule_id,
+    day_of_week,
+    parity,
+    time_slot_id,
+    teacher_id,
+    classroom_id,
+    lesson_type_id,
+    lesson_format
+)
+SELECT
+    rules.schedule_rule_id,
+    data.day_of_week,
+    data.parity,
+    ts.id,
+    teacher.id,
+    classroom.id,
+    lt.id,
+    data.lesson_format
+FROM (VALUES
+    ('stream_math', 1, 'BOTH', 3, 'Тестовый преподаватель', '101 Ленинская', 'Лекция', 'Очно'),
+    ('ivt_informatics_lab', 3, 'BOTH', 1, 'Тестовый преподаватель', '202 IT Lab', 'Лабораторная работа', 'Очно'),
+    ('ivt_databases_practice', 5, 'EVEN', 5, 'Тестовый преподаватель', '303 Обычная', 'Практика', 'Онлайн'),
+    ('ib_philosophy', 2, 'ODD', 2, 'Тестовый преподаватель', '101 Ленинская', 'Лекция', 'Онлайн')
+) AS data(rule_key, day_of_week, parity, time_slot_order, teacher_username, classroom_name, lesson_type_name, lesson_format)
+JOIN tmp_default_rules rules ON rules.rule_key = data.rule_key
+JOIN time_slots ts ON ts.order_number = data.time_slot_order
+JOIN users teacher ON teacher.username = data.teacher_username
+JOIN classrooms classroom ON classroom.name = data.classroom_name
+JOIN lesson_types lt ON lt.name = data.lesson_type_name;
+
+-- ==========================================
+-- Временные таблицы старой модели. Будут удалены после очистки старого кода.
 -- ==========================================
 CREATE TABLE IF NOT EXISTS lessons (
    id BIGSERIAL PRIMARY KEY,
@@ -225,17 +445,6 @@ CREATE TABLE IF NOT EXISTS lessons (
    time VARCHAR(255) NOT NULL
 );

-INSERT INTO lessons (teacher_id, group_id, subject_id, lesson_format, type_lesson, classroom_id, day, week, time) VALUES
-    (2, 1, 1, 'Очно', 'Лекция', 1, 'Понедельник', 'Верхняя', '11:40 - 13:10'),
-    (1, 1, 2, 'Онлайн', 'Практическая работа', 2, 'Вторник', 'Нижняя', '15:00 - 16:30'),
-    (2, 1, 3, 'Очно', 'Лабораторная работа', 3, 'Среда', 'Верхняя', '8:00 - 9:30'),
-    (1, 1, 4, 'Онлайн', 'Лекция', 1, 'Четверг', 'Нижняя', '11:40 - 13:10'),
-    (2, 1, 5, 'Очно', 'Практическая работа', 2, 'Пятница', 'Верхняя', '15:00 - 16:30'),
-    (1, 1, 3, 'Онлайн', 'Лабораторная работа', 3, 'Суббота', 'Нижняя', '8:00 - 9:30');
-
-- ===============================
-- Создание таблицы данных расписания (schedule_data)
-- ===============================
 CREATE TABLE IF NOT EXISTS schedule_data (
    id BIGSERIAL PRIMARY KEY,
    department_id BIGINT NOT NULL REFERENCES departments(id),
@@ -249,18 +458,6 @@ CREATE TABLE IF NOT EXISTS schedule_data (
    period VARCHAR(255) NOT NULL
 );

-INSERT INTO schedule_data (department_id, group_id, subjects_id, lesson_type_id, number_of_hours, is_division, teacher_id, semester_type, period)
-VALUES (1, 1, 1, 3, 2, true, 1, 'autumn', '2024-2025'),
-       (2, 2, 3, 2, 1, false, 2, 'spring', '2025-2026'),
-       (3, 1, 2, 1, 3, true, 1, 'autumn', '2023-2024'),
-       (2, 2, 3, 2, 1, false, 2, 'spring', '2025-2026'),
-       (2, 2, 3, 2, 1, false, 2, 'spring', '2025-2026'),
-       (2, 2, 3, 2, 1, false, 2, 'spring', '2025-2026'),
-       (1, 1, 1, 1, 2, true, 2, 'autumn', '2024-2025'),
-       (1, 2, 2, 3, 4, false, 2, 'autumn', '2024-2025'),
-       (1, 1, 4, 2, 1, false, 1, 'autumn', '2024-2025'),
-       (1, 2, 5, 1, 7, true, 1, 'autumn', '2024-2025');
-
 -- ==========================================
 -- Функция обновления timestamp
 -- ==========================================
@@ -281,10 +478,18 @@ CREATE TRIGGER update_users_updated_at
 -- Комментарии к таблицам и полям (для документации)
 -- ==========================================
 COMMENT ON TABLE users IS 'Пользователи системы (студенты, преподаватели, администраторы)';
-COMMENT ON TABLE lessons IS 'Основное расписание занятий';
+COMMENT ON TABLE lessons IS 'Временная таблица старой модели расписания до удаления старого кода';
 COMMENT ON TABLE departments IS 'Кафедры';
 COMMENT ON TABLE specialties IS 'Специальности';
-COMMENT ON TABLE schedule_data IS 'Данные к составлению расписания';
+COMMENT ON TABLE schedule_data IS 'Временная таблица старой модели плановой нагрузки до удаления старого кода';
+COMMENT ON TABLE time_slots IS 'Настраиваемая сетка временных слотов занятий';
+COMMENT ON TABLE academic_years IS 'Учебные годы';
+COMMENT ON TABLE semesters IS 'Семестры учебного года';
+COMMENT ON TABLE holidays IS 'Праздники и неучебные даты';
+COMMENT ON TABLE academic_calendar_matrix IS 'Матрица учебного графика по курсу, специальности и неделе';
+COMMENT ON TABLE schedule_rules IS 'Правила динамической генерации расписания';
+COMMENT ON TABLE schedule_rule_groups IS 'Привязка правил расписания к учебным группам';
+COMMENT ON TABLE schedule_rule_slots IS 'Слоты проведения занятий внутри правила расписания';
 COMMENT ON COLUMN schedule_data.department_id IS 'Идентификатор кафедры';
 COMMENT ON COLUMN schedule_data.group_id IS 'Идентификатор группы';
 COMMENT ON COLUMN schedule_data.subjects_id IS 'Идентификатор предмета';
@@ -324,6 +529,8 @@ COMMENT ON COLUMN student_groups.name IS 'Название группы';
 COMMENT ON COLUMN student_groups.group_size IS 'Количество студентов';
 COMMENT ON COLUMN student_groups.education_form_id IS 'ID формы обучения, к которой относится группа';
 COMMENT ON COLUMN student_groups.department_id IS 'ID кафедры';
+COMMENT ON COLUMN student_groups.specialty_code IS 'ID специальности';
+COMMENT ON COLUMN student_groups.year_start_study IS 'Год начала обучения';
 COMMENT ON COLUMN student_groups.created_at IS 'Дата и время создания';

 COMMENT ON COLUMN subgroups.id IS 'ID подгруппы';
@@ -388,4 +595,4 @@ COMMENT ON COLUMN specialties.specialty_code IS 'Код специальност

 COMMENT ON COLUMN teacher_lesson_types.user_id IS 'ID преподавателя';
 COMMENT ON COLUMN teacher_lesson_types.subject_id IS 'ID предмета';
-COMMENT ON COLUMN teacher_lesson_types.lesson_type_id IS 'ID типа занятия';
+COMMENT ON COLUMN teacher_lesson_types.lesson_type_id IS 'ID типа занятия';