diff --git a/.gitignore b/.gitignore index e375bb659a7f01c1585b6c2bed7aeb29065bcb6d..5609fca0ec0a6e87504466793ea2944f604b2527 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 b7425bf7a017facb226767951d6f47b29089e1b2..0a8e81591bb218d48428164bca3f53351f6c2ef5 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 b5315436e961bf04170d34178c6838011e7e669d..77e37b16fde09569238fa52477e82fcc37e5c064 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 0b379e555b8f4b93fb0781c98fffdc30169428ef..a5ebaa2e4437e13986f31a75cf7b4a1ba45975af 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 97657ed4e359b6a7ad61b2ce7c08fb838303a65f..0f07367c614b7edf8af1a19cf015ac3f0889f59b 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 9d54218305a010bef4efee75b5d85f827ef78b29..e4920ede628df0c336b0e43040238dcc5ee7248c 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 3b12b1eedb6ddad993baec07dcc574e0c8932b13..38a4c3be698950d1d308a2a3bd05f9d9cb310634 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 f0a938e4e71220209be8dac51139331a4cdb4d3d..e6308bd02ff4c4c9311144a95b44d05682b79d15 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 17a583bdab7c46bb0ec5ce602ff7bcdd87fe8ff9..c48bf2ae88b1d57dca699c59933e4e1e31a77865 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 4746c4c0c82ccde04c18d5ff016b360056a11438..fafbec768faa955880dc63e5285706c44cb6b9f4 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 59e05c03efb417b06549999a0f82e2e14e6f7e98..33d861bd0874e78595816060fb77bd4372fec112 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 68a553c6e7b69b8a648caa22515ec22cc1598be9..bd9e4692401f154ca3636aea22d4190c1d2391d5 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 03feb0f83a1796d353faf3d891e4afcd2da83f5d..03b91dd70a1caa2af20229ce0b8caa2e3cb55bf5 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 cc1e205bb02d50f5582d630d017db84fd1e7f5d4..d186091001764c977636792058c5c08f56b9a5f9 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) {