From 73767a9022ce73b235520ebf2a83b582afb7cfda Mon Sep 17 00:00:00 2001
From: dongmucat <1127093059@qq.com>
Date: Tue, 16 Jun 2026 12:18:02 +0800
Subject: [PATCH] fix(notification): avoid publish notice for promotion
 reviewers

Signed-off-by: dongmucat <1127093059@qq.com>
---
 .../listener/NotificationEventListener.java   |  3 +-
 .../NotificationEventListenerTest.java        | 38 ++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/listener/NotificationEventListener.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/listener/NotificationEventListener.java
index 74ad10d8..c0d280fa 100644
--- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/listener/NotificationEventListener.java
+++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/listener/NotificationEventListener.java
@@ -19,6 +19,7 @@ import org.springframework.transaction.event.TransactionalEventListener;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Component
 public class NotificationEventListener {
@@ -53,7 +54,7 @@ public class NotificationEventListener {
     @TransactionalEventListener
     public void onSkillPublished(SkillPublishedEvent event) {
         skillRepository.findById(event.skillId()).ifPresent(skill -> {
-            if (!event.publisherId().equals(skill.getCreatedBy())) {
+            if (!Objects.equals(event.publisherId(), skill.getOwnerId())) {
                 return;
             }
             String title = "Skill published: " + skillDisplayName(skill);
diff --git a/server/skillhub-app/src/test/java/com/iflytek/skillhub/listener/NotificationEventListenerTest.java b/server/skillhub-app/src/test/java/com/iflytek/skillhub/listener/NotificationEventListenerTest.java
index 8e59b434..bcdc8953 100644
--- a/server/skillhub-app/src/test/java/com/iflytek/skillhub/listener/NotificationEventListenerTest.java
+++ b/server/skillhub-app/src/test/java/com/iflytek/skillhub/listener/NotificationEventListenerTest.java
@@ -6,6 +6,7 @@ import com.iflytek.skillhub.domain.namespace.Namespace;
 import com.iflytek.skillhub.domain.namespace.NamespaceRepository;
 import com.iflytek.skillhub.domain.skill.Skill;
 import com.iflytek.skillhub.domain.skill.SkillRepository;
+import com.iflytek.skillhub.domain.skill.SkillVisibility;
 import com.iflytek.skillhub.domain.skill.SkillVersionRepository;
 import com.iflytek.skillhub.notification.domain.NotificationCategory;
 import com.iflytek.skillhub.notification.service.NotificationDispatcher;
@@ -43,6 +44,24 @@ class NotificationEventListenerTest {
         return skill;
     }
 
+    private Skill skill(Long id, String ownerId, String createdBy) {
+        Skill skill = new Skill(5L, "test-skill", ownerId, SkillVisibility.PUBLIC);
+        skill.setCreatedBy(createdBy);
+        skill.setDisplayName("Test Skill");
+        setId(skill, id);
+        return skill;
+    }
+
+    private void setId(Skill skill, Long id) {
+        try {
+            java.lang.reflect.Field field = Skill.class.getDeclaredField("id");
+            field.setAccessible(true);
+            field.set(skill, id);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     private void mockNamespace() {
         Namespace namespace = mock(Namespace.class);
         when(namespace.getSlug()).thenReturn("demo");
@@ -51,8 +70,7 @@ class NotificationEventListenerTest {
 
     @Test
     void onSkillPublished_shouldDispatchToPublisher() throws Exception {
-        Skill skill = mockSkill(1L);
-        when(skill.getCreatedBy()).thenReturn("publisher-1");
+        Skill skill = skill(1L, "publisher-1", "publisher-1");
         when(skillRepository.findById(1L)).thenReturn(Optional.of(skill));
         mockNamespace();
         when(objectMapper.writeValueAsString(any())).thenReturn("{}");
@@ -64,9 +82,19 @@ class NotificationEventListenerTest {
     }
 
     @Test
-    void onSkillPublished_shouldSkipWhenPublisherIsNotSkillCreator() throws Exception {
-        Skill skill = mock(Skill.class);
-        when(skill.getCreatedBy()).thenReturn("submitter-1");
+    void onSkillPublished_shouldSkipWhenPublisherIsNotSkillOwner() throws Exception {
+        Skill skill = skill(1L, "submitter-1", "submitter-1");
+        when(skillRepository.findById(1L)).thenReturn(Optional.of(skill));
+
+        listener.onSkillPublished(new SkillPublishedEvent(1L, 10L, "reviewer-1"));
+
+        verifyNoInteractions(dispatcher);
+    }
+
+    @Test
+    void onSkillPublished_shouldSkipPromotedSkillCopyCreatedByReviewer() throws Exception {
+        Skill skill = skill(1L, "submitter-1", "reviewer-1");
+        skill.setSourceSkillId(99L);
         when(skillRepository.findById(1L)).thenReturn(Optional.of(skill));
 
         listener.onSkillPublished(new SkillPublishedEvent(1L, 10L, "reviewer-1"));