jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'BE/userinfo' into 'backend'

Browse Source 
feat: qna 답변 수정

See merge request s11-webmobile1-sub2/S11P12A701!88
This commit is contained in:
박정민 2024-08-07 15:31:16 +09:00
commit 47d480210e
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.edufocus.edufocus.qna.entity.QnaRequestDto;
import com.edufocus.edufocus.qna.entity.QnaResponseDto; import com.edufocus.edufocus.qna.entity.QnaResponseDto;
import com.edufocus.edufocus.qna.repository.QnaRepository; import com.edufocus.edufocus.qna.repository.QnaRepository;
import com.edufocus.edufocus.user.model.entity.vo.User; 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.model.repository.UserRepository;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -24,14 +25,13 @@ import java.util.stream.Collectors;
@Service @Service
@Transactional @Transactional
@RequiredArgsConstructor @RequiredArgsConstructor
public class QnaServiceImpl implements QnaService{ public class QnaServiceImpl implements QnaService {
private final QnaRepository qnaRepository; private final QnaRepository qnaRepository;
private final LectureRepository lectureRepository; private final LectureRepository lectureRepository;
private final UserRepository userRepository; private final UserRepository userRepository;
@Override @Override
public QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) { public QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) {
@ -41,8 +41,10 @@ public class QnaServiceImpl implements QnaService{
User user = userRepository.findById(id).orElse(null); User user = userRepository.findById(id).orElse(null);
Qna qna = QnaRequestDto.toEntity(qnaRequestDto); Qna qna = QnaRequestDto.toEntity(qnaRequestDto);
if (qna.getAnswer() != null || user.getRole() != UserRole.ADMIN) {
throw new RuntimeException();
}
qna.setLecture(lecture); qna.setLecture(lecture);
qna.setUser(user); qna.setUser(user);
@ -53,7 +55,7 @@ public class QnaServiceImpl implements QnaService{
} }
@Override @Override
public QnaResponseDto updateQna(Long id,QnaRequestDto qnaRequestDto) { public QnaResponseDto updateQna(Long id, QnaRequestDto qnaRequestDto) {
Qna findQna = qnaRepository.findById(id) Qna findQna = qnaRepository.findById(id)
@ -72,7 +74,7 @@ public class QnaServiceImpl implements QnaService{
@Override @Override
public void deleteQna(Long id) { public void deleteQna(Long id) {
qnaRepository.deleteById(id); qnaRepository.deleteById(id);
} }
@Override @Override
@ -80,7 +82,7 @@ qnaRepository.deleteById(id);
Optional<Qna> qna; Optional<Qna> qna;
try { try {
qna= qnaRepository.findById(id); qna = qnaRepository.findById(id);
} catch (Exception e) { } catch (Exception e) {
@ -89,14 +91,12 @@ qnaRepository.deleteById(id);
} }
return QnaResponseDto.toEntity(qna.get()); return QnaResponseDto.toEntity(qna.get());
} }
@Override @Override
public List<QnaResponseDto> getAllQnasByLecture(Long lectureId,int pageSize) public List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageSize) {
{
Pageable pageable = PageRequest.of(0, pageSize); Pageable pageable = PageRequest.of(0, pageSize);

2
backend/src/main/java/com/edufocus/edufocus/report/service/ReportServiceImpl.java
View File

@ -60,7 +60,6 @@ public class ReportServiceImpl implements ReportService {
Quiz quiz = quizList.get(idx); Quiz quiz = quizList.get(idx);
String inputAnswer = answerInputList.get(idx); String inputAnswer = answerInputList.get(idx);
Answer answer; Answer answer;
//
if (quiz.getAnswer().equals(inputAnswer)) { if (quiz.getAnswer().equals(inputAnswer)) {
correctCount++; correctCount++;
answer = Answer.builder() answer = Answer.builder()
@ -183,6 +182,7 @@ public class ReportServiceImpl implements ReportService {
List<Report> reportList = reportRepository.findByUser_Id(userId); List<Report> reportList = reportRepository.findByUser_Id(userId);
List<ReportListResponseDto> reportListResponseDtoList = new ArrayList<>(); List<ReportListResponseDto> reportListResponseDtoList = new ArrayList<>();

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

@ -93,6 +93,8 @@ public class UserServiceImpl implements UserService {
if (!PasswordUtils.checkPassword(passwordDto.getCurrentPassword(), user.getPassword())) { if (!PasswordUtils.checkPassword(passwordDto.getCurrentPassword(), user.getPassword())) {
throw new UserException("Current password is incorrect"); 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 { } else {
if (!passwordDto.getNewPassword().equals(passwordDto.getNewPasswordCheck())) { if (!passwordDto.getNewPassword().equals(passwordDto.getNewPasswordCheck())) {
throw new UserException("New password confirmation does not match"); throw new UserException("New password confirmation does not match");