feat: notify lottery author

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

@@ -1,29 +0,0 @@
-package com.openisle.controller;
-
-import com.openisle.dto.CommentDto;
-import com.openisle.mapper.CommentMapper;
-import com.openisle.service.CommentService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * Endpoints for administrators to manage comments.
- */
-@RestController
-@RequestMapping("/api/admin/comments")
-@RequiredArgsConstructor
-public class AdminCommentController {
-    private final CommentService commentService;
-    private final CommentMapper commentMapper;
-
-    @PostMapping("/{id}/pin")
-    public CommentDto pin(@PathVariable Long id, Authentication auth) {
-        return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
-    }
-
-    @PostMapping("/{id}/unpin")
-    public CommentDto unpin(@PathVariable Long id, Authentication auth) {
-        return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
-    }
-}

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

@@ -85,16 +85,4 @@ public class CommentController {
         commentService.deleteComment(auth.getName(), id);
         log.debug("deleteComment completed for comment {}", id);
     }
-
-    @PostMapping("/comments/{id}/pin")
-    public CommentDto pinComment(@PathVariable Long id, Authentication auth) {
-        log.debug("pinComment called by user {} for comment {}", auth.getName(), id);
-        return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
-    }
-
-    @PostMapping("/comments/{id}/unpin")
-    public CommentDto unpinComment(@PathVariable Long id, Authentication auth) {
-        log.debug("unpinComment called by user {} for comment {}", auth.getName(), id);
-        return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
-    }
 }

backend/src/main/java/com/openisle/dto/CommentDto.java

