Zuev/magistr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправил id дисциплины

Browse Source
This commit is contained in:
ProstoDenya01
2026-02-25 23:13:49 +03:00
parent 678cf94ad3
commit 007b4fb619
6 changed files with 265 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/com/magistr/app/controller/TestController.java
View File

@@ -28,7 +28,7 @@ public class TestController {
if (request.getGroupId() == null || request.getGroupId() == 0) {
return ResponseEntity.badRequest().body(Map.of("message", "ID группы обязателен"));
}
if (request.getDisciplineId() == null || request.getDisciplineId() == 0) {
if (request.getLessonTypeId() == null || request.getLessonTypeId() == 0) {
return ResponseEntity.badRequest().body(Map.of("message", "ID предмета обязателен"));
}
if (request.getDay() == null || request.getDay().isBlank()) {
@@ -43,7 +43,7 @@ public class TestController {
Lesson lesson = new Lesson();
lesson.setTeacherId(request.getTeacherId());
lesson.setDisciplineId(request.getDisciplineId());
lesson.setLessonTypeId(request.getLessonTypeId());
lesson.setGroupId(request.getGroupId());
lesson.setDay(request.getDay());
lesson.setWeek(request.getWeek());
@@ -56,7 +56,7 @@ public class TestController {
@GetMapping
public List<LessonResponse> getAllLessons() {
return lessonRepository.findAll().stream()
.map(l -> new LessonResponse(l.getId(), l.getTeacherId(), l.getDisciplineId(), l.getDay(), l.getWeek(), l.getTime()))
.map(l -> new LessonResponse(l.getId(), l.getTeacherId(), l.getLessonTypeId(), l.getDay(), l.getWeek(), l.getTime()))
.toList();
}

10
backend/src/main/java/com/magistr/app/dto/CreateLessonRequest.java
View File

@@ -4,7 +4,7 @@ public class CreateLessonRequest {
private Long teacherId;
private Long groupId;
private Long disciplineId;
private Long lessonTypeId;
private String day;
private String week;
private String time;
@@ -28,12 +28,12 @@ public class CreateLessonRequest {
this.groupId = groupId;
}
public Long getDisciplineId() {
return disciplineId;
public Long getLessonTypeId() {
return lessonTypeId;
}
public void setDisciplineId(Long disciplineId) {
this.disciplineId= disciplineId;
public void setLessonTypeId(Long lessonTypeId) {
this.lessonTypeId= lessonTypeId;
}
public String getDay() {

18
backend/src/main/java/com/magistr/app/dto/LessonResponse.java
View File

@@ -5,7 +5,7 @@ public class LessonResponse {
private Long id;
private Long teacherId;
private Long groupId;
private Long disciplineId;
private Long lessonTypeId;
private String day;
private String week;
private String time;
@@ -13,17 +13,17 @@ public class LessonResponse {
public LessonResponse() {
}
public LessonResponse(Long disciplineId, String day, String week, String time) {
this.disciplineId = disciplineId;
public LessonResponse(Long lessonTypeId, String day, String week, String time) {
this.lessonTypeId = lessonTypeId;
this.day = day;
this.week = week;
this.time = time;
}
public LessonResponse(Long id, Long teacherId, Long disciplineId, String day, String week, String time) {
public LessonResponse(Long id, Long teacherId, Long lessonTypeId, String day, String week, String time) {
this.id = id;
this.teacherId = teacherId;
this.disciplineId = disciplineId;
this.lessonTypeId = lessonTypeId;
this.day = day;
this.week = week;
this.time = time;
@@ -53,12 +53,12 @@ public class LessonResponse {
this.groupId = groupId;
}
public Long getDisciplineId() {
return disciplineId;
public Long getLessonTypeId() {
return lessonTypeId;
}
public void setDisciplineId(Long disciplineId) {
this.disciplineId = disciplineId;
public void setLessonTypeId(Long lessonTypeId) {
this.lessonTypeId = lessonTypeId;
}
public String getDay() {

12
backend/src/main/java/com/magistr/app/model/Lesson.java
View File

@@ -16,8 +16,8 @@ public class Lesson {
@Column(name = "group_id", nullable = false)
private Long groupId;
@Column(name = "discipline_id", nullable = false)
private Long disciplineId;
@Column(name = "lesson_type_id", nullable = false)
private Long lessonTypeId;
@Column(name = "day", nullable = false, length = 255)
private String day;
@@ -55,12 +55,12 @@ public class Lesson {
this.groupId = groupId;
}
public Long getDisciplineId() {
return disciplineId;
public Long getLessonTypeId() {
return lessonTypeId;
}
public void setDisciplineId(Long disciplineId) {
this.disciplineId = disciplineId;
public void setLessonTypeId(Long lessonTypeId) {
this.lessonTypeId = lessonTypeId;
}
public String getDay() {

2
backend/src/main/java/com/magistr/app/repository/LessonRepository.java
View File

@@ -7,5 +7,5 @@ import java.util.Optional;
public interface LessonRepository extends JpaRepository<Lesson, Long> {
Optional<Lesson> findByDisciplineId(Long disciplineId);
Optional<Lesson> findByLessonTypeId(Long lessonTypeId);
}