From 58280603cee2d5d6ac5d452255ea6f78d4c333a8 Mon Sep 17 00:00:00 2001 From: ArtemEmelyanov Date: Mon, 15 May 2023 19:04:10 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D0=BE,=20=D0=B2=D0=B0=D1=83,=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B2?= =?UTF-8?q?=D1=81=D1=8E=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80?= =?UTF-8?q?=D1=83,=20=D0=BC=D0=BD=D0=B5=20=D1=8D=D1=82=D0=BE=20=D0=BE?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D1=8C=20=D0=BF=D0=BE=D0=BD=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D1=81=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 69632 -> 57344 bytes frontend/vue-project/src/models/Group.js | 1 + frontend/vue-project/src/pages/groups.vue | 199 ++++++++++++++++-- frontend/vue-project/src/pages/students.vue | 16 +- frontend/vue-project/src/pages/subjects.vue | 114 ---------- .../IP/University/Contoller/DTO/GroupDTO.java | 9 + .../University/Contoller/DTO/StudentDTO.java | 5 +- .../Contoller/REST/GroupController.java | 22 ++ .../Contoller/REST/StudentController.java | 19 +- .../IP/University/Model/Group.java | 15 ++ .../IP/University/Model/Student.java | 5 +- .../IP/University/Service/GroupService.java | 47 ++++- .../IP/University/Service/StudentService.java | 17 +- 13 files changed, 305 insertions(+), 164 deletions(-) diff --git a/data.mv.db b/data.mv.db index 134e71b381cd0b76fff46544a7d78a92c3ed3885..d3799c19cd18913037449227c8b7bb86575d6deb 100644 GIT binary patch literal 57344 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 MIMn^{6!`!D4}T;=9smFU literal 69632 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 Na?n2V@Ieku{6CSQSP%dJ diff --git a/frontend/vue-project/src/models/Group.js b/frontend/vue-project/src/models/Group.js index 7467db3..5da7745 100644 --- a/frontend/vue-project/src/models/Group.js +++ b/frontend/vue-project/src/models/Group.js @@ -2,5 +2,6 @@ export default class Group{ constructor(data) { this.id = data?.id; this.name = data?.name; + this.subjectIds = data?.subjectIds; } } \ No newline at end of file diff --git a/frontend/vue-project/src/pages/groups.vue b/frontend/vue-project/src/pages/groups.vue index d46c1a4..2825b3e 100644 --- a/frontend/vue-project/src/pages/groups.vue +++ b/frontend/vue-project/src/pages/groups.vue @@ -6,30 +6,102 @@ Имя - + Действия + Работа с группой + Работа с предметами {{ grp.name }} - - - - - - - - - - - - +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + +
@@ -98,8 +90,8 @@ export default { console.log(error); }); }, - getGroups(){ - axios.get(this.URL + "group") + getGroups() { + axios.get(this.URL + "student/groups") .then(response => { this.groups = response.data; console.log(response.data); @@ -109,6 +101,8 @@ export default { }); }, addStudent(student) { + console.log(student); + student.group = null; console.log(student); axios .post(this.URL + "student", student) diff --git a/frontend/vue-project/src/pages/subjects.vue b/frontend/vue-project/src/pages/subjects.vue index e61b0bc..43608d5 100644 --- a/frontend/vue-project/src/pages/subjects.vue +++ b/frontend/vue-project/src/pages/subjects.vue @@ -19,9 +19,6 @@ - - - @@ -50,39 +47,6 @@
- - diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/GroupDTO.java b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/GroupDTO.java index 11714bb..4ad902b 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/GroupDTO.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/GroupDTO.java @@ -2,16 +2,21 @@ package ru.IP_LabWorks.IP.University.Contoller.DTO; import ru.IP_LabWorks.IP.University.Model.Group; +import java.util.List; + public class GroupDTO { private long id; private String name; + private List subjectIds; + public GroupDTO(){ } public GroupDTO(Group group){ this.id = group.getId(); this.name = group.getName(); + this.subjectIds = group.getSubjectIds(); } public Long getId(){ @@ -29,4 +34,8 @@ public class GroupDTO { public void setName(String name){ this.name = name; } + + public List getSubjectIds(){ + return subjectIds; + } } diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/StudentDTO.java b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/StudentDTO.java index 07a2262..be63849 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/StudentDTO.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/DTO/StudentDTO.java @@ -20,8 +20,9 @@ public class StudentDTO { this.id = student.getId(); this.name = student.getName(); this.birthDate = student.getBirthDate(); - this.groupName = student.getGroup().getName(); - this.groupId = student.getGroup().getId(); + if(student.getGroup() != null){ + this.groupName = student.getGroup().getName(); + } } public String getGroupName() { diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/GroupController.java b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/GroupController.java index 286941e..8f201ec 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/GroupController.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/GroupController.java @@ -59,6 +59,28 @@ public class GroupController { return ResponseEntity.ok(subjects); } + @GetMapping("/getStudentsUndefined") + public ResponseEntity> getStudentsFromUndefinedGroup(){ + List students = groupService.getStudentsUndefined(); + return ResponseEntity.ok(students); + } + + @PostMapping("/{id}/addStudents") + public void addStudentToGroup(@PathVariable Long id, @RequestBody @Valid List studentsIds){ + groupService.addStudentToGroup(id, studentsIds); + } + + @DeleteMapping("deleteStudentFromGroup/{id}") + public void deleteStudentFromGroup(@PathVariable Long id){ + groupService.deleteStudentFromGroup(id); + } + + @PostMapping("/{id}/addSubjectToGroup") + public void addSubjectToGroup(@PathVariable Long id, @RequestBody @Valid List subjectIds){ + groupService.addSubjectToGroup(id, subjectIds); + } + + // @PostMapping("/{id}/student") // public StudentDTO setStudentToGroup(@PathVariable Long id, // @RequestParam("studentId") Long studentId) { diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/StudentController.java b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/StudentController.java index 38e24ae..a168eda 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/StudentController.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Contoller/REST/StudentController.java @@ -1,20 +1,24 @@ package ru.IP_LabWorks.IP.University.Contoller.REST; import org.springframework.web.bind.annotation.*; +import ru.IP_LabWorks.IP.University.Contoller.DTO.GroupDTO; import ru.IP_LabWorks.IP.University.Contoller.DTO.StudentDTO; +import ru.IP_LabWorks.IP.University.Service.GroupService; import ru.IP_LabWorks.IP.University.Service.StudentService; import jakarta.validation.Valid; -import java.time.LocalDate; + import java.util.List; @RestController @RequestMapping("/student") public class StudentController { private final StudentService studentService; + private final GroupService groupService; - public StudentController(StudentService studentService) { + public StudentController(StudentService studentService, GroupService groupService) { this.studentService = studentService; + this.groupService = groupService; } @GetMapping("/{id}") @@ -31,12 +35,12 @@ public class StudentController { @PostMapping public StudentDTO createStudent(@RequestBody @Valid StudentDTO studentDTO){ - return new StudentDTO(studentService.addStudent(studentDTO.getName(), studentDTO.getBirthDate(), studentDTO.getGroupId())); + return new StudentDTO(studentService.addStudent(studentDTO.getName(), studentDTO.getBirthDate())); } @PutMapping("/{id}") public StudentDTO updateStudent(@PathVariable Long id, @RequestBody @Valid StudentDTO studentDTO) { - return new StudentDTO(studentService.updateStudent(id, studentDTO.getName(), studentDTO.getBirthDate(), studentDTO.getGroupId())); + return new StudentDTO(studentService.updateStudent(id, studentDTO.getName(), studentDTO.getBirthDate())); } @DeleteMapping("/{id}") @@ -44,4 +48,11 @@ public class StudentController { return new StudentDTO(studentService.deleteStudent(id)); } + @GetMapping("/groups") + public List getGroups() { + return groupService.findAllGroups().stream() + .map(GroupDTO::new) + .toList(); + } + } diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Model/Group.java b/src/main/java/ru/IP_LabWorks/IP/University/Model/Group.java index 44d40de..b840921 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Model/Group.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Model/Group.java @@ -8,6 +8,7 @@ import org.hibernate.annotations.OnDeleteAction; import javax.swing.*; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -89,4 +90,18 @@ public class Group { subjects.add(subject); subject.getGroups().add(this); } + + public List getSubjectIds() { + if (subjects.isEmpty()) { + return Collections.emptyList(); + } else { + List subjectIds = new ArrayList<>(); + for (Subject subject : subjects) { + if (!subjectIds.contains(subject.getId())) { + subjectIds.add(subject.getId()); + } + } + return subjectIds; + } + } } diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Model/Student.java b/src/main/java/ru/IP_LabWorks/IP/University/Model/Student.java index 2970765..be46044 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Model/Student.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Model/Student.java @@ -25,10 +25,9 @@ public class Student { public Student() { } - public Student(String name, LocalDate birthDate, Group group) { + public Student(String name, LocalDate birthDate) { this.name = name; this.birthDate = birthDate; - this.group = group; } public Long getId() { return id; } @@ -59,11 +58,13 @@ public class Student { @Override public String toString() { + String groupStr = (group != null) ? group.getName() : "No Group"; return "Student{" + "id=" + id + ", name='" + name + '\'' + ", birthDate='" + birthDate + '\'' + ", age='" + getAge() + '\'' + + ", group='" + groupStr + '\'' + '}'; } diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Service/GroupService.java b/src/main/java/ru/IP_LabWorks/IP/University/Service/GroupService.java index 689307e..e7efe57 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Service/GroupService.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Service/GroupService.java @@ -1,6 +1,6 @@ package ru.IP_LabWorks.IP.University.Service; -import jakarta.persistence.EntityNotFoundException; +import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -8,10 +8,9 @@ import ru.IP_LabWorks.IP.University.Model.Group; import ru.IP_LabWorks.IP.University.Model.Student; import ru.IP_LabWorks.IP.University.Model.Subject; import ru.IP_LabWorks.IP.University.Repository.GroupRepository; -import ru.IP_LabWorks.IP.University.Repository.StudentRepository; import ru.IP_LabWorks.IP.University.Service.NotFoundException.GroupNotFoundException; -import java.awt.desktop.OpenFilesEvent; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -19,8 +18,13 @@ import java.util.Optional; public class GroupService { private final GroupRepository groupRepository; - public GroupService(GroupRepository groupRepository) { + private final StudentService studentService; + private final SubjectService subjectService; + + public GroupService(GroupRepository groupRepository, StudentService studentService, @Lazy SubjectService subjectService) { this.groupRepository = groupRepository; + this.studentService = studentService; + this.subjectService = subjectService; } @Transactional @@ -87,6 +91,41 @@ public class GroupService { } } + @Transactional + public List getStudentsUndefined(){ + List students = new ArrayList<>(); + for(Student student : studentService.findAllStudents()){ + if(student.getGroup() == null){ + students.add(student); + } + } + return students; + } + + @Transactional + public void addStudentToGroup(Long groupId, List studentIds){ + final Group currentGroup = findGroup(groupId); + for(Long studentId : studentIds) { + studentService.findStudent(studentId).setGroup(currentGroup); + } + groupRepository.save(currentGroup); + } + + @Transactional + public void deleteStudentFromGroup(Long id){ + studentService.findStudent(id).setGroup(null); + } + + @Transactional + public void addSubjectToGroup(Long groupId, List subjectIds){ + final Group currentGroup = findGroup(groupId); + currentGroup.setSubjects(new ArrayList<>()); + for(Long subjectId : subjectIds) { + currentGroup.getSubjects().add(subjectService.findSubject(subjectId)); + } + groupRepository.save(currentGroup); + } + /* @Transactional public Group addStudentToGroup(Long groupId, Long studentId) { Group group = findGroup(groupId); diff --git a/src/main/java/ru/IP_LabWorks/IP/University/Service/StudentService.java b/src/main/java/ru/IP_LabWorks/IP/University/Service/StudentService.java index 9796c4f..4368434 100644 --- a/src/main/java/ru/IP_LabWorks/IP/University/Service/StudentService.java +++ b/src/main/java/ru/IP_LabWorks/IP/University/Service/StudentService.java @@ -1,5 +1,7 @@ package ru.IP_LabWorks.IP.University.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -17,23 +19,17 @@ public class StudentService { private final StudentRepository studentRepository; private final GroupService groupService; - public StudentService(StudentRepository studentRepository, GroupService groupService) { + public StudentService(StudentRepository studentRepository,@Lazy GroupService groupService) { this.studentRepository = studentRepository; this.groupService = groupService; } @Transactional - public Student addStudent(String name, LocalDate birthDate, Long groupId){ + public Student addStudent(String name, LocalDate birthDate){ if (!StringUtils.hasText(name) || !StringUtils.hasText(String.valueOf(birthDate))) { throw new IllegalArgumentException("Student name or date is null or empty"); } - Group group = null; - try{ - group = groupService.findGroup(groupId); - }catch (Exception ex){ - group = null; - } - final Student student = new Student(name, birthDate,group); + final Student student = new Student(name, birthDate); return studentRepository.save(student); } @@ -49,14 +45,13 @@ public class StudentService { } @Transactional - public Student updateStudent(Long id, String name, LocalDate date, Long groupId) { + public Student updateStudent(Long id, String name, LocalDate date) { if (!StringUtils.hasText(name) || !StringUtils.hasText(String.valueOf(date))) { throw new IllegalArgumentException("Student name or date is null or empty"); } final Student currentStudent = findStudent(id); currentStudent.setName(name); currentStudent.setBirthDate(date); - currentStudent.setGroup(groupService.findGroup(groupId)); return studentRepository.save(currentStudent); }