Изменил метод на получение общего списка занятий. Внёс небольшие правки в FE для странички с расписанием

backend/src/main/java/com/magistr/app/dto/LessonResponse.java

@@ -1,11 +1,19 @@
 package com.magistr.app.dto;
 
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LessonResponse {
 
     private Long id;
     private Long teacherId;
+    private String teacherName;
     private Long groupId;
-    private Long lessonTypeId;
+    private String groupName;
+    private String educationFormName;
+    private Long subjectId;
+    private String subjectName;
     private String day;
     private String week;
     private String time;
@@ -13,20 +21,22 @@ public class LessonResponse {
     public LessonResponse() {
     }
 
-    public LessonResponse(Long id, Long teacherId, Long groupId, Long lessonTypeId, String day, String week, String time) {
+    public LessonResponse(Long id, Long teacherId, Long groupId, Long subjectId, String day, String week, String time) {
         this.id = id;
         this.teacherId = teacherId;
         this.groupId = groupId;
-        this.lessonTypeId = lessonTypeId;
+        this.subjectId = subjectId;
         this.day = day;
         this.week = week;
         this.time = time;
     }
 
-    public LessonResponse(Long id, Long teacherId, Long lessonTypeId, String day, String week, String time) {
+    public LessonResponse(Long id, String teacherName, String groupName, String educationFormName, String subjectName, String day, String week, String time) {
         this.id = id;
-        this.teacherId = teacherId;
-        this.lessonTypeId = lessonTypeId;
+        this.teacherName = teacherName;
+        this.groupName = groupName;
+        this.educationFormName = educationFormName;
+        this.subjectName = subjectName;
         this.day = day;
         this.week = week;
         this.time = time;
@@ -48,6 +58,14 @@ public class LessonResponse {
         this.teacherId = teacherId;
     }
 
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
     public Long getGroupId() {
         return groupId;
     }
@@ -56,12 +74,36 @@ public class LessonResponse {
         this.groupId = groupId;
     }
 
-    public Long getLessonTypeId() {
-        return lessonTypeId;
+    public String getGroupName() {
+        return groupName;
     }
 
-    public void setLessonTypeId(Long lessonTypeId) {
-        this.lessonTypeId = lessonTypeId;
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getEducationFormName() {
+        return educationFormName;
+    }
+
+    public void setEducationFormName(String educationFormName) {
+        this.educationFormName = educationFormName;
+    }
+
+    public Long getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
     }
 
     public String getDay() {