Merge pull request #287 from 6QuizOnTheBlock/be/fix

Be/fix

backEnd/src/main/java/com/quiz/ourclass/domain/challenge/controller/GroupControllerDocs.java

@@ -1,5 +1,6 @@
 package com.quiz.ourclass.domain.challenge.controller;
 
+import com.quiz.ourclass.domain.challenge.dto.response.MatchingRoomResponse;
 import com.quiz.ourclass.global.dto.ResultResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -21,7 +22,7 @@ public interface GroupControllerDocs {
             + "임시 대기방의 ID (Redis KEY) 응답.",
         responses = {
             @ApiResponse(responseCode = "200", description = "(message : \"Success\")",
-                content = @Content(schema = @Schema(implementation = String.class, description = "대기방 KEY")))
+                content = @Content(schema = @Schema(implementation = MatchingRoomResponse.class)))
         })
     @PostMapping("/groups/matchingroom")
     ResponseEntity<ResultResponse<?>> createMatchingRoom(
@@ -53,7 +54,9 @@ ResponseEntity<ResultResponse<?>> joinMatchingRoom(
             + "전체 멤버에게 SSE(CREATE_GROUP) 전송",
         responses = {
             @ApiResponse(responseCode = "200", description = "(message : \"Success\")",
-                content = @Content(schema = @Schema(implementation = Long.class, description = "생성된 그룹 id")))
+                content = @Content(schema = @Schema(implementation = Long.class, description = "생성된 그룹 id"))),
+            @ApiResponse(responseCode = "400", description = "(message : \"그룹 최소 인원이 부족합니다.\")", content = @Content)
+
         })
     @PostMapping("/groups")
     ResponseEntity<ResultResponse<?>> createGroup(

backEnd/src/main/java/com/quiz/ourclass/domain/challenge/dto/response/MatchingRoomResponse.java

@@ -0,0 +1,15 @@
+package com.quiz.ourclass.domain.challenge.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+
+@Builder
+@Schema(description = "그룹 매칭대기방 생성 응답 DTO")
+public record MatchingRoomResponse(
+    @Schema(description = "그룹 매칭대기방 id")
+    String dataKey,
+    @Schema(description = "그룹 최소인원")
+    int minCount
+) {
+
+}

backEnd/src/main/java/com/quiz/ourclass/domain/challenge/service/ChallengeServiceImpl.java

@@ -130,18 +130,22 @@ public long createReport(ReportRequest reportRequest, MultipartFile file) {
     @Transactional
     @Override
     public void confirmReport(long id, ReportType reportType) {
-        //TODO: 해당 학급 선생권한 체크 필요
         Report report = reportRepository.findById(id)
             .orElseThrow(() -> new GlobalException(ErrorCode.REPORT_NOW_FOUND));
-        report.setAcceptStatus(reportType);
+        Member loginMember = accessUtil.getMember().orElseThrow();
         Organization organization = report.getChallengeGroup().getChallenge().getOrganization();
+        if (accessUtil.isOrganizationManager(loginMember, organization.getId()).isEmpty()) {
+            throw new GlobalException(ErrorCode.MEMBER_NOT_MANAGER);
+        }
+        report.setAcceptStatus(reportType);
         if (reportType.equals(ReportType.APPROVE)) {
             report.getChallengeGroup().getGroupMembers().forEach(groupMember -> {
                 Member member = groupMember.getMember();
                 MemberOrganization memberOrganization = memberOrganizationRepository.findByOrganizationAndMember(
                     organization, member).orElseThrow(
                     () -> new GlobalException(ErrorCode.MEMBER_ORGANIZATION_NOT_FOUND));
                 memberOrganization.updateChallengeCount();
+                memberOrganization.updateExp(report.getChallengeGroup().getChallenge().getReward());
                 memberOrganizationRepository.save(memberOrganization);
             });
         }
@@ -209,6 +213,9 @@ protected void challengeClosingReload() {
         challenges.forEach(challenge -> {
             if (challenge.getEndTime().isBefore(LocalDateTime.now())) {
                 challengeClosing(challenge);
+            } else {
+                schedulingService.scheduleTask(challenge, this::challengeClosing,
+                    challenge.getEndTime());
             }
         });
     }

backEnd/src/main/java/com/quiz/ourclass/domain/challenge/service/GroupService.java

@@ -1,8 +1,10 @@
 package com.quiz.ourclass.domain.challenge.service;
 
+import com.quiz.ourclass.domain.challenge.dto.response.MatchingRoomResponse;
+
 public interface GroupService {
 
-    String createMatchingRoom(long challengeId);
+    MatchingRoomResponse createMatchingRoom(long challengeId);
 
     boolean joinMatchingRoom(String key, boolean joinStatus);
 

backEnd/src/main/java/com/quiz/ourclass/domain/challenge/service/GroupServiceImpl.java

@@ -3,6 +3,7 @@
 import static com.quiz.ourclass.global.exception.ErrorCode.CHALLENGE_NOT_FOUND;
 import static com.quiz.ourclass.global.exception.ErrorCode.PERMISSION_DENIED;
 
+import com.quiz.ourclass.domain.challenge.dto.response.MatchingRoomResponse;
 import com.quiz.ourclass.domain.challenge.entity.Challenge;
 import com.quiz.ourclass.domain.challenge.entity.ChallengeGroup;
 import com.quiz.ourclass.domain.challenge.entity.GroupMember;
@@ -42,12 +43,18 @@ public class GroupServiceImpl implements GroupService {
 
     @Transactional
     @Override
-    public String createMatchingRoom(long challengeId) {
+    public MatchingRoomResponse createMatchingRoom(long challengeId) {
         long MemberId = accessUtil.getMember()
             .orElseThrow(() -> new GlobalException(ErrorCode.MEMBER_NOT_FOUND)).getId();
         String dataKey = makeGroupKey(challengeId, MemberId);
         redisUtil.setAdd(dataKey, String.valueOf(MemberId));
-        return dataKey;
+        Challenge challenge = challengeRepository.findById(challengeId)
+            .orElseThrow(() -> new GlobalException(CHALLENGE_NOT_FOUND));
+        int minCount = challenge.getMinCount();
+        return MatchingRoomResponse.builder()
+            .dataKey(dataKey)
+            .minCount(minCount)
+            .build();
     }
 
     @Transactional
@@ -77,6 +84,9 @@ public long createGroup(String key) {
         Set<String> members = redisUtil.setMembers(key);
         Challenge challenge = challengeRepository.findById(getChallengeIdFromKey(key))
             .orElseThrow(() -> new GlobalException(CHALLENGE_NOT_FOUND));
+        if (members.size() < challenge.getMinCount()) {
+            throw new GlobalException(ErrorCode.NOT_ENOUGH_GROUP_MEMBER);
+        }
         long leaderId = getLeaderIdFromKey(key);
         LocalDateTime createTime = LocalDateTime.now();
         ChallengeGroup group = ChallengeGroup.builder()

backEnd/src/main/java/com/quiz/ourclass/domain/relay/service/RelayServiceImpl.java

@@ -153,6 +153,9 @@ public SendRelayResponse sendRelay(long id) {
             .orElseThrow(() -> new GlobalException(ErrorCode.RELAY_NOT_FOUND));
         RelayMember prevRelayMember = relayMemberRepository.findByRelayAndNextMember(relay, member)
             .orElseThrow(() -> new GlobalException(ErrorCode.RELAY_MEMBER_NOT_FOUND));
+        MemberOrganization memberOrganization = memberOrganizationRepository.findByOrganizationAndMember(
+            relay.getOrganization(), member).orElseThrow();
+        memberOrganization.updateExp(ConstantUtil.RELAY_REWARD);
         return SendRelayResponse.builder()
             .prevMemberName(prevRelayMember.getCurMember().getName())
             .prevQuestion(prevRelayMember.getQuestion()).build();

backEnd/src/main/java/com/quiz/ourclass/global/exception/ErrorCode.java

@@ -73,6 +73,7 @@ public enum ErrorCode {
     EXIST_RUNNING_CHALLENGE(HttpStatus.BAD_REQUEST, "종료되지 않은 함께달리기가 존재합니다."),
     CHALLENGE_IS_END(HttpStatus.BAD_REQUEST, "종료된 함께달리기입니다."),
     NOT_CHALLENGE_GROUP_LEADER(HttpStatus.BAD_REQUEST, "레포트 제출은 그룹 리더만 가능합니다."),
+    NOT_ENOUGH_GROUP_MEMBER(HttpStatus.BAD_REQUEST, "그룹 최소 인원이 부족합니다."),
 
     //quiz
     NO_QUIZ_GAME(HttpStatus.NOT_FOUND, "해당 단체에서 생성한 퀴즈가 없습니다."),

backEnd/src/main/java/com/quiz/ourclass/global/util/ConstantUtil.java

@@ -11,6 +11,7 @@ public abstract class ConstantUtil {
     public static final String BLACKLIST_ACCESS_TOKEN = "AT:";
     public static final String QUIZ_GAME = "quiz:";
     public static final int RELAY_DEMERIT = -100;
+    public static final int RELAY_REWARD = 50;
     public static final Long RELAY_TIMEOUT_DAY = 1L;
 
 }