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

2026-02-10 09:00:53 +08:00 · 2025-09-18 10:43:55 +08:00
6 changed files with 29 additions and 128 deletions
--- a/backend/.prettierrc
+++ b/backend/.prettierrc
@@ -1,3 +0,0 @@
-{
-  "plugins": ["prettier-plugin-java"]
-}
--- a/backend/src/main/java/com/openisle/controller/PostController.java
+++ b/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,
--- a/backend/src/main/java/com/openisle/mapper/PostMapper.java
+++ b/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())));
--- a/backend/src/main/java/com/openisle/service/PostService.java
+++ b/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);
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,54 +11,9 @@
      "devDependencies": {
        "husky": "^9.1.7",
        "lint-staged": "^16.1.5",
-        "prettier": "^3.6.2",
-        "prettier-plugin-java": "^2.6.3"
+        "prettier": "^3.6.2"
      }
    },
-    "node_modules/@chevrotain/cst-dts-gen": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@chevrotain/cst-dts-gen/-/cst-dts-gen-11.0.3.tgz",
-      "integrity": "sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@chevrotain/gast": "11.0.3",
-        "@chevrotain/types": "11.0.3",
-        "lodash-es": "4.17.21"
-      }
-    },
-    "node_modules/@chevrotain/gast": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@chevrotain/gast/-/gast-11.0.3.tgz",
-      "integrity": "sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@chevrotain/types": "11.0.3",
-        "lodash-es": "4.17.21"
-      }
-    },
-    "node_modules/@chevrotain/regexp-to-ast": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@chevrotain/regexp-to-ast/-/regexp-to-ast-11.0.3.tgz",
-      "integrity": "sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@chevrotain/types": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.0.3.tgz",
-      "integrity": "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@chevrotain/utils": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@chevrotain/utils/-/utils-11.0.3.tgz",
-      "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
    "node_modules/ansi-escapes": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
@@ -127,34 +82,6 @@
        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
-    "node_modules/chevrotain": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-11.0.3.tgz",
-      "integrity": "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@chevrotain/cst-dts-gen": "11.0.3",
-        "@chevrotain/gast": "11.0.3",
-        "@chevrotain/regexp-to-ast": "11.0.3",
-        "@chevrotain/types": "11.0.3",
-        "@chevrotain/utils": "11.0.3",
-        "lodash-es": "4.17.21"
-      }
-    },
-    "node_modules/chevrotain-allstar": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/chevrotain-allstar/-/chevrotain-allstar-0.3.1.tgz",
-      "integrity": "sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash-es": "^4.17.21"
-      },
-      "peerDependencies": {
-        "chevrotain": "^11.0.0"
-      }
-    },
    "node_modules/cli-cursor": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
@@ -315,18 +242,6 @@
        "node": ">=0.12.0"
      }
    },
-    "node_modules/java-parser": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/java-parser/-/java-parser-3.0.1.tgz",
-      "integrity": "sha512-sDIR7u9b7O2JViNUxiZRhnRz7URII/eE7g2B+BmGxDeS6Ex3OYAcCyz5oh0H4LQ+hL/BS8OJTz8apMy9xtGmrQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "chevrotain": "11.0.3",
-        "chevrotain-allstar": "0.3.1",
-        "lodash": "4.17.21"
-      }
-    },
    "node_modules/lilconfig": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
@@ -386,20 +301,6 @@
        "node": ">=20.0.0"
      }
    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/log-update": {
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
@@ -558,19 +459,6 @@
        "url": "https://github.com/prettier/prettier?sponsor=1"
      }
    },
-    "node_modules/prettier-plugin-java": {
-      "version": "2.7.5",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.7.5.tgz",
-      "integrity": "sha512-LH5PKX+cjKOcjnnLXn3/cT8u7vxXxm68r5zsBPI3QQfkfyA/Sx8TTnhbwZdqwQXca431RquBG2ZtmyqmBwBKEw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "java-parser": "3.0.1"
-      },
-      "peerDependencies": {
-        "prettier": "^3.0.0"
-      }
-    },
    "node_modules/restore-cursor": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -20,11 +20,9 @@
  "devDependencies": {
    "husky": "^9.1.7",
    "lint-staged": "^16.1.5",
-    "prettier": "^3.6.2",
-    "prettier-plugin-java": "^2.6.3"
+    "prettier": "^3.6.2"
  },
  "lint-staged": {
-    "frontend_nuxt/**/*": "prettier --write --cache --ignore-unknown",
-    "backend/src/**/*.java": "prettier --write --cache --ignore-unknown"
+    "frontend_nuxt/**/*": "prettier --write --cache --ignore-unknown"
  }
 }