@@ -13,7 +13,6 @@ public class CommentDto {
     private Long id;
     private String content;
     private LocalDateTime createdAt;
-    private LocalDateTime pinnedAt;
     private AuthorDto author;
     private List<CommentDto> replies;
     private List<ReactionDto> reactions;

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

@@ -24,7 +24,6 @@ public class CommentMapper {
         dto.setId(comment.getId());
         dto.setContent(comment.getContent());
         dto.setCreatedAt(comment.getCreatedAt());
-        dto.setPinnedAt(comment.getPinnedAt());
         dto.setAuthor(userMapper.toAuthorDto(comment.getAuthor()));
         dto.setReward(0);
         return dto;

backend/src/main/java/com/openisle/model/Comment.java

@@ -38,7 +38,4 @@ public class Comment {
     @JoinColumn(name = "parent_id")
     private Comment parent;
 
-    @Column
-    private LocalDateTime pinnedAt;
-
 }

backend/src/main/java/com/openisle/model/NotificationType.java

@@ -34,6 +34,8 @@ public enum NotificationType {
     ACTIVITY_REDEEM,
     /** You won a lottery post */
     LOTTERY_WIN,
+    /** Your lottery post was drawn */
+    LOTTERY_DRAW,
     /** You were mentioned in a post or comment */
     MENTION
 }

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

@@ -23,7 +23,6 @@ import java.util.List;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDateTime;
 
 @Service
 @RequiredArgsConstructor
@@ -130,26 +129,13 @@ public class CommentService {
         Post post = postRepository.findById(postId)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
         List<Comment> list = commentRepository.findByPostAndParentIsNullOrderByCreatedAtAsc(post);
-        java.util.List<Comment> pinned = new java.util.ArrayList<>();
-        java.util.List<Comment> others = new java.util.ArrayList<>();
-        for (Comment c : list) {
-            if (c.getPinnedAt() != null) {
-                pinned.add(c);
-            } else {
-                others.add(c);
-            }
-        }
-        pinned.sort(java.util.Comparator.comparing(Comment::getPinnedAt).reversed());
         if (sort == CommentSort.NEWEST) {
-            others.sort(java.util.Comparator.comparing(Comment::getCreatedAt).reversed());
+            list.sort(java.util.Comparator.comparing(Comment::getCreatedAt).reversed());
         } else if (sort == CommentSort.MOST_INTERACTIONS) {
-            others.sort((a, b) -> Integer.compare(interactionCount(b), interactionCount(a)));
+            list.sort((a, b) -> Integer.compare(interactionCount(b), interactionCount(a)));
         }
-        java.util.List<Comment> result = new java.util.ArrayList<>();
-        result.addAll(pinned);
-        result.addAll(others);
-        log.debug("getCommentsForPost returning {} comments", result.size());
-        return result;
+        log.debug("getCommentsForPost returning {} comments", list.size());
+        return list;
     }
 
     public List<Comment> getReplies(Long parentId) {
@@ -237,32 +223,6 @@ public class CommentService {
         log.debug("deleteCommentCascade removed comment {}", comment.getId());
     }
 
-    @Transactional
-    public Comment pinComment(String username, Long id) {
-        Comment c = commentRepository.findById(id)
-                .orElseThrow(() -> new com.openisle.exception.NotFoundException("Comment not found"));
-        User user = userRepository.findByUsername(username)
-                .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
-        if (!user.getId().equals(c.getPost().getAuthor().getId()) && user.getRole() != Role.ADMIN) {
-            throw new IllegalArgumentException("Unauthorized");
-        }
-        c.setPinnedAt(LocalDateTime.now());
-        return commentRepository.save(c);
-    }
-
-    @Transactional
-    public Comment unpinComment(String username, Long id) {
-        Comment c = commentRepository.findById(id)
-                .orElseThrow(() -> new com.openisle.exception.NotFoundException("Comment not found"));
-        User user = userRepository.findByUsername(username)
-                .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
-        if (!user.getId().equals(c.getPost().getAuthor().getId()) && user.getRole() != Role.ADMIN) {
-            throw new IllegalArgumentException("Unauthorized");
-        }
-        c.setPinnedAt(null);
-        return commentRepository.save(c);
-    }
-
     private int interactionCount(Comment comment) {
         int reactions = reactionRepository.findByComment(comment).size();
         int replies = commentRepository.findByParentOrderByCreatedAtAsc(comment).size();

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

@@ -254,6 +254,13 @@ public class PostService {
                 notificationService.createNotification(w, NotificationType.LOTTERY_WIN, lp, null, null, lp.getAuthor(), null, null);
                 notificationService.sendCustomPush(w, "你中奖了", String.format("%s/posts/%d", websiteUrl, lp.getId()));
             }
+            if (lp.getAuthor() != null) {
+                if (lp.getAuthor().getEmail() != null) {
+                    emailSender.sendEmail(lp.getAuthor().getEmail(), "抽奖已开奖", "您的抽奖贴 \"" + lp.getTitle() + "\" 已开奖");
+                }
+                notificationService.createNotification(lp.getAuthor(), NotificationType.LOTTERY_DRAW, lp, null, null, null, null, null);
+                notificationService.sendCustomPush(lp.getAuthor(), "抽奖已开奖", String.format("%s/posts/%d", websiteUrl, lp.getId()));
+            }
         });
     }
 

backend/src/main/resources/db/migration/V1__add_pinned_at_to_comments.sql

@@ -1 +0,0 @@
-ALTER TABLE comments ADD COLUMN pinned_at DATETIME(6) NULL;

backend/src/test/java/com/openisle/service/PostServiceTest.java

@@ -93,4 +93,50 @@ class PostServiceTest {
                 () -> service.createPost("alice", 1L, "t", "c", List.of(1L),
                         null, null, null, null, null, null));
     }
