diff --git a/src/main/java/com/keepgoing/keepserver/domain/student/entity/Student.java b/src/main/java/com/keepgoing/keepserver/domain/student/entity/Student.java index c9d87af6..44dc0e4b 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/student/entity/Student.java +++ b/src/main/java/com/keepgoing/keepserver/domain/student/entity/Student.java @@ -29,4 +29,7 @@ public class Student { @Column(nullable = false) private String mail; + + @Column + private String imgUrl; } diff --git a/src/main/java/com/keepgoing/keepserver/domain/student/repository/dto/StudentResponseDto.java b/src/main/java/com/keepgoing/keepserver/domain/student/repository/dto/StudentResponseDto.java index e1033764..a3cd750a 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/student/repository/dto/StudentResponseDto.java +++ b/src/main/java/com/keepgoing/keepserver/domain/student/repository/dto/StudentResponseDto.java @@ -8,6 +8,7 @@ public class StudentResponseDto { long id; String studentName; + String imgUrl; String studentId; String phoneNum; String mail; diff --git a/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentService.java b/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentService.java index a7b1dbbe..459f647d 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentService.java +++ b/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentService.java @@ -9,13 +9,9 @@ import java.io.IOException; public interface StudentService { - @Transactional(readOnly = true) BaseResponse findByStudentName(StudentFindDto studentFindDto); - @Transactional(readOnly = true) BaseResponse findByStudentNum(StudentFindDto studentFindDto); - @Transactional(rollbackFor = Exception.class) BaseResponse editStudent(StudentRequestDto studentRequestDto,Long id); BaseResponse createManyUserByExcel(MultipartFile multipartFile) throws IOException; - @Transactional(readOnly = true) BaseResponse findAll(); } diff --git a/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentServiceImpl.java b/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentServiceImpl.java index e0d082a9..491d17d9 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentServiceImpl.java +++ b/src/main/java/com/keepgoing/keepserver/domain/student/service/StudentServiceImpl.java @@ -4,7 +4,6 @@ import com.keepgoing.keepserver.domain.student.repository.StudentRepository; import com.keepgoing.keepserver.domain.student.repository.dto.*; import com.keepgoing.keepserver.global.common.BaseResponse; -import jakarta.transaction.Transactional; import lombok.AllArgsConstructor; import org.apache.commons.io.FilenameUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -14,6 +13,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -75,6 +75,7 @@ public BaseResponse createManyUserByExcel(MultipartFile file) { } } + @Transactional(readOnly = true) @Override public BaseResponse findAll() { ArrayList lst = new ArrayList<>(); @@ -96,6 +97,7 @@ private List convertToResponseDto(List students) { return responseDto; } + @Transactional(readOnly = true) public BaseResponse findByStudentName(StudentFindDto studentDto) { try { List students = findStudentsByStudentName(studentDto.getStudentName()); @@ -118,6 +120,7 @@ private StudentResponseDto convertToResponseDto(Student student) { return studentFormat(student); } + @Transactional(readOnly = true) public BaseResponse findByStudentNum(StudentFindDto studentDto) { try { Student student = findStudentByStudentId(studentDto.getStudentId()); @@ -132,6 +135,7 @@ public BaseResponse findByStudentNum(StudentFindDto studentDto) { } } + @Transactional(rollbackFor = Exception.class) public BaseResponse editStudent(StudentRequestDto studentDto, Long id) { Student studentEntity = studentRepository.findStudentById(id); if (studentDto.getStudentName() != null) studentEntity.setStudentName(studentDto.getStudentName()); @@ -153,6 +157,7 @@ public StudentResponseDto studentFormat(Student student) { .mail(student.getMail()) .phoneNum(student.getPhoneNum()) .studentName(student.getStudentName()) + .imgUrl(student.getImgUrl()) .build(); } }