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

Merge pull request #140 from TeamBNBN/be/Quiz

Browse Source 
feat: Quiz 등록, 조회 요청 형식 변경 반영
This commit is contained in:
Jungmin 2024-07-30 14:33:46 +09:00 committed by GitHub
commit 3fc1f37b1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 253 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
backend/src/main/java/com/edufocus/edufocus/quiz/controller/QuizController.java
View File

@ -12,9 +12,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
import java.util.List;
@RestController
@RequestMapping("/quiz")
@ -30,31 +29,14 @@ public class QuizController {
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public ResponseEntity<?> createQuizSet(@RequestHeader("Authorization") String accessToken, @RequestPart QuizSetCreateRequest quizSetCreateRequest
, @RequestPart(value = "image", required = false) MultipartFile image) throws IOException {
, @RequestPart(value = "images", required = false) List<MultipartFile> images) throws IOException {
Long userId = Long.parseLong(jwtUtil.getUserId(accessToken));
String title = quizSetCreateRequest.getTitle();
SetCreateRequest setCreateRequest = new SetCreateRequest(userId, title);
QuizSet quizSet = quizSetService.createQuizSet(setCreateRequest);
if (image != null && !image.isEmpty()) {
String uid = UUID.randomUUID().toString();
String currentPath = "backend/src/main/resources/images/";
File checkPathFile = new File(currentPath);
if (!checkPathFile.exists()) {
checkPathFile.mkdirs();
}
File savingImage = new File(currentPath + uid + "_" + image.getOriginalFilename());
image.transferTo(savingImage.toPath());
String savePath = savingImage.toPath().toString();
quizSet.setImage(savePath);
}
QuizSet quizSet = quizSetService.createQuizSet(userId, quizSetCreateRequest.getTitle());
int imageIdx = 0;
for (QuizCreateRequest quizCreateRequest : quizSetCreateRequest.getQuizzes()) {
quizService.createQuiz(quizSet.getId(), quizCreateRequest);
quizService.createQuiz(quizSet, quizCreateRequest, images.get(imageIdx++));
}
return new ResponseEntity<>(HttpStatus.CREATED);
@ -62,8 +44,30 @@ public class QuizController {
@GetMapping("/{quizsetId}")
public ResponseEntity<?> getQuizzes(@PathVariable Long quizsetId) {
QuizSet quizSet = quizSetService.findQuizSet(quizsetId);
QuizSetResponse quizSet = quizSetService.findQuizSetResponse(quizsetId);
if (quizSet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
return new ResponseEntity<>(quizSet, HttpStatus.OK);
}
@DeleteMapping("/{quizsetId}")
public ResponseEntity<?> deleteQuizSet(@RequestHeader("Authorization") String accessToken, @PathVariable Long quizsetId) {
Long userId = Long.parseLong(jwtUtil.getUserId(accessToken));
if (!quizSetService.deleteQuizSet(userId, quizsetId)) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping
public ResponseEntity<?> getQuizSets(@RequestHeader("Authorization") String accessToken) {
Long userId = Long.parseLong(jwtUtil.getUserId(accessToken));
return new ResponseEntity<>(quizSetService.findMyQuizSetResponses(userId), HttpStatus.OK);
}
}

29
backend/src/main/java/com/edufocus/edufocus/quiz/entity/Choice.java Normal file
View File

@ -0,0 +1,29 @@
package com.edufocus.edufocus.quiz.entity;
import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.*;
@Entity
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Choice {
@Id
@GeneratedValue
private Long id;
@ManyToOne
@JoinColumn(name = "QuizId")
@JsonBackReference
private Quiz quiz;
@Column
private int num;
@Column
private String content;
}

7
backend/src/main/java/com/edufocus/edufocus/quiz/entity/SetCreateRequest.java → backend/src/main/java/com/edufocus/edufocus/quiz/entity/ChoiceCreateRequest.java
View File

@ -7,10 +7,9 @@ import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class SetCreateRequest {
public class ChoiceCreateRequest {
private Long UserId;
private String title;
private int num;
private String content;
}

14
backend/src/main/java/com/edufocus/edufocus/quiz/entity/MyQuizSetResponse.java Normal file
View File

@ -0,0 +1,14 @@
package com.edufocus.edufocus.quiz.entity;
import lombok.*;
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class MyQuizSetResponse {
private Long quizSetId;
private String title;
}

35
backend/src/main/java/com/edufocus/edufocus/quiz/entity/Quiz.java
View File

@ -1,11 +1,12 @@
package com.edufocus.edufocus.quiz.entity;
import com.edufocus.edufocus.user.model.entity.UserRole;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import jakarta.persistence.*;
import lombok.*;
import java.util.List;
@Entity
@Getter
@Setter
@ -24,31 +25,17 @@ public class Quiz {
private QuizSet quizSet;
@Column
private String title;
@Column
private String description;
@Column
private String answer;
@Enumerated(EnumType.STRING)
private QuizType quizType;
private String question;
@Column
private String image;
@Column
private String choice1;
private String answer;
@Column
private String choice2;
@Column
private String choice3;
@Column
private String choice4;
@OneToMany(mappedBy = "quiz", orphanRemoval = true, cascade = CascadeType.ALL)
@JsonManagedReference
private List<Choice> choices;
public void setQuizSet(QuizSet quizSet) {
this.quizSet = quizSet;
@ -57,4 +44,12 @@ public class Quiz {
quizSet.getQuizzes().remove(this);
}
}
public void addChoice(Choice choice) {
this.choices.add(choice);
if (choice.getQuiz() != this) {
choice.setQuiz(this);
}
}
}

16
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizCreateRequest.java
View File

@ -4,24 +4,16 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import java.util.List;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class QuizCreateRequest {
private String title;
private String description;
private String question;
private String answer;
private String quizType;
private String choice1;
private String choice2;
private String choice3;
private String choice4;
private List<ChoiceCreateRequest> choices;
}

21
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizResponse.java Normal file
View File

@ -0,0 +1,21 @@
package com.edufocus.edufocus.quiz.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import java.util.List;
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class QuizResponse {
private String question;
private String image;
private List<Choice> choices;
}

5
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizSet.java
View File

@ -27,10 +27,7 @@ public class QuizSet {
@Column
private String title;
@Column
private String image;
@OneToMany(mappedBy = "quizSet")
@OneToMany(mappedBy = "quizSet", orphanRemoval = true)
@JsonManagedReference
private List<Quiz> quizzes = new ArrayList<Quiz>();

4
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizSetCreateRequest.java
View File

@ -11,12 +11,8 @@ import java.util.List;
@AllArgsConstructor
public class QuizSetCreateRequest {
private Long UserId;
private String title;
private String image;
private List<QuizCreateRequest> quizzes;
}

17
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizSetResponse.java Normal file
View File

@ -0,0 +1,17 @@
package com.edufocus.edufocus.quiz.entity;
import lombok.*;
import java.util.List;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class QuizSetResponse {
private String title;
private List<QuizResponse> quizzes;
}

5
backend/src/main/java/com/edufocus/edufocus/quiz/entity/QuizType.java
View File

@ -1,5 +0,0 @@
package com.edufocus.edufocus.quiz.entity;
public enum QuizType {
SINGLE, MULTIPLE
}

1
backend/src/main/java/com/edufocus/edufocus/quiz/repository/QuizRepository.java
View File

@ -3,7 +3,6 @@ package com.edufocus.edufocus.quiz.repository;
import com.edufocus.edufocus.quiz.entity.Quiz;
import org.springframework.data.jpa.repository.JpaRepository;
public interface QuizRepository extends JpaRepository<Quiz, Long> {
}

3
backend/src/main/java/com/edufocus/edufocus/quiz/repository/QuizSetRepository.java
View File

@ -3,6 +3,9 @@ package com.edufocus.edufocus.quiz.repository;
import com.edufocus.edufocus.quiz.entity.QuizSet;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface QuizSetRepository extends JpaRepository<QuizSet, Long> {
List<QuizSet> findQuizSetsByUserId(Long userId);
}

7
backend/src/main/java/com/edufocus/edufocus/quiz/service/QuizService.java
View File

@ -1,15 +1,16 @@
package com.edufocus.edufocus.quiz.service;
import com.edufocus.edufocus.quiz.entity.QuizCreateRequest;
import com.edufocus.edufocus.quiz.entity.QuizSet;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
@Service
public interface QuizService {
void createQuiz(long quizSetId, QuizCreateRequest
QuizCreateRequest);
void createQuiz(QuizSet quizSet, QuizCreateRequest quizCreateRequest, MultipartFile quizImage) throws IOException;
boolean deleteQuiz(long quizId);
}

68
backend/src/main/java/com/edufocus/edufocus/quiz/service/QuizServiceImpl.java
View File

@ -1,14 +1,18 @@
package com.edufocus.edufocus.quiz.service;
import com.edufocus.edufocus.quiz.entity.Quiz;
import com.edufocus.edufocus.quiz.entity.QuizCreateRequest;
import com.edufocus.edufocus.quiz.entity.QuizSet;
import com.edufocus.edufocus.quiz.entity.QuizType;
import com.edufocus.edufocus.quiz.entity.*;
import com.edufocus.edufocus.quiz.repository.QuizRepository;
import com.edufocus.edufocus.quiz.repository.QuizSetRepository;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Service
@Transactional
@ -17,39 +21,45 @@ public class QuizServiceImpl implements QuizService {
private final QuizRepository quizRepository;
private final QuizSetRepository quizSetRepository;
@Override
public void createQuiz(long quizSetId, QuizCreateRequest quizCreateRequest) {
QuizSet quizSet = quizSetRepository.findById(quizSetId).get();
public void createQuiz(QuizSet quizSet, QuizCreateRequest quizCreateRequest, MultipartFile quizImage) throws IOException {
Quiz quiz = new Quiz().builder()
.title(quizCreateRequest.getTitle())
.description(quizCreateRequest.getDescription())
.answer(quizCreateRequest.getAnswer())
.quizType(QuizType.valueOf(quizCreateRequest.getQuizType()))
.quizSet(quizSet)
.question(quizCreateRequest.getQuestion())
.answer(quizCreateRequest.getAnswer())
.build();
if (!quiz.getQuizType().equals(QuizType.MULTIPLE)) {
quiz.setChoice1(quizCreateRequest.getChoice1());
quiz.setChoice2(quizCreateRequest.getChoice2());
quiz.setChoice3(quizCreateRequest.getChoice3());
quiz.setChoice4(quizCreateRequest.getChoice4());
List<Choice> choices = new ArrayList<>();
for (ChoiceCreateRequest choiceCreateRequest : quizCreateRequest.getChoices()) {
Choice choice = new Choice().builder()
.quiz(quiz)
.num(choiceCreateRequest.getNum())
.content(choiceCreateRequest.getContent())
.build();
choices.add(choice);
}
quiz.setChoices(choices);
if (quizImage != null && !quizImage.isEmpty()) {
String uid = UUID.randomUUID().toString();
String currentPath = "backend/src/main/resources/images/quizzes/";
File checkPathFile = new File(currentPath);
if (!checkPathFile.exists()) {
checkPathFile.mkdirs();
}
File savingImage = new File(currentPath + uid + "_" + quizImage.getOriginalFilename());
quizImage.transferTo(savingImage.toPath());
String savePath = savingImage.toPath().toString();
quiz.setImage(savePath);
}
quizRepository.save(quiz);
}
@Override
public boolean deleteQuiz(long quizId) {
// 유저 아이디 정보 조회 후 검증 로직 추가 예정
// jwt -> 로그인 유저 정보 조회
// quizId -> 퀴즈 정보 조회 -> 퀴즈셋 정보 조회
// 퀴즈셋 생성자와 로그인 유저의 id값이 일치하는지 확인 -> 불일치시 삭제 실패
quizRepository.deleteById(quizId);
return true;
}
}

15
backend/src/main/java/com/edufocus/edufocus/quiz/service/QuizSetService.java
View File

@ -1,17 +1,24 @@
package com.edufocus.edufocus.quiz.service;
import com.edufocus.edufocus.quiz.entity.MyQuizSetResponse;
import com.edufocus.edufocus.quiz.entity.QuizSet;
import com.edufocus.edufocus.quiz.entity.SetCreateRequest;
import com.edufocus.edufocus.quiz.entity.QuizSetResponse;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public interface QuizSetService {
QuizSet createQuizSet(SetCreateRequest setCreateRequest);
QuizSet createQuizSet(Long userId, String title);
void updateQuizSet(QuizSet quizSet);
void deleteQuizSet(long quizSetId);
boolean deleteQuizSet(Long userId, Long quizSetId);
QuizSet findQuizSet(long quizSetId);
QuizSet findQuizSet(Long quizSetId);
QuizSetResponse findQuizSetResponse(Long quizSetId);
List<MyQuizSetResponse> findMyQuizSetResponses(Long userId);
}

71
backend/src/main/java/com/edufocus/edufocus/quiz/service/QuizSetServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.edufocus.edufocus.quiz.service;
import com.edufocus.edufocus.quiz.entity.*;
import com.edufocus.edufocus.quiz.repository.QuizRepository;
import com.edufocus.edufocus.quiz.repository.QuizSetRepository;
import com.edufocus.edufocus.user.model.entity.User;
import com.edufocus.edufocus.user.model.repository.UserRepository;
@ -9,6 +8,10 @@ import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@Service
@Transactional
@RequiredArgsConstructor
@ -18,16 +21,13 @@ public class QuizSetServiceImpl implements QuizSetService {
private final UserRepository userRepository;
@Override
public QuizSet createQuizSet(SetCreateRequest setCreateRequest) {
public QuizSet createQuizSet(Long userId, String title) {
QuizSet quizSet = new QuizSet();
User user = userRepository.findById(setCreateRequest.getUserId()).get();
User user = userRepository.findById(userId).get();
quizSet.setUser(user);
quizSet.setTitle(setCreateRequest.getTitle());
quizSet.setTitle(title);
return quizSetRepository.save(quizSet);
}
@ -38,12 +38,65 @@ public class QuizSetServiceImpl implements QuizSetService {
}
@Override
public void deleteQuizSet(long quizSetId) {
public boolean deleteQuizSet(Long userId, Long quizSetId) {
Optional<QuizSet> quizSet = quizSetRepository.findById(quizSetId);
if (quizSet.isEmpty() || userId != quizSet.get().getUser().getId()) {
return false;
}
quizSetRepository.deleteById(quizSetId);
return true;
}
@Override
public QuizSet findQuizSet(long quizSetId) {
public QuizSet findQuizSet(Long quizSetId) {
return quizSetRepository.findById(quizSetId).get();
}
@Override
public QuizSetResponse findQuizSetResponse(Long quizSetId) {
Optional<QuizSet> quizSet = quizSetRepository.findById(quizSetId);
if (quizSet.isEmpty()) {
return null;
}
List<QuizResponse> quizResponses = new ArrayList<>();
for (Quiz quiz : quizSet.get().getQuizzes()) {
QuizResponse quizResponse = new QuizResponse().builder()
.question(quiz.getQuestion())
.image(quiz.getImage())
.choices(quiz.getChoices())
.build();
quizResponses.add(quizResponse);
}
QuizSetResponse quizSetResponse = new QuizSetResponse().builder()
.title(quizSet.get().getTitle())
.quizzes(quizResponses)
.build();
return quizSetResponse;
}
@Override
public List<MyQuizSetResponse> findMyQuizSetResponses(Long userId) {
List<QuizSet> quizSetList = quizSetRepository.findQuizSetsByUserId(userId);
List<MyQuizSetResponse> myQuizSetResponses = new ArrayList<>();
for (QuizSet quizSet : quizSetList) {
MyQuizSetResponse myQuizSetResponse = new MyQuizSetResponse().builder()
.quizSetId(quizSet.getId())
.title(quizSet.getTitle())
.build();
myQuizSetResponses.add(myQuizSetResponse);
}
return myQuizSetResponses;
}
}

4
backend/src/main/java/com/edufocus/edufocus/registration/controller/RegistrationController.java
View File

@ -26,11 +26,9 @@ public class RegistrationController {
Long lectureId = map.get("lectureId");
if (!registrationServiceImpl.createRegistration(userId, lectureId)) {
String msg = new String("Duplicated Registration");
return new ResponseEntity<>(msg, HttpStatus.CONFLICT);
return new ResponseEntity<>(HttpStatus.CONFLICT);
}
String msg = new String("registration successful");
return new ResponseEntity<>(HttpStatus.CREATED);
}