+
+    @Test
+    void finalizeLotteryNotifiesAuthor() {
+        PostRepository postRepo = mock(PostRepository.class);
+        UserRepository userRepo = mock(UserRepository.class);
+        CategoryRepository catRepo = mock(CategoryRepository.class);
+        TagRepository tagRepo = mock(TagRepository.class);
+        LotteryPostRepository lotteryRepo = mock(LotteryPostRepository.class);
+        NotificationService notifService = mock(NotificationService.class);
+        SubscriptionService subService = mock(SubscriptionService.class);
+        CommentService commentService = mock(CommentService.class);
+        CommentRepository commentRepo = mock(CommentRepository.class);
+        ReactionRepository reactionRepo = mock(ReactionRepository.class);
+        PostSubscriptionRepository subRepo = mock(PostSubscriptionRepository.class);
+        NotificationRepository notificationRepo = mock(NotificationRepository.class);
+        PostReadService postReadService = mock(PostReadService.class);
+        ImageUploader imageUploader = mock(ImageUploader.class);
+        TaskScheduler taskScheduler = mock(TaskScheduler.class);
+        EmailSender emailSender = mock(EmailSender.class);
+        ApplicationContext context = mock(ApplicationContext.class);
+
+        PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
+                notifService, subService, commentService, commentRepo,
+                reactionRepo, subRepo, notificationRepo, postReadService,
+                imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+        when(context.getBean(PostService.class)).thenReturn(service);
+
+        User author = new User();
+        author.setId(1L);
+        User winner = new User();
+        winner.setId(2L);
+
+        LotteryPost lp = new LotteryPost();
+        lp.setId(1L);
+        lp.setAuthor(author);
+        lp.setTitle("L");
+        lp.setPrizeCount(1);
+        lp.getParticipants().add(winner);
+
+        when(lotteryRepo.findById(1L)).thenReturn(Optional.of(lp));
+
+        service.finalizeLottery(1L);
+
+        verify(notifService).createNotification(eq(winner), eq(NotificationType.LOTTERY_WIN), eq(lp), isNull(), isNull(), eq(author), isNull(), isNull());
+        verify(notifService).createNotification(eq(author), eq(NotificationType.LOTTERY_DRAW), eq(lp), isNull(), isNull(), isNull(), isNull(), isNull());
+    }
 }

frontend_nuxt/components/CommentItem.vue

@@ -22,7 +22,6 @@
             :to="`/users/${comment.userId}?tab=achievements`"
             >{{ getMedalTitle(comment.medal) }}</router-link
           >
-          <i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
           <span v-if="level >= 2">
             <i class="fas fa-reply reply-icon"></i>
             <span class="user-name reply-user-name">{{ comment.parentUserName }}</span>
@@ -75,7 +74,6 @@
               :comment="item"
               :level="level + 1"
               :default-show-replies="item.openReplies"
-              :post-author-id="postAuthorId"
             />
           </template>
         </BaseTimeline>
@@ -121,10 +119,6 @@ const CommentItem = {
       type: Boolean,
       default: false,
     },
-    postAuthorId: {
-      type: [Number, String],
-      required: true,
-    },
   },
   setup(props, { emit }) {
     const router = useRouter()
@@ -177,22 +171,12 @@ const CommentItem = {
     })
 
     const isAuthor = computed(() => authState.username === props.comment.userName)
-    const isPostAuthor = computed(() => Number(authState.userId) === Number(props.postAuthorId))
     const isAdmin = computed(() => authState.role === 'ADMIN')
