diff --git a/front/src/App.js b/front/src/App.js
index dd59bf8..97904c7 100644
--- a/front/src/App.js
+++ b/front/src/App.js
@@ -14,8 +14,8 @@ function Router(props) {
const routes = [
{ index: true, element: },
{ path: '/', element: , label: 'Сеть Автошкол' },
- { path: '/students', element: , label: 'Студенты' },
{ path: '/drivingSchools', element: , label: 'Автошколы' },
+ { path: '/students', element: , label: 'Студенты' },
{ path: '/categories', element: , label: 'Категории' },
{ path: '/drivingSchool/:id', element: },
];
diff --git a/front/src/components/OneDrivingSchool.jsx b/front/src/components/OneDrivingSchool.jsx
index e6cd4f4..72f2826 100644
--- a/front/src/components/OneDrivingSchool.jsx
+++ b/front/src/components/OneDrivingSchool.jsx
@@ -225,9 +225,9 @@ export default function OneDrivingSchool(props) {
Название: {drivingSchool.name}
Количество студентов: {drivingSchool.countStudents}
-
-
-
+
+
+
diff --git a/front/src/components/commons/Header.jsx b/front/src/components/commons/Header.jsx
index 150a203..479c283 100644
--- a/front/src/components/commons/Header.jsx
+++ b/front/src/components/commons/Header.jsx
@@ -5,7 +5,7 @@ import Navbar from 'react-bootstrap/Navbar';
export default function Header(props) {
return (
-
+
diff --git a/front/src/components/commons/ItemTable.jsx b/front/src/components/commons/ItemTable.jsx
index cf396b9..997d40e 100644
--- a/front/src/components/commons/ItemTable.jsx
+++ b/front/src/components/commons/ItemTable.jsx
@@ -12,7 +12,7 @@ export default function ItemTable(props) {
props.headers.map((header) => {props.item[header.name]} | )
}
{props.isOnlyView ||
-
- | }
+
+ }
}
\ No newline at end of file
diff --git a/src/main/java/ru/ulstu/is/cbapp/controller/DrivingSchoolController.java b/src/main/java/ru/ulstu/is/cbapp/controller/DrivingSchoolController.java
index 13fab2a..fbfe491 100644
--- a/src/main/java/ru/ulstu/is/cbapp/controller/DrivingSchoolController.java
+++ b/src/main/java/ru/ulstu/is/cbapp/controller/DrivingSchoolController.java
@@ -60,9 +60,9 @@ public class DrivingSchoolController {
}
@PutMapping("/{id}/dismiss")
- public StudentDto dismiss(@PathVariable Long id, @RequestParam Long studentId) {
+ public void dismiss(@PathVariable Long id, @RequestParam Long studentId) {
Student e = studentService.findStudent(studentId);
- return new StudentDto(drivingSchoolService.deleteStudent(id, e));
+ drivingSchoolService.deleteStudent(id, e);
}
}
diff --git a/src/main/java/ru/ulstu/is/cbapp/models/DrivingSchool.java b/src/main/java/ru/ulstu/is/cbapp/models/DrivingSchool.java
index 3e4f9c4..86d67fe 100644
--- a/src/main/java/ru/ulstu/is/cbapp/models/DrivingSchool.java
+++ b/src/main/java/ru/ulstu/is/cbapp/models/DrivingSchool.java
@@ -10,7 +10,7 @@ public class DrivingSchool {
private Long Id;
@Column(unique = true)
private String name;
- @OneToMany(mappedBy = "drivingSchool", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @OneToMany(mappedBy = "drivingSchool", cascade = CascadeType.PERSIST, fetch = FetchType.EAGER)
private Set students = new HashSet<>();
public DrivingSchool(String name, Set students) {
@@ -41,7 +41,6 @@ public class DrivingSchool {
public void deleteStudent(Student student) {
students.remove(student);
student.deleteDrivingSchool();
-
}
public Long getId() {
diff --git a/src/main/java/ru/ulstu/is/cbapp/service/DrivingSchoolService.java b/src/main/java/ru/ulstu/is/cbapp/service/DrivingSchoolService.java
index df1bcdd..678fd9d 100644
--- a/src/main/java/ru/ulstu/is/cbapp/service/DrivingSchoolService.java
+++ b/src/main/java/ru/ulstu/is/cbapp/service/DrivingSchoolService.java
@@ -1,7 +1,6 @@
package ru.ulstu.is.cbapp.service;
import ru.ulstu.is.cbapp.dao.DrivingSchoolRepository;
-import ru.ulstu.is.cbapp.dao.StudentRepository;
import ru.ulstu.is.cbapp.models.DrivingSchool;
import ru.ulstu.is.cbapp.models.Student;
import jakarta.persistence.EntityNotFoundException;
@@ -13,11 +12,13 @@ import java.util.List;
@Service
public class DrivingSchoolService {
+
private DrivingSchoolRepository drivingSchoolRepository;
- private StudentRepository studentRepository;
- public DrivingSchoolService(DrivingSchoolRepository drivingSchoolRepository, StudentRepository studentRepository) {
+ private StudentService studentService;
+
+ public DrivingSchoolService(DrivingSchoolRepository drivingSchoolRepository, StudentService studentService) {
this.drivingSchoolRepository = drivingSchoolRepository;
- this.studentRepository = studentRepository;
+ this.studentService = studentService;
}
@Transactional
@@ -76,9 +77,8 @@ public class DrivingSchoolService {
}
@Transactional
- public Student deleteStudent(Long id, Student student) {
+ public void deleteStudent(Long id, Student student) {
DrivingSchool currentDrivingSchool = findDrivingSchool(id);
currentDrivingSchool.deleteStudent(student);
- return studentRepository.save(student);
}
}
diff --git a/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java b/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java
index 8d2f8da..b5d7bd4 100644
--- a/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java
+++ b/src/main/java/ru/ulstu/is/cbapp/service/StudentService.java
@@ -13,7 +13,9 @@ import java.util.List;
@Service
public class StudentService {
+
private StudentRepository studentRepository;
+
public StudentService(StudentRepository studentRepository) {
this.studentRepository = studentRepository;
}
@@ -105,4 +107,10 @@ public class StudentService {
List students = studentRepository.findByCategories_Id(p.getId());
return students;
}
+
+ @Transactional
+ public Student saveStudent(Student s) {
+ studentRepository.save(s);
+ return s;
+ }
}