Merge pull request #1000 from nagisa77/feature/lottery_post_bugfix

fix: 抽奖贴无法看见参与人员 #999

backend/src/main/java/com/openisle/controller/PostController.java

@@ -1,5 +1,6 @@
 package com.openisle.controller;
 
+import com.openisle.config.CachingConfig;
 import com.openisle.dto.PostDetailDto;
 import com.openisle.dto.PostRequest;
 import com.openisle.dto.PostSummaryDto;
@@ -15,6 +16,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
@@ -142,6 +144,10 @@ public class PostController {
     @Operation(summary = "List posts", description = "List posts by various filters")
     @ApiResponse(responseCode = "200", description = "List of posts",
             content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
+    @Cacheable(
+            value = CachingConfig.POST_CACHE_NAME,
+            key = "new org.springframework.cache.interceptor.SimpleKey('default', #categoryId, #categoryIds, #tagId, #tagIds, #page, #pageSize)"
+    )
     public List<PostSummaryDto> listPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
                                    @RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
                                    @RequestParam(value = "tagId", required = false) Long tagId,
@@ -188,6 +194,10 @@ public class PostController {
     @Operation(summary = "Latest reply posts", description = "List posts by latest replies")
     @ApiResponse(responseCode = "200", description = "Posts sorted by latest reply",
             content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
+    @Cacheable(
+            value = CachingConfig.POST_CACHE_NAME,
+            key = "new org.springframework.cache.interceptor.SimpleKey('latest_reply', #categoryId, #categoryIds, #tagIds, #page, #pageSize)"
+    )
     public List<PostSummaryDto> latestReplyPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
                                           @RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
                                           @RequestParam(value = "tagId", required = false) Long tagId,

backend/src/main/java/com/openisle/mapper/PostMapper.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /** Mapper responsible for converting posts into DTOs. */
@@ -99,6 +100,8 @@ public class PostMapper {
             l.setPointCost(lp.getPointCost());
             l.setStartTime(lp.getStartTime());
             l.setEndTime(lp.getEndTime());
+            l.setParticipants(lp.getParticipants().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
+            l.setWinners(lp.getWinners().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
             dto.setLottery(l);
         }
 
@@ -107,6 +110,7 @@ public class PostMapper {
             p.setOptions(pp.getOptions());
             p.setVotes(pp.getVotes());
             p.setEndTime(pp.getEndTime());
+            p.setParticipants(pp.getParticipants().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
             Map<Integer, List<AuthorDto>> optionParticipants = pollVoteRepository.findByPostId(pp.getId()).stream()
                     .collect(Collectors.groupingBy(PollVote::getOptionIndex,
                             Collectors.mapping(v -> userMapper.toAuthorDto(v.getUser()), Collectors.toList())));

backend/src/main/java/com/openisle/service/PostService.java

@@ -323,6 +323,9 @@ public class PostService {
         return false;
     }
 
+    @CacheEvict(
+            value = CachingConfig.POST_CACHE_NAME, allEntries = true
+    )
     public void joinLottery(Long postId, String username) {
         LotteryPost post = lotteryPostRepository.findById(postId)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
@@ -339,6 +342,9 @@ public class PostService {
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
     }
 
+    @CacheEvict(
+            value = CachingConfig.POST_CACHE_NAME, allEntries = true
+    )
     @Transactional
     public PollPost votePoll(Long postId, String username, java.util.List<Integer> optionIndices) {
         PollPost post = pollPostRepository.findById(postId)
@@ -376,6 +382,9 @@ public class PostService {
         return saved;
     }
 
+    @CacheEvict(
+            value = CachingConfig.POST_CACHE_NAME, allEntries = true
+    )
     @Transactional
     public void finalizePoll(Long postId) {
         scheduledFinalizations.remove(postId);
@@ -395,6 +404,9 @@ public class PostService {
         });
     }
 
+    @CacheEvict(
+            value = CachingConfig.POST_CACHE_NAME, allEntries = true
+    )
     @Transactional
     public void finalizeLottery(Long postId) {
         log.info("start to finalizeLottery for {}", postId);
@@ -508,10 +520,6 @@ public class PostService {
         return listPostsByLatestReply(null, null, page, pageSize);
     }
 
-    @Cacheable(
-            value = CachingConfig.POST_CACHE_NAME,
-            key = "new org.springframework.cache.interceptor.SimpleKey('latest_reply', #categoryIds, #tagIds, #page, #pageSize)"
-    )
     public List<Post> listPostsByLatestReply(java.util.List<Long> categoryIds,
                                              java.util.List<Long> tagIds,
                                              Integer page,
@@ -647,10 +655,6 @@ public class PostService {
      * @param pageSize
      * @return
      */
-    @Cacheable(
-            value = CachingConfig.POST_CACHE_NAME,
-            key = "new org.springframework.cache.interceptor.SimpleKey('default', #ids, #tids, #page, #pageSize)"
-    )
     public List<Post> defaultListPosts(List<Long> ids, List<Long> tids, Integer page, Integer pageSize){
         boolean hasCategories = !CollectionUtils.isEmpty(ids);
         boolean hasTags = !CollectionUtils.isEmpty(tids);