test: mock PointService in CommentServiceTest

fix: 解决删除评论后积分历史和当前积分不一致的问题

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

@@ -4,6 +4,7 @@ import com.openisle.model.Comment;
 import com.openisle.model.Post;
 import com.openisle.model.User;
 import com.openisle.model.NotificationType;
+import com.openisle.model.PointHistory;
 import com.openisle.model.CommentSort;
 import com.openisle.repository.CommentRepository;
 import com.openisle.repository.PostRepository;
@@ -14,6 +15,7 @@ import com.openisle.repository.NotificationRepository;
 import com.openisle.repository.PointHistoryRepository;
 import com.openisle.service.NotificationService;
 import com.openisle.service.SubscriptionService;
+import com.openisle.service.PointService;
 import com.openisle.model.Role;
 import com.openisle.exception.RateLimitException;
 import lombok.RequiredArgsConstructor;
@@ -21,6 +23,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.stream.Collectors;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +44,7 @@ public class CommentService {
     private final CommentSubscriptionRepository commentSubscriptionRepository;
     private final NotificationRepository notificationRepository;
     private final PointHistoryRepository pointHistoryRepository;
+    private final PointService pointService;
     private final ImageUploader imageUploader;
 
     @Transactional
@@ -65,16 +71,19 @@ public class CommentService {
         log.debug("Comment {} saved for post {}", comment.getId(), postId);
         imageUploader.addReferences(imageUploader.extractUrls(content));
         if (!author.getId().equals(post.getAuthor().getId())) {
-            notificationService.createNotification(post.getAuthor(), NotificationType.COMMENT_REPLY, post, comment, null, null, null, null);
+            notificationService.createNotification(post.getAuthor(), NotificationType.COMMENT_REPLY, post, comment,
+                    null, null, null, null);
         }
         for (User u : subscriptionService.getPostSubscribers(postId)) {
             if (!u.getId().equals(author.getId())) {
-                notificationService.createNotification(u, NotificationType.POST_UPDATED, post, comment, null, null, null, null);
+                notificationService.createNotification(u, NotificationType.POST_UPDATED, post, comment, null, null,
+                        null, null);
             }
         }
         for (User u : subscriptionService.getSubscribers(author.getUsername())) {
             if (!u.getId().equals(author.getId())) {
-                notificationService.createNotification(u, NotificationType.USER_ACTIVITY, post, comment, null, null, null, null);
+                notificationService.createNotification(u, NotificationType.USER_ACTIVITY, post, comment, null, null,
+                        null, null);
             }
         }
         notificationService.notifyMentions(content, author, post, comment);
@@ -111,21 +120,25 @@ public class CommentService {
         log.debug("Reply {} saved for parent {}", comment.getId(), parentId);
         imageUploader.addReferences(imageUploader.extractUrls(content));
         if (!author.getId().equals(parent.getAuthor().getId())) {
-            notificationService.createNotification(parent.getAuthor(), NotificationType.COMMENT_REPLY, parent.getPost(), comment, null, null, null, null);
+            notificationService.createNotification(parent.getAuthor(), NotificationType.COMMENT_REPLY, parent.getPost(),
+                    comment, null, null, null, null);
         }
         for (User u : subscriptionService.getCommentSubscribers(parentId)) {
             if (!u.getId().equals(author.getId())) {
-                notificationService.createNotification(u, NotificationType.COMMENT_REPLY, parent.getPost(), comment, null, null, null, null);
+                notificationService.createNotification(u, NotificationType.COMMENT_REPLY, parent.getPost(), comment,
+                        null, null, null, null);
             }
         }
         for (User u : subscriptionService.getPostSubscribers(parent.getPost().getId())) {
             if (!u.getId().equals(author.getId())) {
-                notificationService.createNotification(u, NotificationType.POST_UPDATED, parent.getPost(), comment, null, null, null, null);
+                notificationService.createNotification(u, NotificationType.POST_UPDATED, parent.getPost(), comment,
+                        null, null, null, null);
             }
         }
         for (User u : subscriptionService.getSubscribers(author.getUsername())) {
             if (!u.getId().equals(author.getId())) {
-                notificationService.createNotification(u, NotificationType.USER_ACTIVITY, parent.getPost(), comment, null, null, null, null);
+                notificationService.createNotification(u, NotificationType.USER_ACTIVITY, parent.getPost(), comment,
+                        null, null, null, null);
             }
         }
         notificationService.notifyMentions(content, author, parent.getPost(), comment);
@@ -237,15 +250,33 @@ public class CommentService {
         for (Comment c : replies) {
             deleteCommentCascade(c);
         }
-        // 逻辑删除相关的积分历史记录
-        pointHistoryRepository.findByComment(comment).forEach(pointHistoryRepository::delete);
+
+        // 逻辑删除相关的积分历史记录，并收集受影响的用户
+        List<PointHistory> pointHistories = pointHistoryRepository.findByComment(comment);
+        // 收集需要重新计算积分的用户
+        Set<User> usersToRecalculate = pointHistories.stream().map(PointHistory::getUser).collect(Collectors.toSet());
+
         // 删除其他相关数据
         reactionRepository.findByComment(comment).forEach(reactionRepository::delete);
         commentSubscriptionRepository.findByComment(comment).forEach(commentSubscriptionRepository::delete);
         notificationRepository.deleteAll(notificationRepository.findByComment(comment));
         imageUploader.removeReferences(imageUploader.extractUrls(comment.getContent()));
+
         // 逻辑删除评论
         commentRepository.delete(comment);
+        // 删除积分历史
+        pointHistoryRepository.deleteAll(pointHistories);
+
+        // 重新计算受影响用户的积分
+        if (!usersToRecalculate.isEmpty()) {
+            for (User user : usersToRecalculate) {
+                int newPoints = pointService.recalculateUserPoints(user);
+                user.setPoint(newPoints);
+                log.debug("Recalculated points for user {}: {}", user.getUsername(), newPoints);
+            }
+            userRepository.saveAll(usersToRecalculate);
+        }
+
         log.debug("deleteCommentCascade removed comment {}", comment.getId());
     }
 

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

@@ -219,4 +219,32 @@ public class PointService {
         return result;
     }
 
+    /**
+     * 重新计算用户的积分总数
+     * 通过累加所有积分历史记录来重新计算用户的当前积分
+     */
+    public int recalculateUserPoints(User user) {
+        // 获取用户所有的积分历史记录（由于@Where注解，已删除的记录会被自动过滤）
+        List<PointHistory> histories = pointHistoryRepository.findByUserOrderByIdDesc(user);
+        
+        int totalPoints = 0;
+        for (PointHistory history : histories) {
+            totalPoints += history.getAmount();
+        }
+        
+        // 更新用户积分
+        user.setPoint(totalPoints);
+        userRepository.save(user);
+        
+        return totalPoints;
+    }
+
+    /**
+     * 重新计算用户的积分总数（通过用户名）
+     */
+    public int recalculateUserPoints(String userName) {
+        User user = userRepository.findByUsername(userName).orElseThrow();
+        return recalculateUserPoints(user);
+    }
+
 }

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

@@ -7,6 +7,7 @@ import com.openisle.repository.ReactionRepository;
 import com.openisle.repository.CommentSubscriptionRepository;
 import com.openisle.repository.NotificationRepository;
 import com.openisle.repository.PointHistoryRepository;
+import com.openisle.service.PointService;
 import com.openisle.exception.RateLimitException;
 import org.junit.jupiter.api.Test;
 
@@ -26,10 +27,11 @@ class CommentServiceTest {
         CommentSubscriptionRepository subRepo = mock(CommentSubscriptionRepository.class);
         NotificationRepository nRepo = mock(NotificationRepository.class);
         PointHistoryRepository pointHistoryRepo = mock(PointHistoryRepository.class);
+        PointService pointService = mock(PointService.class);
         ImageUploader imageUploader = mock(ImageUploader.class);
 
         CommentService service = new CommentService(commentRepo, postRepo, userRepo,
-                notifService, subService, reactionRepo, subRepo, nRepo, pointHistoryRepo, imageUploader);
+                notifService, subService, reactionRepo, subRepo, nRepo, pointHistoryRepo, pointService, imageUploader);
 
         when(commentRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(3L);
 

frontend_nuxt/.env.example

@@ -3,12 +3,12 @@
 ; 预发环境后端
 ; NUXT_PUBLIC_API_BASE_URL=https://staging.open-isle.com
 ; 生产环境后端
-NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
+NUXT_PUBLIC_API_BASE_URL=https://open-isle.com
 
 ; 预发环境
 ; NUXT_PUBLIC_WEBSITE_BASE_URL=https://staging.open-isle.com
 ; 正式环境/生产环境
-NUXT_PUBLIC_WEBSITE_BASE_URL=https://www.open-isle.com
+NUXT_PUBLIC_WEBSITE_BASE_URL=https://open-isle.com
 NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
 NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ
 NUXT_PUBLIC_DISCORD_CLIENT_ID=1394985417044000779

frontend_nuxt/.env.staging.example

@@ -3,12 +3,12 @@
 ; 预发环境后端
 NUXT_PUBLIC_API_BASE_URL=https://staging.open-isle.com
 ; 生产环境后端
-; NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
+; NUXT_PUBLIC_API_BASE_URL=https://open-isle.com
 
 ; 预发环境
 NUXT_PUBLIC_WEBSITE_BASE_URL=https://staging.open-isle.com
 ; 正式环境/生产环境
-; NUXT_PUBLIC_WEBSITE_BASE_URL=https://www.open-isle.com
+; NUXT_PUBLIC_WEBSITE_BASE_URL=https://open-isle.com
 
 NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
 NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ

frontend_nuxt/assets/global.css

@@ -27,16 +27,6 @@
   --code-highlight-background-color: rgb(241, 241, 241);
   --login-background-color: rgb(248, 248, 248);
   --login-background-color-hover: #e0e0e0;
-  --google-login-background-color: var(--login-background-color);
-  --google-login-background-color-hover: var(--login-background-color-hover);
-  --github-login-background-color: #000;
-  --github-login-background-color-hover: #333;
-  --discord-login-background-color: var(--login-background-color);
-  --discord-login-background-color-hover: var(--login-background-color-hover);
-  --twitter-login-background-color: var(--login-background-color);
-  --twitter-login-background-color-hover: var(--login-background-color-hover);
-  --telegram-login-background-color: var(--login-background-color);
-  --telegram-login-background-color-hover: var(--login-background-color-hover);
   --text-color: rgb(70, 70, 70);
   --blockquote-text-color: #6a737d;
   --menu-width: 200px;
@@ -68,16 +58,6 @@
   --code-highlight-background-color: #262b35;
   --login-background-color: #575757;
   --login-background-color-hover: #717171;
-  --google-login-background-color: var(--login-background-color);
-  --google-login-background-color-hover: var(--login-background-color-hover);
-  --github-login-background-color: #000;
-  --github-login-background-color-hover: #333;
-  --discord-login-background-color: var(--login-background-color);
-  --discord-login-background-color-hover: var(--login-background-color-hover);
-  --twitter-login-background-color: var(--login-background-color);
-  --twitter-login-background-color-hover: var(--login-background-color-hover);
-  --telegram-login-background-color: var(--login-background-color);
-  --telegram-login-background-color-hover: var(--login-background-color-hover);
   --text-color: #eee;
   --blockquote-text-color: #999;
   --article-info-background-color: #747373;

frontend_nuxt/components/ThirdPartyAuth.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="third-party-auth">
+    <div
+      v-for="provider in providers"
+      :key="provider.name"
+      class="third-party-button"
+      :class="provider.name"
+      @click="provider.action"
+    >
+      <img class="third-party-button-icon" :src="provider.icon" :alt="provider.alt" />
+      <div class="third-party-button-text">
+        {{ provider.label }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import googleIcon from '~/assets/icons/google.svg'
+import githubIcon from '~/assets/icons/github.svg'
+import discordIcon from '~/assets/icons/discord.svg'
+import twitterIcon from '~/assets/icons/twitter.svg'
+import telegramIcon from '~/assets/icons/telegram.svg'
+
+import { googleAuthorize } from '~/utils/google'
+import { githubAuthorize } from '~/utils/github'
+import { discordAuthorize } from '~/utils/discord'
+import { twitterAuthorize } from '~/utils/twitter'
+import { telegramAuthorize } from '~/utils/telegram'
+
+const props = defineProps({
+  mode: {
+    type: String,
+    default: 'login',
+  },
+  inviteToken: {
+    type: String,
+    default: '',
+  },
+})
+
+const actionText = computed(() => (props.mode === 'signup' ? '注册' : '登录'))
+
+const providers = computed(() => [
+  {
+    name: 'google',
+    icon: googleIcon,
+    action: () => googleAuthorize(props.inviteToken),
+    alt: 'Google Logo',
+    label: `Google ${actionText.value}`,
+  },
+  {
+    name: 'github',
+    icon: githubIcon,
+    action: () => githubAuthorize(props.inviteToken),
+    alt: 'GitHub Logo',
+    label: `GitHub ${actionText.value}`,
+  },
+  {
+    name: 'discord',
+    icon: discordIcon,
+    action: () => discordAuthorize(props.inviteToken),
+    alt: 'Discord Logo',
+    label: `Discord ${actionText.value}`,
+  },
+  {
+    name: 'twitter',
+    icon: twitterIcon,
+    action: () => twitterAuthorize(props.inviteToken),
+    alt: 'Twitter Logo',
+    label: `Twitter ${actionText.value}`,
+  },
+  {
+    name: 'telegram',
+    icon: telegramIcon,
+    action: () => telegramAuthorize(props.inviteToken),
+    alt: 'Telegram Logo',
+    label: `Telegram ${actionText.value}`,
+  },
+])
+</script>
+
+<style scoped>
+.third-party-auth {
+  margin-left: 20px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 30%;
+  gap: 20px;
+}
+
+.third-party-button {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  padding: 10px 20px;
+  min-width: 150px;
+  background-color: var(--login-background-color);
+  border: 1px solid var(--normal-border-color);
+  border-radius: 10px;
+  cursor: pointer;
+  gap: 10px;
+}
+
+.third-party-button:hover {
+  background-color: var(--login-background-color-hover);
+}
+
+.third-party-button-icon {
+  width: 20px;
+  height: 20px;
+}
+
+.third-party-button-text {
+  font-size: 16px;
+}
+
+/* Provider specific classes for customization */
+.third-party-button.google {
+  background-color: var(--google-bg, var(--login-background-color));
+  color: var(--google-color, inherit);
+}
+.third-party-button.google:hover {
+  background-color: var(--google-bg-hover, var(--login-background-color-hover));
+}
+
+.third-party-button.github {
+  background-color: var(--github-bg, var(--login-background-color));
+  color: var(--github-color, inherit);
+}
+.third-party-button.github:hover {
+  background-color: var(--github-bg-hover, var(--login-background-color-hover));
+}
+
+.third-party-button.discord {
+  background-color: var(--discord-bg, var(--login-background-color));
+  color: var(--discord-color, inherit);
+}
+.third-party-button.discord:hover {
+  background-color: var(--discord-bg-hover, var(--login-background-color-hover));
+}
+
+.third-party-button.twitter {
+  background-color: var(--twitter-bg, var(--login-background-color));
+  color: var(--twitter-color, inherit);
+}
+.third-party-button.twitter:hover {
+  background-color: var(--twitter-bg-hover, var(--login-background-color-hover));
+}
+
+.third-party-button.telegram {
+  background-color: var(--telegram-bg, var(--login-background-color));
+  color: var(--telegram-color, inherit);
+}
+.third-party-button.telegram:hover {
+  background-color: var(--telegram-bg-hover, var(--login-background-color-hover));
+}
+
+@media (max-width: 768px) {
+  .third-party-auth {
+    margin-top: 20px;
+    margin-left: 0px;
+    width: calc(100% - 40px);
+    gap: 10px;
+  }
+
+  .third-party-button {
+    width: calc(100% - 40px);
+  }
+}
+</style>

frontend_nuxt/components/ThirdPartyAuthButtons.vue

@@ -1,151 +0,0 @@
-<template>
-  <div class="third-party-auth">
-    <div v-for="p in providers" :key="p.name" :class="['auth-button', p.name]" @click="p.authorize">
-      <img class="auth-button-icon" :src="p.icon" :alt="p.alt" />
-      <div class="auth-button-text">{{ p.text }} {{ props.action }}</div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { googleAuthorize } from '~/utils/google'
-import { githubAuthorize } from '~/utils/github'
-import { discordAuthorize } from '~/utils/discord'
-import { twitterAuthorize } from '~/utils/twitter'
-import { telegramAuthorize } from '~/utils/telegram'
-
-import googleIcon from '~/assets/icons/google.svg'
-import githubIcon from '~/assets/icons/github.svg'
-import discordIcon from '~/assets/icons/discord.svg'
-import twitterIcon from '~/assets/icons/twitter.svg'
-import telegramIcon from '~/assets/icons/telegram.svg'
-
-const props = defineProps({
-  action: {
-    type: String,
-    default: '登录',
-  },
-  inviteToken: {
-    type: String,
-    default: '',
-  },
-})
-
-const providers = [
-  {
-    name: 'google',
-    icon: googleIcon,
-    alt: 'Google Logo',
-    text: 'Google',
-    authorize: () => googleAuthorize(props.inviteToken),
-  },
-  {
-    name: 'github',
-    icon: githubIcon,
-    alt: 'GitHub Logo',
-    text: 'GitHub',
-    authorize: () => githubAuthorize(props.inviteToken),
-  },
-  {
-    name: 'discord',
-    icon: discordIcon,
-    alt: 'Discord Logo',
-    text: 'Discord',
-    authorize: () => discordAuthorize(props.inviteToken),
-  },
-  {
-    name: 'twitter',
-    icon: twitterIcon,
-    alt: 'Twitter Logo',
-    text: 'Twitter',
-    authorize: () => twitterAuthorize(props.inviteToken),
-  },
-  {
-    name: 'telegram',
-    icon: telegramIcon,
-    alt: 'Telegram Logo',
-    text: 'Telegram',
-    authorize: () => telegramAuthorize(props.inviteToken),
-  },
-]
-</script>
-
-<style scoped>
-.third-party-auth {
-  margin-left: 20px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 30%;
-  gap: 20px;
-}
-
-.auth-button {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 10px 20px;
-  border: 1px solid var(--normal-border-color);
-  border-radius: 10px;
-  cursor: pointer;
-  min-width: 150px;
-  gap: 10px;
-  background-color: var(--auth-bg);
-}
-
-.auth-button:hover {
-  background-color: var(--auth-bg-hover);
-}
-
-.auth-button-icon {
-  width: 20px;
-  height: 20px;
-}
-
-.auth-button-text {
-  font-size: 16px;
-}
-
-.auth-button.google {
-  --auth-bg: var(--google-login-background-color, var(--login-background-color));
-  --auth-bg-hover: var(--google-login-background-color-hover, var(--login-background-color-hover));
-}
-
-.auth-button.github {
-  --auth-bg: var(--github-login-background-color, var(--login-background-color));
-  --auth-bg-hover: var(--github-login-background-color-hover, var(--login-background-color-hover));
-}
-
-.auth-button.discord {
-  --auth-bg: var(--discord-login-background-color, var(--login-background-color));
-  --auth-bg-hover: var(--discord-login-background-color-hover, var(--login-background-color-hover));
-}
-
-.auth-button.twitter {
-  --auth-bg: var(--twitter-login-background-color, var(--login-background-color));
-  --auth-bg-hover: var(--twitter-login-background-color-hover, var(--login-background-color-hover));
-}
-
-.auth-button.telegram {
-  --auth-bg: var(--telegram-login-background-color, var(--login-background-color));
-  --auth-bg-hover: var(
-    --telegram-login-background-color-hover,
-    var(--login-background-color-hover)
-  );
-}
-
-@media (max-width: 768px) {
-  .third-party-auth {
-    margin-top: 20px;
-    margin-left: 0;
-    width: calc(100% - 40px);
-    gap: 10px;
-  }
-
-  .auth-button {
-    width: calc(100% - 40px);
-  }
-}
-</style>

frontend_nuxt/pages/login.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
 
-    <ThirdPartyAuthButtons action="登录" />
+    <ThirdPartyAuth mode="login" />
   </div>
 </template>
 
@@ -42,7 +42,7 @@
 import { toast } from '~/main'
 import { setToken, loadCurrentUser } from '~/utils/auth'
 import BaseInput from '~/components/BaseInput.vue'
-import ThirdPartyAuthButtons from '~/components/ThirdPartyAuthButtons.vue'
+import ThirdPartyAuth from '~/components/ThirdPartyAuth.vue'
 import { registerPush } from '~/utils/push'
 const config = useRuntimeConfig()
 const API_BASE_URL = config.public.apiBaseUrl
@@ -186,6 +186,10 @@ const submitLogin = async () => {
   background-color: var(--primary-color-disabled);
 }
 
+.login-page-button-text {
+  font-size: 16px;
+}
+
 .login-page-button-secondary {
   margin-top: 20px;
   font-size: 16px;

frontend_nuxt/pages/signup.vue

@@ -68,15 +68,15 @@
       </div>
     </div>
 
-    <ThirdPartyAuthButtons action="注册" :invite-token="inviteToken" />
+    <ThirdPartyAuth mode="signup" :invite-token="inviteToken" />
   </div>
 </template>
 
 <script setup>
 import BaseInput from '~/components/BaseInput.vue'
 import { toast } from '~/main'
-import ThirdPartyAuthButtons from '~/components/ThirdPartyAuthButtons.vue'
 import { loadCurrentUser, setToken } from '~/utils/auth'
+import ThirdPartyAuth from '~/components/ThirdPartyAuth.vue'
 
 const route = useRoute()
 const config = useRuntimeConfig()
@@ -297,6 +297,10 @@ const verifyCode = async () => {
   background-color: var(--primary-color-hover);
 }
 
+.signup-page-button-text {
+  font-size: 16px;
+}
+
 .signup-page-button-secondary {
   margin-top: 20px;
   font-size: 16px;

frontend_nuxt/pages/telegram-callback.vue

@@ -4,7 +4,6 @@
 
 <script setup>
 import CallbackPage from '~/components/CallbackPage.vue'
-import { I } from '~/dist/_nuxt/F7ewH_Zb'
 import { telegramExchange } from '~/utils/telegram'
 
 onMounted(async () => {