Merge branch 'be/quiz' into 'backend'
feat: 퀴즈 시작이후 해당 퀴즈 변경 불가 See merge request s11-webmobile1-sub2/S11P12A701!169
This commit is contained in:
commit
abcf4b7959
@ -22,5 +22,5 @@ public interface QuizSetService {
|
|||||||
|
|
||||||
List<MyQuizSetResponse> findMyQuizSetResponses(long userId);
|
List<MyQuizSetResponse> findMyQuizSetResponses(long userId);
|
||||||
|
|
||||||
void updateQuizSetTested(long quizSetId, long userId, boolean tested);
|
void updateQuizSetTested(long quizSetId);
|
||||||
}
|
}
|
||||||
|
@ -99,15 +99,9 @@ public class QuizSetServiceImpl implements QuizSetService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateQuizSetTested(long quizSetId, long userId, boolean tested) {
|
public void updateQuizSetTested(long quizSetId) {
|
||||||
QuizSet quizSet = quizSetRepository.findById(quizSetId).orElseThrow(NoSuchElementException::new);
|
QuizSet quizSet = quizSetRepository.findById(quizSetId).orElseThrow(NoSuchElementException::new);
|
||||||
|
|
||||||
User user = userRepository.findById(userId).orElseThrow(NoSuchElementException::new);
|
|
||||||
|
|
||||||
if (quizSet.getUser().getId() != user.getId()) {
|
|
||||||
throw new UnAuthorizedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
quizSet.setTested(true);
|
quizSet.setTested(true);
|
||||||
quizSetRepository.save(quizSet);
|
quizSetRepository.save(quizSet);
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package com.edufocus.edufocus.ws.controller;
|
|||||||
|
|
||||||
|
|
||||||
import com.edufocus.edufocus.global.constant.RabbitMQConstant;
|
import com.edufocus.edufocus.global.constant.RabbitMQConstant;
|
||||||
|
import com.edufocus.edufocus.quiz.service.QuizSetService;
|
||||||
import com.edufocus.edufocus.report.service.ReportService;
|
import com.edufocus.edufocus.report.service.ReportService;
|
||||||
import com.edufocus.edufocus.ws.entity.dto.MessageDto;
|
import com.edufocus.edufocus.ws.entity.dto.MessageDto;
|
||||||
import com.edufocus.edufocus.ws.entity.dto.QuizDto;
|
import com.edufocus.edufocus.ws.entity.dto.QuizDto;
|
||||||
@ -17,22 +18,25 @@ public class ChatController {
|
|||||||
|
|
||||||
RabbitTemplate rabbitTemplate;
|
RabbitTemplate rabbitTemplate;
|
||||||
ReportService reportService;
|
ReportService reportService;
|
||||||
|
QuizSetService quizSetService;
|
||||||
|
|
||||||
public ChatController(RabbitTemplate rabbitTemplate, ReportService reportService){
|
public ChatController(RabbitTemplate rabbitTemplate, ReportService reportService, QuizSetService quizSetService) {
|
||||||
this.rabbitTemplate = rabbitTemplate;
|
this.rabbitTemplate = rabbitTemplate;
|
||||||
this.reportService = reportService;
|
this.reportService = reportService;
|
||||||
|
this.quizSetService = quizSetService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@MessageMapping("chat.message.{lectureId}")
|
@MessageMapping("chat.message.{lectureId}")
|
||||||
public void sendMessage(@DestinationVariable long lectureId, MessageDto messageDto){
|
public void sendMessage(@DestinationVariable long lectureId, MessageDto messageDto) {
|
||||||
rabbitTemplate.convertAndSend(RabbitMQConstant.CHAT_EXCHANGE.getConstant(),
|
rabbitTemplate.convertAndSend(RabbitMQConstant.CHAT_EXCHANGE.getConstant(),
|
||||||
RabbitMQConstant.ROUTING_KEY_PREFIX.getConstant() + lectureId,
|
RabbitMQConstant.ROUTING_KEY_PREFIX.getConstant() + lectureId,
|
||||||
messageDto);
|
messageDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@MessageMapping("chat.quiz.{lectureId}")
|
@MessageMapping("chat.quiz.{lectureId}")
|
||||||
public void quizStart(@DestinationVariable long lectureId, QuizDto quizDto){
|
public void quizStart(@DestinationVariable long lectureId, QuizDto quizDto) {
|
||||||
UUID reportSetId = reportService.initReportSet(lectureId, quizDto.getQuizSetId());
|
UUID reportSetId = reportService.initReportSet(lectureId, quizDto.getQuizSetId());
|
||||||
|
quizSetService.updateQuizSetTested(quizDto.getQuizSetId());
|
||||||
|
|
||||||
quizDto.setReportSetId(reportSetId);
|
quizDto.setReportSetId(reportSetId);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user