From 91faa01438ba51ead0f51eba6ef0c2a9fce89fae Mon Sep 17 00:00:00 2001
From: Bensidhoum Wissem <wbensidhoum@takima.fr>
Date: Fri, 19 Jan 2024 17:31:27 +0100
Subject: [PATCH] some corrections
---
.gitignore | 1 +
.../backskeleton/controllers/CourseController.java | 4 ++--
.../backskeleton/controllers/MajorController.java | 2 +-
.../backskeleton/controllers/StudentController.java | 6 +++---
.../takima/backskeleton/{DAO => dao}/CourseDao.java | 2 +-
.../takima/backskeleton/{DAO => dao}/MajorDao.java | 2 +-
.../takima/backskeleton/{DAO => dao}/StudentDao.java | 2 +-
.../takima/backskeleton/{DTO => dto}/StudentDto.java | 4 +---
.../backskeleton/{DTO => dto}/StudentMapper.java | 2 +-
.../java/com/takima/backskeleton/models/Major.java | 1 -
.../java/com/takima/backskeleton/models/Student.java | 4 ++--
.../takima/backskeleton/services/CourseService.java | 4 +---
.../takima/backskeleton/services/MajorService.java | 2 +-
.../takima/backskeleton/services/StudentService.java | 12 ++++--------
14 files changed, 20 insertions(+), 28 deletions(-)
rename back-skeleton/src/main/java/com/takima/backskeleton/{DAO => dao}/CourseDao.java (86%)
rename back-skeleton/src/main/java/com/takima/backskeleton/{DAO => dao}/MajorDao.java (92%)
rename back-skeleton/src/main/java/com/takima/backskeleton/{DAO => dao}/StudentDao.java (93%)
rename back-skeleton/src/main/java/com/takima/backskeleton/{DTO => dto}/StudentDto.java (73%)
rename back-skeleton/src/main/java/com/takima/backskeleton/{DTO => dto}/StudentMapper.java (95%)
diff --git a/.gitignore b/.gitignore
index e375bb6..5609fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
# System files
.DS_Store
Thumbs.db
+back-skeleton/.env
\ No newline at end of file
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/CourseController.java b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/CourseController.java
index b7425bf..0a8e815 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/CourseController.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/CourseController.java
@@ -17,8 +17,8 @@ import java.util.List;
public class CourseController {
private final CourseService courseService;
- @GetMapping("")
- public List<Course> getAllCourses() {
+ @GetMapping
+ public List<Course> getAll() {
return courseService.findAll();
}
}
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/MajorController.java b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/MajorController.java
index b531543..77e37b1 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/MajorController.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/MajorController.java
@@ -15,7 +15,7 @@ import java.util.List;
public class MajorController {
private final MajorService majorService;
- @GetMapping("")
+ @GetMapping
public List<Major> findAll() {
return majorService.findAll();
}
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/StudentController.java b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/StudentController.java
index 0b379e5..a5ebaa2 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/controllers/StudentController.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/controllers/StudentController.java
@@ -1,6 +1,6 @@
package com.takima.backskeleton.controllers;
-import com.takima.backskeleton.DTO.StudentDto;
+import com.takima.backskeleton.dto.StudentDto;
import com.takima.backskeleton.models.Student;
import com.takima.backskeleton.services.StudentService;
import lombok.RequiredArgsConstructor;
@@ -14,7 +14,7 @@ import java.util.List;
@RequiredArgsConstructor
public class StudentController {
private final StudentService studentService;
- @GetMapping("")
+ @GetMapping
public List<Student> listStudents(@RequestParam(required = false) Integer majorId, @RequestParam(required = false) Integer courseId) {
if (majorId != null && courseId !=null) {
return studentService.searchByMajorAndCourse(majorId, courseId);
@@ -32,7 +32,7 @@ public class StudentController {
studentService.deleteById(id);
}
- @PostMapping("")
+ @PostMapping
public void addStudent(@RequestBody StudentDto studentDto) {
studentService.addStudent(studentDto);
}
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/CourseDao.java b/back-skeleton/src/main/java/com/takima/backskeleton/dao/CourseDao.java
similarity index 86%
rename from back-skeleton/src/main/java/com/takima/backskeleton/DAO/CourseDao.java
rename to back-skeleton/src/main/java/com/takima/backskeleton/dao/CourseDao.java
index 97657ed..0f07367 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/CourseDao.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/dao/CourseDao.java
@@ -1,4 +1,4 @@
-package com.takima.backskeleton.DAO;
+package com.takima.backskeleton.dao;
import com.takima.backskeleton.models.Course;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/MajorDao.java b/back-skeleton/src/main/java/com/takima/backskeleton/dao/MajorDao.java
similarity index 92%
rename from back-skeleton/src/main/java/com/takima/backskeleton/DAO/MajorDao.java
rename to back-skeleton/src/main/java/com/takima/backskeleton/dao/MajorDao.java
index 9d54218..e4920ed 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/MajorDao.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/dao/MajorDao.java
@@ -1,4 +1,4 @@
-package com.takima.backskeleton.DAO;
+package com.takima.backskeleton.dao;
import com.takima.backskeleton.models.Major;
import com.takima.backskeleton.models.Student;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/StudentDao.java b/back-skeleton/src/main/java/com/takima/backskeleton/dao/StudentDao.java
similarity index 93%
rename from back-skeleton/src/main/java/com/takima/backskeleton/DAO/StudentDao.java
rename to back-skeleton/src/main/java/com/takima/backskeleton/dao/StudentDao.java
index 3b12b1e..38a4c3b 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/DAO/StudentDao.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/dao/StudentDao.java
@@ -1,4 +1,4 @@
-package com.takima.backskeleton.DAO;
+package com.takima.backskeleton.dao;
import com.takima.backskeleton.models.Student;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentDto.java b/back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentDto.java
similarity index 73%
rename from back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentDto.java
rename to back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentDto.java
index f0a938e..e6308bd 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentDto.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentDto.java
@@ -1,11 +1,9 @@
-package com.takima.backskeleton.DTO;
+package com.takima.backskeleton.dto;
import com.takima.backskeleton.models.Course;
import com.takima.backskeleton.models.Major;
-import com.takima.backskeleton.models.Student;
import lombok.Builder;
import lombok.Getter;
-import org.springframework.web.multipart.MultipartFile;
import java.time.Instant;
import java.util.List;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentMapper.java b/back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentMapper.java
similarity index 95%
rename from back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentMapper.java
rename to back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentMapper.java
index 17a583b..c48bf2a 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/DTO/StudentMapper.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/dto/StudentMapper.java
@@ -1,4 +1,4 @@
-package com.takima.backskeleton.DTO;
+package com.takima.backskeleton.dto;
import com.takima.backskeleton.models.Student;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/models/Major.java b/back-skeleton/src/main/java/com/takima/backskeleton/models/Major.java
index 4746c4c..fafbec7 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/models/Major.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/models/Major.java
@@ -20,6 +20,5 @@ public class Major {
@OneToMany(mappedBy = "major")
@JsonIgnore
private List<Student> students;
-
}
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/models/Student.java b/back-skeleton/src/main/java/com/takima/backskeleton/models/Student.java
index 59e05c0..33d861b 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/models/Student.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/models/Student.java
@@ -13,9 +13,9 @@ public class Student {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
- @Column(name = "first_name")
+ @Column
private String firstName;
- @Column(name = "last_name")
+ @Column
private String lastName;
private Instant birthdate;
@ManyToMany
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/services/CourseService.java b/back-skeleton/src/main/java/com/takima/backskeleton/services/CourseService.java
index 68a553c..bd9e469 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/services/CourseService.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/services/CourseService.java
@@ -1,12 +1,10 @@
package com.takima.backskeleton.services;
-import com.takima.backskeleton.DAO.CourseDao;
+import com.takima.backskeleton.dao.CourseDao;
import com.takima.backskeleton.models.Course;
-import com.takima.backskeleton.models.Major;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
import java.util.List;
@Component
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/services/MajorService.java b/back-skeleton/src/main/java/com/takima/backskeleton/services/MajorService.java
index 03feb0f..03b91dd 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/services/MajorService.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/services/MajorService.java
@@ -1,6 +1,6 @@
package com.takima.backskeleton.services;
-import com.takima.backskeleton.DAO.MajorDao;
+import com.takima.backskeleton.dao.MajorDao;
import com.takima.backskeleton.models.Major;
import com.takima.backskeleton.models.Student;
import lombok.RequiredArgsConstructor;
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/services/StudentService.java b/back-skeleton/src/main/java/com/takima/backskeleton/services/StudentService.java
index cc1e205..d186091 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/services/StudentService.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/services/StudentService.java
@@ -1,11 +1,10 @@
package com.takima.backskeleton.services;
-import com.takima.backskeleton.DAO.StudentDao;
-import com.takima.backskeleton.DTO.StudentDto;
-import com.takima.backskeleton.DTO.StudentMapper;
+import com.takima.backskeleton.dao.StudentDao;
+import com.takima.backskeleton.dto.StudentDto;
+import com.takima.backskeleton.dto.StudentMapper;
import com.takima.backskeleton.models.Student;
import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +19,7 @@ public class StudentService {
private final StudentDao studentDao;
public List<Student> findAll() {
- Iterable<Student> it = studentDao.findAll();
- List <Student> users = new ArrayList<>();
- it.forEach(users::add);
- return users ;
+ return studentDao.findAll();
}
public Student getById(Long id) {
--
GitLab