поправил вид сетки и прочие баги

backend/src/main/java/com/magistr/app/controller/DepartmentWorkspaceController.java

@@ -4,9 +4,11 @@ import com.magistr.app.config.auth.AuthContext;
 import com.magistr.app.config.auth.RequireRoles;
 import com.magistr.app.dto.CreateSubjectRequest;
 import com.magistr.app.dto.SubjectCommentDto;
+import com.magistr.app.dto.UserResponse;
 import com.magistr.app.model.*;
 import com.magistr.app.repository.SubjectCommentRepository;
 import com.magistr.app.repository.SubjectRepository;
+import com.magistr.app.repository.TeacherDepartmentAssignmentRepository;
 import com.magistr.app.repository.UserRepository;
 import com.magistr.app.service.ScheduleQueryService;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +16,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -26,15 +29,18 @@ public class DepartmentWorkspaceController {
     private final SubjectRepository subjectRepository;
     private final SubjectCommentRepository subjectCommentRepository;
     private final UserRepository userRepository;
+    private final TeacherDepartmentAssignmentRepository teacherDepartmentAssignmentRepository;
     private final ScheduleQueryService scheduleQueryService;
 
     public DepartmentWorkspaceController(SubjectRepository subjectRepository,
                                          SubjectCommentRepository subjectCommentRepository,
                                          UserRepository userRepository,
+                                         TeacherDepartmentAssignmentRepository teacherDepartmentAssignmentRepository,
                                          ScheduleQueryService scheduleQueryService) {
         this.subjectRepository = subjectRepository;
         this.subjectCommentRepository = subjectCommentRepository;
         this.userRepository = userRepository;
+        this.teacherDepartmentAssignmentRepository = teacherDepartmentAssignmentRepository;
         this.scheduleQueryService = scheduleQueryService;
     }
 
@@ -109,9 +115,25 @@ public class DepartmentWorkspaceController {
     }
 
     @GetMapping("/teachers")
-    public List<?> getTeachers(@RequestParam(required = false) Long departmentId) {
+    public List<UserResponse> getTeachers(@RequestParam(required = false) Long departmentId) {
         Long effectiveDepartmentId = effectiveDepartmentId(departmentId);
-        return userRepository.findByRoleAndDepartmentIdAndStatusNot(Role.TEACHER, effectiveDepartmentId, LifecycleEntity.STATUS_ARCHIVED);
+        if (effectiveDepartmentId == null) {
+            return userRepository.findByRoleAndStatusNot(Role.TEACHER, LifecycleEntity.STATUS_ARCHIVED).stream()
+                    .map(this::toUserResponse)
+                    .toList();
+        }
+
+        Map<Long, User> teachersById = new LinkedHashMap<>();
+        teacherDepartmentAssignmentRepository.findDepartmentTeachersAtDate(effectiveDepartmentId, LocalDate.now())
+                .stream()
+                .map(TeacherDepartmentAssignment::getTeacher)
+                .filter(User::isActiveRecord)
+                .forEach(teacher -> teachersById.put(teacher.getId(), teacher));
+        userRepository.findByRoleAndDepartmentIdAndStatusNot(Role.TEACHER, effectiveDepartmentId, LifecycleEntity.STATUS_ARCHIVED)
+                .forEach(teacher -> teachersById.putIfAbsent(teacher.getId(), teacher));
+        return teachersById.values().stream()
+                .map(this::toUserResponse)
+                .toList();
     }
 
     @GetMapping("/schedule")
@@ -137,6 +159,19 @@ public class DepartmentWorkspaceController {
         );
     }
 
+    private UserResponse toUserResponse(User user) {
+        UserResponse response = new UserResponse(
+                user.getId(),
+                user.getUsername(),
+                user.getRole().name(),
+                user.getFullName(),
+                user.getJobTitle(),
+                user.getDepartmentId()
+        );
+        response.setStatus(user.getStatus());
+        return response;
+    }
+
     private Long effectiveDepartmentId(Long requestedDepartmentId) {
         var user = AuthContext.getCurrentUser();
         if (user != null && user.role() == Role.DEPARTMENT) {

backend/src/test/java/com/magistr/app/controller/DepartmentWorkspaceControllerTest.java

@@ -2,15 +2,23 @@ package com.magistr.app.controller;
 
 import com.magistr.app.config.auth.AuthContext;
 import com.magistr.app.config.auth.AuthenticatedUser;
+import com.magistr.app.dto.UserResponse;
+import com.magistr.app.model.Department;
+import com.magistr.app.model.LifecycleEntity;
 import com.magistr.app.model.Role;
 import com.magistr.app.model.Subject;
+import com.magistr.app.model.TeacherDepartmentAssignment;
+import com.magistr.app.model.User;
 import com.magistr.app.repository.SubjectCommentRepository;
 import com.magistr.app.repository.SubjectRepository;
+import com.magistr.app.repository.TeacherDepartmentAssignmentRepository;
 import com.magistr.app.repository.UserRepository;
 import com.magistr.app.service.ScheduleQueryService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,6 +43,7 @@ class DepartmentWorkspaceControllerTest {
                 subjectRepository,
                 mock(SubjectCommentRepository.class),
                 mock(UserRepository.class),
+                mock(TeacherDepartmentAssignmentRepository.class),
                 mock(ScheduleQueryService.class)
         );
         AuthContext.setCurrentUser(new AuthenticatedUser(1L, "кафедра", Role.DEPARTMENT, 2L));
@@ -43,4 +52,48 @@ class DepartmentWorkspaceControllerTest {
 
         assertThat(response.getStatusCode().value()).isEqualTo(404);
     }
+
+    @Test
+    void teachersUseAssignmentsAndFallbackWithoutDuplicates() {
+        UserRepository userRepository = mock(UserRepository.class);
+        TeacherDepartmentAssignmentRepository assignmentRepository = mock(TeacherDepartmentAssignmentRepository.class);
+        User assignedTeacher = user(10L, "assigned", "Петров Препод Петрович", 2L);
+        User directTeacher = user(11L, "direct", "Препод Тест Тестович", 1L);
+        when(assignmentRepository.findDepartmentTeachersAtDate(1L, LocalDate.now()))
+                .thenReturn(List.of(assignment(assignedTeacher, 1L)));
+        when(userRepository.findByRoleAndDepartmentIdAndStatusNot(Role.TEACHER, 1L, LifecycleEntity.STATUS_ARCHIVED))
+                .thenReturn(List.of(directTeacher, assignedTeacher));
+        DepartmentWorkspaceController controller = new DepartmentWorkspaceController(
+                mock(SubjectRepository.class),
+                mock(SubjectCommentRepository.class),
+                userRepository,
+                assignmentRepository,
+                mock(ScheduleQueryService.class)
+        );
+
+        List<UserResponse> teachers = controller.getTeachers(1L);
+
+        assertThat(teachers).extracting(UserResponse::getFullName)
+                .containsExactly("Петров Препод Петрович", "Препод Тест Тестович");
+    }
+
+    private TeacherDepartmentAssignment assignment(User teacher, Long departmentId) {
+        Department department = new Department(departmentId, "Кафедра", departmentId);
+        TeacherDepartmentAssignment assignment = new TeacherDepartmentAssignment();
+        assignment.setTeacher(teacher);
+        assignment.setDepartment(department);
+        assignment.setValidFrom(LocalDate.now());
+        return assignment;
+    }
+
+    private User user(Long id, String username, String fullName, Long departmentId) {
+        User user = new User();
+        user.setId(id);
+        user.setUsername(username);
+        user.setRole(Role.TEACHER);
+        user.setFullName(fullName);
+        user.setJobTitle("Доцент");
+        user.setDepartmentId(departmentId);
+        return user;
+    }
 }