Merge branch 'backend' into 'Be/ReportSet'

backend/src/main/java/com/edufocus/edufocus/mail/controller/MailController.java

@@ -31,7 +31,7 @@ public class MailController {
     @GetMapping("/verify")
     public ResponseEntity<?> verifyCode(@RequestParam String code, @RequestParam String email) {
         if (!mailService.verifyCode(code, email)) {
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }

backend/src/main/java/com/edufocus/edufocus/mail/service/MailServiceImpl.java

@@ -1,7 +1,6 @@
 package com.edufocus.edufocus.mail.service;
 
 import com.edufocus.edufocus.redis.util.RedisUtil;
-import com.edufocus.edufocus.user.model.entity.vo.User;
 import com.edufocus.edufocus.user.model.repository.UserRepository;
 import com.edufocus.edufocus.user.model.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +10,6 @@ import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
 
-import java.util.NoSuchElementException;
 import java.util.Random;
 
 @Service
@@ -31,7 +29,13 @@ public class MailServiceImpl implements MailService {
     @Override
     public void sendMail(String email) {
         String code = createRandomCode();
+
+        if (redisUtil.exists(email)) {
+            redisUtil.deleteData(redisUtil.getData(email));
+        }
+
         redisUtil.setDataExpire(code, email, 60 * 5L);
+        redisUtil.setDataExpire(email, code, 60 * 5L);
 
         SimpleMailMessage mail = createEmail(email, "[EDUFOCUS] 비밀번호 찾기 안내", code);
         mailSender.send(mail);
@@ -46,6 +50,7 @@ public class MailServiceImpl implements MailService {
 
     private SimpleMailMessage createEmail(String to, String title, String code) {
         SimpleMailMessage message = new SimpleMailMessage();
+        message.setFrom("EDUFOCUS");
         message.setTo(to);
         message.setSubject(title);
         message.setText("인증번호 6자리입니다 : " + code);

backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java

@@ -4,6 +4,9 @@ import com.edufocus.edufocus.qna.entity.Qna;
 import com.edufocus.edufocus.qna.entity.QnaRequestDto;
 import com.edufocus.edufocus.qna.entity.QnaResponseDto;
 import com.edufocus.edufocus.qna.service.QnaService;
+import com.edufocus.edufocus.user.model.entity.vo.User;
+import com.edufocus.edufocus.user.model.entity.vo.UserRole;
+import com.edufocus.edufocus.user.model.repository.UserRepository;
 import com.edufocus.edufocus.user.util.JWTUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
@@ -23,81 +26,100 @@ import java.util.List;
 public class QnaController {
     private final QnaService qnaService;
     private final JWTUtil jwtUtil;
-    private static int PAGE_SIZE=10;
+    private static int PAGE_SIZE = 10;
-
+    private final UserRepository userRepository;
 
     @PostMapping("/{lecture_id}")
-    public ResponseEntity<QnaResponseDto> createQna(@PathVariable("lecture_id") Long lecture_id, @RequestBody QnaRequestDto qnaRequestDto , HttpServletRequest request) {
+    public ResponseEntity<QnaResponseDto> createQna(@PathVariable("lecture_id") Long lecture_id, @RequestBody QnaRequestDto qnaRequestDto, HttpServletRequest request) {
 
 
-        try{
+        try {
             String token = request.getHeader("Authorization");
             Long userId = Long.parseLong(jwtUtil.getUserId(token));
 
-           QnaResponseDto qnaResponseDto= qnaService.createQna(userId,qnaRequestDto,lecture_id);
+            QnaResponseDto qnaResponseDto = qnaService.createQna(userId, qnaRequestDto, lecture_id);
-            return new ResponseEntity<>( qnaResponseDto,HttpStatus.CREATED);
+            return new ResponseEntity<>(qnaResponseDto, HttpStatus.CREATED);
 
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
     @PostMapping({"/answer/create/{qna_id}"})
-    public ResponseEntity<QnaResponseDto> createAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto)
+    public ResponseEntity<QnaResponseDto> createAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto, HttpServletRequest request) {
-    {
         try {
-            QnaResponseDto responseDto = qnaService.createAnswer(qna_id,qnaRequestDto);
+            String token = request.getHeader("Authorization");
-            return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
+            Long userId = Long.parseLong(jwtUtil.getUserId(token));
-        }
+            User findUser = userRepository.findById(userId).orElse(null);
-        catch (Exception e)
+
-        {
+            if (findUser.getRole() != UserRole.ADMIN) {
+                throw new RuntimeException();
+            }
+
+            QnaResponseDto responseDto = qnaService.createAnswer(qna_id, qnaRequestDto);
+            return new ResponseEntity<>(responseDto, HttpStatus.ACCEPTED);
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
     @PutMapping({"/answer/update/{qna_id}"})
-    public ResponseEntity<QnaResponseDto> updateAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto)
+    public ResponseEntity<QnaResponseDto> updateAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto, HttpServletRequest request) {
-    {
         try {
-            QnaResponseDto responseDto = qnaService.updateAnswer(qna_id,qnaRequestDto);
+            String token = request.getHeader("Authorization");
-            return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
+            Long userId = Long.parseLong(jwtUtil.getUserId(token));
-        }
+            User findUser = userRepository.findById(userId).orElse(null);
-        catch (Exception e)
+
-        {
+            if (findUser.getRole() != UserRole.ADMIN) {
+                System.out.println("role 안맞음");
+                throw new RuntimeException("update 실패");
+            }
+
+            QnaResponseDto responseDto = qnaService.updateAnswer(qna_id, qnaRequestDto);
+            return new ResponseEntity<>(responseDto, HttpStatus.ACCEPTED);
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
     @PostMapping("/answer/delete/{qna_id}")
-    public ResponseEntity<QnaResponseDto> deleteAnswer(@PathVariable("qna_id") Long qna_id)
+    public ResponseEntity<QnaResponseDto> deleteAnswer(@PathVariable("qna_id") Long qna_id, HttpServletRequest request) {
-    {
         try {
-             qnaService.deleteAnswer(qna_id);
+            String token = request.getHeader("Authorization");
+            Long userId = Long.parseLong(jwtUtil.getUserId(token));
+            User findUser = userRepository.findById(userId).orElse(null);
+
+            System.out.println("delete answer");
+            if (findUser.getRole() != UserRole.ADMIN) {
+                throw new RuntimeException();
+            }
+            qnaService.deleteAnswer(qna_id);
             return new ResponseEntity<>(HttpStatus.ACCEPTED);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             throw new RuntimeException(e);
         }
     }
 
 
     @PutMapping("/{id}")
-    public ResponseEntity<QnaResponseDto> updateQna(@PathVariable Long id, @RequestBody QnaRequestDto qnaRequestDto) {
+    public ResponseEntity<QnaResponseDto> updateQna(@PathVariable Long id, @RequestBody QnaRequestDto qnaRequestDto, HttpServletRequest request) {
-
+        String token = request.getHeader("Authorization");
-        try{
+        Long userId = Long.parseLong(jwtUtil.getUserId(token));
-           QnaResponseDto qnaResponseDto=  qnaService.updateQna(id,qnaRequestDto);
+        try {
+            QnaResponseDto qnaResponseDto = qnaService.updateQna(id, qnaRequestDto, userId);
             return new ResponseEntity<>(qnaResponseDto, HttpStatus.ACCEPTED);
 
-        }catch (Exception e)
+        } catch (Exception e) {
-        {
+            throw new RuntimeException(e);
-            throw new RuntimeException(e);        }
+        }
     }
 
     @DeleteMapping("/{id}")
-    public ResponseEntity<Qna> deleteQna(@PathVariable Long id) {
+    public ResponseEntity<Qna> deleteQna(@PathVariable Long id, HttpServletRequest request) {
         try {
-            qnaService.deleteQna(id);
+            String token = request.getHeader("Authorization");
+            Long userId = Long.parseLong(jwtUtil.getUserId(token));
+            qnaService.deleteQna(id, userId);
             return new ResponseEntity<>(HttpStatus.ACCEPTED);
 
         } catch (SQLException e) {
@@ -107,8 +129,8 @@ public class QnaController {
 
     @GetMapping("/{id}")
     public ResponseEntity<QnaResponseDto> getQna(@PathVariable Long id) {
-        try{
+        try {
-            QnaResponseDto findQna= qnaService.getQna(id);
+            QnaResponseDto findQna = qnaService.getQna(id);
             return new ResponseEntity<>(findQna, HttpStatus.ACCEPTED);
 
         } catch (SQLException e) {
@@ -121,7 +143,7 @@ public class QnaController {
         try {
 
 
-            List<QnaResponseDto> qnaList= qnaService.getAllQnasByLecture(id,PAGE_SIZE);
+            List<QnaResponseDto> qnaList = qnaService.getAllQnasByLecture(id, PAGE_SIZE);
 
             return new ResponseEntity<>(qnaList, HttpStatus.ACCEPTED);
         } catch (SQLException e) {

backend/src/main/java/com/edufocus/edufocus/qna/service/QnaService.java

@@ -10,17 +10,24 @@ import org.springframework.stereotype.Service;
 
 import java.sql.SQLException;
 import java.util.List;
+
 @Service
 public interface QnaService {
 
     QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) throws SQLException;
-    QnaResponseDto updateQna(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
+
-    void deleteQna(Long id) throws SQLException;
+    QnaResponseDto updateQna(Long id, QnaRequestDto qnaRequestDto, Long userId) throws SQLException;
+
+    void deleteQna(Long id, Long userId) throws SQLException;
+
     QnaResponseDto getQna(Long id) throws SQLException;
 
-    List<QnaResponseDto> getAllQnasByLecture(Long lectureId,int pageNumber) throws SQLException;
+    List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageNumber) throws SQLException;
-    QnaResponseDto createAnswer(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
+
-    QnaResponseDto updateAnswer(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
+    QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException;
+
+    QnaResponseDto updateAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException;
+
     void deleteAnswer(Long id) throws SQLException;
 
 }

backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java

@@ -7,6 +7,7 @@ import com.edufocus.edufocus.qna.entity.QnaRequestDto;
 import com.edufocus.edufocus.qna.entity.QnaResponseDto;
 import com.edufocus.edufocus.qna.repository.QnaRepository;
 import com.edufocus.edufocus.user.model.entity.vo.User;
+import com.edufocus.edufocus.user.model.entity.vo.UserRole;
 import com.edufocus.edufocus.user.model.repository.UserRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -24,14 +25,13 @@ import java.util.stream.Collectors;
 @Service
 @Transactional
 @RequiredArgsConstructor
-public class QnaServiceImpl implements QnaService{
+public class QnaServiceImpl implements QnaService {
 
     private final QnaRepository qnaRepository;
     private final LectureRepository lectureRepository;
     private final UserRepository userRepository;
 
 
-
     @Override
     public QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) {
 
@@ -41,19 +41,29 @@ public class QnaServiceImpl implements QnaService{
         User user = userRepository.findById(id).orElse(null);
 
 
-
         Qna qna = QnaRequestDto.toEntity(qnaRequestDto);
+
         qna.setLecture(lecture);
         qna.setUser(user);
 
         qna.setCreatedAt(new Date());
 
         qnaRepository.save(qna);
-    return QnaResponseDto.toEntity(qna);
+        return QnaResponseDto.toEntity(qna);
     }
 
     @Override
-    public QnaResponseDto  updateQna(Long id,QnaRequestDto qnaRequestDto) {
+    public QnaResponseDto updateQna(Long id, QnaRequestDto qnaRequestDto, Long userId) {
+
+        System.out.println("userId:" + userId);
+
+        Qna qna = qnaRepository.findById(id).orElse(null);
+        System.out.println("quesiton에 있는거: " + qna.getUser().getId());
+        User user = userRepository.findById(userId).orElse(null);
+
+        if (qna.getUser().getId() != userId) {
+            throw new RuntimeException();
+        }
 
 
         Qna findQna = qnaRepository.findById(id)
@@ -65,14 +75,22 @@ public class QnaServiceImpl implements QnaService{
 
         qnaRepository.save(findQna);
 
-            return QnaResponseDto.toEntity(findQna);
+        return QnaResponseDto.toEntity(findQna);
 
 
     }
 
     @Override
-    public void deleteQna(Long id) {
+    public void deleteQna(Long id, Long userId) {
-qnaRepository.deleteById(id);
+
+        Qna qna = qnaRepository.findById(id).orElse(null);
+        User user = userRepository.findById(userId).orElse(null);
+        if (qna.getUser().getId() == userId || user.getRole() == UserRole.ADMIN) {
+            qnaRepository.delete(qna);
+        } else {
+            throw new RuntimeException();
+        }
+
     }
 
     @Override
@@ -80,7 +98,7 @@ qnaRepository.deleteById(id);
         Optional<Qna> qna;
         try {
 
-            qna= qnaRepository.findById(id);
+            qna = qnaRepository.findById(id);
 
 
         } catch (Exception e) {
@@ -89,14 +107,12 @@ qnaRepository.deleteById(id);
         }
 
 
-
+        return QnaResponseDto.toEntity(qna.get());
-            return QnaResponseDto.toEntity(qna.get());
 
     }
 
     @Override
-    public List<QnaResponseDto> getAllQnasByLecture(Long lectureId,int pageSize)
+    public List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageSize) {
-    {
 
         Pageable pageable = PageRequest.of(0, pageSize);
 
@@ -115,6 +131,9 @@ qnaRepository.deleteById(id);
         Qna findQna = qnaRepository.findById(id).orElse(null);
         findQna.setAnswer(qnaRequestDto.getAnswer());
 
+        if (findQna.getAnswer() != null) {
+            throw new RuntimeException();
+        }
         qnaRepository.save(findQna);
 
         return QnaResponseDto.toEntity(findQna);
@@ -127,6 +146,7 @@ qnaRepository.deleteById(id);
         Qna findQna = qnaRepository.findById(id).orElse(null);
         findQna.setAnswer(qnaRequestDto.getAnswer());
 
+
         qnaRepository.save(findQna);
 
         return QnaResponseDto.toEntity(findQna);

backend/src/main/java/com/edufocus/edufocus/redis/util/RedisUtil.java

@@ -33,4 +33,8 @@ public class RedisUtil {
         stringRedisTemplate.delete(key);
     }
 
+    public boolean exists(String key) {
+        return stringRedisTemplate.hasKey(key);
+    }
+
 }

backend/src/main/java/com/edufocus/edufocus/user/controller/UserController.java

@@ -71,9 +71,9 @@ public class UserController {
 
     // 비밀번호 찾기를 통한 변경
     @PutMapping("/updateforgottenpassword")
-    public ResponseEntity<String> updatePassword(@RequestParam long userId,
+    public ResponseEntity<String> updatePassword(@RequestParam String email,
                                                  @RequestParam String newPassword) {
-        userService.changeForgottenPassword(userId, newPassword);
+        userService.changeForgottenPassword(email, newPassword);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

backend/src/main/java/com/edufocus/edufocus/user/model/service/UserService.java

@@ -28,7 +28,6 @@ public interface UserService {
 
     boolean isEmailExist(String email);
 
-    void changeForgottenPassword(Long id, String newPassword);
 
-    boolean isTeacher(long id);
+    void changeForgottenPassword(String email, String newPassword);
 }

backend/src/main/java/com/edufocus/edufocus/user/model/service/UserServiceImpl.java

@@ -94,6 +94,8 @@ public class UserServiceImpl implements UserService {
 
         if (!PasswordUtils.checkPassword(passwordDto.getCurrentPassword(), user.getPassword())) {
             throw new UserException("Current password is incorrect");
+        } else if (passwordDto.getCurrentPassword().equals(passwordDto.getNewPassword())) {
+            throw new UserException("New password cannot be the same as the current password");
         } else {
             if (!passwordDto.getNewPassword().equals(passwordDto.getNewPasswordCheck())) {
                 throw new UserException("New password confirmation does not match");
@@ -144,8 +146,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public void changeForgottenPassword(Long id, String newPassword) {
+    public void changeForgottenPassword(String email, String newPassword) {
-        User user = userRepository.findById(id).orElse(null);
+        User user = userRepository.findByEmail(email).orElse(null);
 
         if (user == null) {
             throw new UserException("User not found");

backend/src/main/resources/application.properties

@@ -38,4 +38,5 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.timeout=5000
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.data.redis.host=${REDIS_HOST}
-spring.data.redis.port=${REDIS_PORT}
+spring.data.redis.port=${REDIS_PORT}
+spring.data.redis.password=${REDIS_PASSWORD}