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

Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/email

Browse Source
This commit is contained in:
kgc91747 2024-08-07 17:19:14 +09:00
commit 896e530d68
5 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java
View File

@ -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,98 @@ 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);
return new ResponseEntity<>( qnaResponseDto,HttpStatus.CREATED);
QnaResponseDto qnaResponseDto = qnaService.createQna(userId, qnaRequestDto, lecture_id);
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);
return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
}
catch (Exception e)
{
String token = request.getHeader("Authorization");
Long userId = Long.parseLong(jwtUtil.getUserId(token));
User findUser = userRepository.findById(userId).orElse(null);
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);
return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
}
catch (Exception e)
{
String token = request.getHeader("Authorization");
Long userId = Long.parseLong(jwtUtil.getUserId(token));
User findUser = userRepository.findById(userId).orElse(null);
if (findUser.getRole() != UserRole.ADMIN) {
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);
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) {
try{
QnaResponseDto qnaResponseDto= qnaService.updateQna(id,qnaRequestDto);
public ResponseEntity<QnaResponseDto> updateQna(@PathVariable Long id, @RequestBody QnaRequestDto qnaRequestDto, HttpServletRequest request) {
String token = request.getHeader("Authorization");
Long userId = Long.parseLong(jwtUtil.getUserId(token));
try {
QnaResponseDto qnaResponseDto = qnaService.updateQna(id, qnaRequestDto, userId);
return new ResponseEntity<>(qnaResponseDto, HttpStatus.ACCEPTED);
}catch (Exception e)
{
throw new RuntimeException(e); }
} catch (Exception 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 +127,8 @@ public class QnaController {
@GetMapping("/{id}")
public ResponseEntity<QnaResponseDto> getQna(@PathVariable Long id) {
try{
QnaResponseDto findQna= qnaService.getQna(id);
try {
QnaResponseDto findQna = qnaService.getQna(id);
return new ResponseEntity<>(findQna, HttpStatus.ACCEPTED);
} catch (SQLException e) {
@ -121,7 +141,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) {

17
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaService.java
View File

@ -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;
QnaResponseDto createAnswer(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
QnaResponseDto updateAnswer(Long id,QnaRequestDto qnaRequestDto) 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;
void deleteAnswer(Long id) throws SQLException;
}

44
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.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,27 @@ 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) {
Qna qna = qnaRepository.findById(id).orElse(null);
User user = userRepository.findById(userId).orElse(null);
if (qna.getUser().getId() == userId) {
qnaRepository.delete(qna);
} else {
throw new RuntimeException();
}
Qna findQna = qnaRepository.findById(id)
@ -65,14 +73,22 @@ public class QnaServiceImpl implements QnaService{
qnaRepository.save(findQna);
return QnaResponseDto.toEntity(findQna);
return QnaResponseDto.toEntity(findQna);
}
@Override
public void deleteQna(Long id) {
qnaRepository.deleteById(id);
public void deleteQna(Long id, Long userId) {
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 +96,7 @@ qnaRepository.deleteById(id);
Optional<Qna> qna;
try {
qna= qnaRepository.findById(id);
qna = qnaRepository.findById(id);
} catch (Exception e) {
@ -89,14 +105,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 +129,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 +144,7 @@ qnaRepository.deleteById(id);
Qna findQna = qnaRepository.findById(id).orElse(null);
findQna.setAnswer(qnaRequestDto.getAnswer());
qnaRepository.save(findQna);
return QnaResponseDto.toEntity(findQna);

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);
String inputAnswer = answerInputList.get(idx);
Answer answer;
//
if (quiz.getAnswer().equals(inputAnswer)) {
correctCount++;
answer = Answer.builder()
@ -183,6 +182,7 @@ public class ReportServiceImpl implements ReportService {
List<Report> reportList = reportRepository.findByUser_Id(userId);
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())) {
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");