-    const commentMenuItems = computed(() => {
-      const items = []
-      if (isAuthor.value || isAdmin.value) {
-        items.push({ text: '删除评论', color: 'red', onClick: () => deleteComment() })
-      }
-      if (isAdmin.value || isPostAuthor.value) {
-        if (props.comment.pinned) {
-          items.push({ text: '取消置顶', onClick: () => unpinComment() })
-        } else {
-          items.push({ text: '置顶', onClick: () => pinComment() })
-        }
-      }
-      return items
-    })
+    const commentMenuItems = computed(() =>
+      isAuthor.value || isAdmin.value
+        ? [{ text: '删除评论', color: 'red', onClick: () => deleteComment() }]
+        : [],
+    )
     const deleteComment = async () => {
       const token = getToken()
       if (!token) {
@@ -212,46 +196,6 @@ const CommentItem = {
         toast.error('操作失败')
       }
     }
-    const pinComment = async () => {
-      const token = getToken()
-      if (!token) {
-        toast.error('请先登录')
-        return
-      }
-      const url = isAdmin.value
-        ? `${API_BASE_URL}/api/admin/comments/${props.comment.id}/pin`
-        : `${API_BASE_URL}/api/comments/${props.comment.id}/pin`
-      const res = await fetch(url, {
-        method: 'POST',
-        headers: { Authorization: `Bearer ${token}` },
-      })
-      if (res.ok) {
-        props.comment.pinned = true
-        toast.success('已置顶')
-      } else {
-        toast.error('操作失败')
-      }
-    }
-    const unpinComment = async () => {
-      const token = getToken()
-      if (!token) {
-        toast.error('请先登录')
-        return
-      }
-      const url = isAdmin.value
-        ? `${API_BASE_URL}/api/admin/comments/${props.comment.id}/unpin`
-        : `${API_BASE_URL}/api/comments/${props.comment.id}/unpin`
-      const res = await fetch(url, {
-        method: 'POST',
-        headers: { Authorization: `Bearer ${token}` },
-      })
-      if (res.ok) {
-        props.comment.pinned = false
-        toast.success('已取消置顶')
-      } else {
-        toast.error('操作失败')
-      }
-    }
     const submitReply = async (parentUserName, text, clear) => {
       if (!text.trim()) return
       isWaitingForReply.value = true
@@ -340,9 +284,6 @@ const CommentItem = {
       isWaitingForReply,
       commentMenuItems,
       deleteComment,
-      pinComment,
-      unpinComment,
-      isPostAuthor,
       lightboxVisible,
       lightboxIndex,
       lightboxImgs,
@@ -429,12 +370,6 @@ export default CommentItem
   margin-left: 10px;
 }
 
-.pin-icon {
-  font-size: 12px;
-  margin-left: 10px;
-  opacity: 0.6;
-}
-
 @keyframes highlight {
   from {
     background-color: yellow;

frontend_nuxt/pages/message.vue

@@ -198,6 +198,19 @@
                     中获奖
                   </NotificationContainer>
                 </template>
+                <template v-else-if="item.type === 'LOTTERY_DRAW'">
+                  <NotificationContainer :item="item" :markRead="markRead">
+                    您的抽奖贴
+                    <router-link
+                      class="notif-content-text"
+                      @click="markRead(item.id)"
+                      :to="`/posts/${item.post.id}`"
+                    >
+                      {{ stripMarkdownLength(item.post.title, 100) }}
+                    </router-link>
+                    已开奖
+                  </NotificationContainer>
+                </template>
                 <template v-else-if="item.type === 'POST_UPDATED'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您关注的帖子
@@ -579,6 +592,7 @@ export default {
       REGISTER_REQUEST: 'fas fa-user-clock',
       ACTIVITY_REDEEM: 'fas fa-coffee',
       LOTTERY_WIN: 'fas fa-trophy',
+      LOTTERY_DRAW: 'fas fa-bullhorn',
       MENTION: 'fas fa-at',
     }
 
@@ -647,6 +661,17 @@ export default {
                 }
               },
             })
+          } else if (n.type === 'LOTTERY_DRAW') {
+            notifications.value.push({
+              ...n,
+              icon: iconMap[n.type],
+              iconClick: () => {
+                if (n.post) {
+                  markRead(n.id)
+                  router.push(`/posts/${n.post.id}`)
+                }
+              },
+            })
           } else if (n.type === 'POST_UPDATED') {
             notifications.value.push({
               ...n,
@@ -818,6 +843,8 @@ export default {
           return '有人申请兑换奶茶'
         case 'LOTTERY_WIN':
           return '抽奖中奖了'
+        case 'LOTTERY_DRAW':
+          return '抽奖已开奖'
         default:
           return t
       }

frontend_nuxt/pages/posts/[id]/index.vue

@@ -195,7 +195,6 @@
               :comment="item"
               :level="0"
               :default-show-replies="item.openReplies"
-              :post-author-id="author.id"
               @deleted="onCommentDeleted"
             />
           </template>
@@ -406,7 +405,6 @@ export default {
       avatar: c.author.avatar,
       text: c.content,
       reactions: c.reactions || [],
-      pinned: !!c.pinnedAt,
       reply: (c.replies || []).map((r) => mapComment(r, c.author.username, level + 1)),
       openReplies: level === 0,
       src: c.author.avatar,