Merge pull request #271 from DevKor-github/fix/vote

장소에 콘센트 투표 저장 추가

Author: dlwls423

src/main/java/devkor/com/teamcback/domain/course/scheduler/CourseScheduler.java

@@ -10,10 +10,7 @@
 import devkor.com.teamcback.global.redis.RedisLockUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -29,11 +26,11 @@ public class CourseScheduler {
     //@EventListener(ApplicationReadyEvent.class)
     //@Transactional
     public void updateCourseDetails() {
-        redisLockUtil.executeWithLock("course_lock", 1, 300, () -> {
+        redisLockUtil.executeWithLock("course_lock", 1, 5000, () -> {
 
             log.info("강의 장소 업데이트");
 
-            List<CourseDetail> courseDetails = courseDetailRepository.findLimitByPlaceIdIsNull(500);
+            List<CourseDetail> courseDetails = courseDetailRepository.findLimitByPlaceIdIsNull(1000);
 
             for (CourseDetail courseDetail : courseDetails) {
                 String placeName = courseDetail.getPlaceName();

src/main/java/devkor/com/teamcback/domain/place/service/AdminPlaceService.java

@@ -10,6 +10,9 @@
 import devkor.com.teamcback.domain.place.repository.PlaceRepository;
 import devkor.com.teamcback.domain.routes.entity.Node;
 import devkor.com.teamcback.domain.routes.repository.NodeRepository;
+import devkor.com.teamcback.domain.vote.entity.Vote;
+import devkor.com.teamcback.domain.vote.entity.VoteStatus;
+import devkor.com.teamcback.domain.vote.repository.VoteRepository;
 import devkor.com.teamcback.global.exception.exception.GlobalException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,7 @@ public class AdminPlaceService {
     private final PlaceRepository placeRepository;
     private final NodeRepository nodeRepository;
     private final FileUtil fileUtil;
+    private final VoteRepository voteRepository;
 
     // 건물 id와 층에 해당하는 장소 리스트 조회
     @Transactional(readOnly = true)
@@ -55,6 +59,10 @@ public CreatePlaceRes createPlace(CreatePlaceReq req) {
         Building building = findBuilding(req.getBuildingId());
         Node node = findNode(req.getNodeId());
         Place place = placeRepository.save(new Place(req, building, node));
+
+        // vote 추가
+        voteRepository.save(new Vote(1L, place.getId(), VoteStatus.OPEN));
+
         return new CreatePlaceRes(place);
     }
 
@@ -72,6 +80,10 @@ public ModifyPlaceRes modifyPlace(Long placeId, ModifyPlaceReq req) {
     @Transactional
     public DeletePlaceRes deletePlace(Long facilityId) {
         Place place = findPlace(facilityId);
+        
+        // 투표 삭제
+        voteRepository.deleteByPlaceId(place.getId());
+
         placeRepository.delete(place);
 
         return new DeletePlaceRes();

src/main/java/devkor/com/teamcback/domain/vote/controller/AdminVoteController.java

@@ -1,6 +1,7 @@
 package devkor.com.teamcback.domain.vote.controller;
 
 import devkor.com.teamcback.domain.vote.dto.response.ChangeVoteStatusRes;
+import devkor.com.teamcback.domain.vote.dto.response.CreatePlaceVoteRes;
 import devkor.com.teamcback.domain.vote.dto.response.GetVoteRes;
 import devkor.com.teamcback.domain.vote.entity.VoteStatus;
 import devkor.com.teamcback.domain.vote.service.VoteService;
@@ -15,6 +16,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admin/votes")
@@ -59,4 +62,38 @@ public CommonResponse<CursorPageRes<GetVoteRes>> getVoteList(
             ) {
         return CommonResponse.success(voteService.getVoteList(status, lastVoteId, size));
     }
+
+    /**
+     * 득표 수 많은 투표 조회
+     */
+    @Operation(summary = "득표 수 많은 투표 조회", description = "득표 수 20 이상인 투표 조회")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "Not Found",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @GetMapping("/major")
+    public CommonResponse<List<GetVoteRes>> getMajorVoteList(
+            @Parameter(description = "투표 상태", example = "REFLECTED")
+            @RequestParam(name = "status", required = false) VoteStatus status
+    ) {
+        return CommonResponse.success(voteService.getMajorVoteList(status));
+    }
+
+    /**
+     * 장소에 투표 생성(일괄)
+     */
+    @Operation(summary = "장소에 투표 생성(일괄)", description = "생성 원하는 투표 주제 id 입력")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "Not Found",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PostMapping("/topics/{voteTopicId}")
+    public CommonResponse<CreatePlaceVoteRes> createPlaceVote(
+            @Parameter(description = "투표 주제 ID", example = "1")
+            @PathVariable(name = "voteTopicId") Long voteTopicId) {
+        return CommonResponse.success(voteService.createPlaceVote(voteTopicId));
+    }
+
 }

src/main/java/devkor/com/teamcback/domain/vote/dto/response/CreatePlaceVoteRes.java

@@ -0,0 +1,9 @@
+package devkor.com.teamcback.domain.vote.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "투표 생성 완료")
+@JsonIgnoreProperties
+public class CreatePlaceVoteRes {
+}

src/main/java/devkor/com/teamcback/domain/vote/entity/Vote.java

@@ -30,6 +30,12 @@ public class Vote extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private VoteStatus status;
 
+    public Vote(Long voteTopicId, Long placeId, VoteStatus voteStatus) {
+        this.voteTopicId = voteTopicId;
+        this.placeId = placeId;
+        this.status = voteStatus;
+    }
+
     public void checkStatus() {
         if(this.status == CLOSED) throw new GlobalException(CLOSED_VOTE);
     }

src/main/java/devkor/com/teamcback/domain/vote/repository/CustomVoteRepository.java

@@ -15,4 +15,6 @@ public interface CustomVoteRepository {
     List<GetVoteOptionRes> getVoteOptionByVoteId(Long voteId);
 
     List<GetVoteOptionRes> getVoteOptionByVoteIdOrderByCount(Long voteId);
+
+    List<Vote> findMajorVote(VoteStatus status, int count);
 }

src/main/java/devkor/com/teamcback/domain/vote/repository/CustomVoteRepositoryImpl.java

@@ -2,15 +2,13 @@
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
-import static devkor.com.teamcback.domain.place.entity.QPlace.place;
 import static devkor.com.teamcback.domain.vote.entity.QVoteOption.voteOption;
 import static devkor.com.teamcback.domain.vote.entity.QVoteRecord.voteRecord;
 import static devkor.com.teamcback.domain.vote.entity.QVote.vote;
 
-import devkor.com.teamcback.domain.place.entity.Place;
-import devkor.com.teamcback.domain.place.entity.PlaceType;
 import devkor.com.teamcback.domain.vote.dto.response.GetVoteOptionRes;
 import devkor.com.teamcback.domain.vote.dto.response.QGetVoteOptionRes;
 import devkor.com.teamcback.domain.vote.entity.Vote;
@@ -126,6 +124,21 @@ public List<GetVoteOptionRes> getVoteOptionByVoteIdOrderByCount(Long voteId) {
                 .fetch();
     }
 
+    @Override
+    public List<Vote> findMajorVote(VoteStatus status, int count){
+        return jpaQueryFactory
+                .selectFrom(vote)
+                .where(vote.id.in(
+                        JPAExpressions
+                                .select(voteRecord.voteId)
+                                .from(voteRecord)
+                                .groupBy(voteRecord.voteId)
+                                .having(voteRecord.id.count().goe(count))
+                ).and(vote.status.eq(status)))
+                .fetch();
+
+    }
+
     private BooleanExpression gtVoteCursor(Long lastVoteId) {
         if (lastVoteId== null) return null;
         return vote.id.gt(lastVoteId);

src/main/java/devkor/com/teamcback/domain/vote/repository/VoteRepository.java

@@ -12,6 +12,7 @@
 public interface VoteRepository extends JpaRepository<Vote, Long> {
     Optional<Vote> findByVoteTopicIdAndPlaceId(Long voteTopicId, Long placeId);
 
-    @Query("SELECT v FROM Vote v WHERE v.status IS NULL OR v.status = :status")
-    List<Vote> findAllByStatus(@Param("status")VoteStatus status);
+    void deleteByPlaceId(Long id);
+
+    List<Vote> findByVoteTopicId(Long voteTopicId);
 }

src/main/java/devkor/com/teamcback/domain/vote/service/VoteService.java

@@ -3,10 +3,7 @@
 import devkor.com.teamcback.domain.place.entity.Place;
 import devkor.com.teamcback.domain.place.repository.PlaceRepository;
 import devkor.com.teamcback.domain.vote.dto.request.SaveVoteRecordReq;
-import devkor.com.teamcback.domain.vote.dto.response.ChangeVoteStatusRes;
-import devkor.com.teamcback.domain.vote.dto.response.GetVoteOptionRes;
-import devkor.com.teamcback.domain.vote.dto.response.GetVoteRes;
-import devkor.com.teamcback.domain.vote.dto.response.SaveVoteRecordRes;
+import devkor.com.teamcback.domain.vote.dto.response.*;
 import devkor.com.teamcback.domain.vote.entity.*;
 import devkor.com.teamcback.domain.vote.repository.VoteOptionRepository;
 import devkor.com.teamcback.domain.vote.repository.VoteRecordRepository;
@@ -22,6 +19,7 @@
 import java.util.*;
 
 import static devkor.com.teamcback.domain.vote.entity.VoteStatus.CLOSED;
+import static devkor.com.teamcback.domain.vote.entity.VoteStatus.OPEN;
 import static devkor.com.teamcback.global.response.ResultCode.*;
 
 @Service
@@ -131,6 +129,30 @@ public CursorPageRes<GetVoteRes> getVoteList(VoteStatus status, Long lastVoteId,
         return new CursorPageRes<>(resList, hasNext, lastCursorId);
     }
 
+    /**
+     * 득표 수 많은 투표 조회
+     */
+    public List<GetVoteRes> getMajorVoteList(VoteStatus status) {
+        List<GetVoteRes> resList = new ArrayList<>();
+
+        List<Vote> voteList = voteOptionRepository.findMajorVote(status, 20);
+
+        for(Vote vote : voteList) {
+            // 투표 주제
+            VoteTopic voteTopic = findVoteTopic(vote.getVoteTopicId());
+
+            // 투표 장소
+            Place place = findPlace(vote.getPlaceId());
+
+            // 투표 항목, 현황
+            List<GetVoteOptionRes> voteOptionList = voteOptionRepository.getVoteOptionByVoteId(vote.getId());
+
+            resList.add(new GetVoteRes(vote.getId(), vote.getStatus().toString(), voteTopic.getId(), voteTopic.getTopic(), place.getId(), place.getName(), voteOptionList));
+        }
+
+        return resList;
+    }
+
     /**
      * 투표 상태 변경
      */
@@ -144,6 +166,24 @@ public ChangeVoteStatusRes changeVoteStatus(Long voteId, VoteStatus status) {
         return new ChangeVoteStatusRes();
     }
 
+    /**
+     * 장소에 투표 생성(일괄)
+     */
+    @Transactional
+    public CreatePlaceVoteRes createPlaceVote(Long voteTopicId) {
+        // 해당 투표를 가지고 있는 장소 id
+        List<Long> placeIdsOfVote = voteRepository.findByVoteTopicId(voteTopicId).stream().map(Vote::getPlaceId).toList();
+
+        List<Place> places = placeRepository.findAll();
+        for(Place place : places) {
+            if(!placeIdsOfVote.contains(place.getId())) {
+                voteRepository.save(new Vote(voteTopicId, place.getId(), OPEN));
+            }
+        }
+
+        return new CreatePlaceVoteRes();
+    }
+
     private Vote findVote(Long voteTopicId, Long placeId) {
         return voteRepository.findByVoteTopicIdAndPlaceId(voteTopicId, placeId).orElseThrow(() -> new GlobalException(NOT_FOUND_VOTE));
     }