Added before/after detail of group member event

dragonpoo · ludomikula · commit d1d0886b2505 · 2025-05-24T20:25:21.000+02:00
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java
@@ -9,5 +9,4 @@
 public abstract class BaseGroupEvent extends AbstractEvent {
 
     private final String groupId;
-    private final String groupName;
 }
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java
@@ -5,6 +5,9 @@
 @SuperBuilder
 public class GroupCreateEvent extends BaseGroupEvent {
 
+    private final String groupName;
+    private final String oldGroupName;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_CREATE;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java
@@ -5,6 +5,9 @@
 @SuperBuilder
 public class GroupDeleteEvent extends BaseGroupEvent {
 
+    private final String groupName;
+    private final String oldGroupName;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_DELETE;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java
@@ -5,6 +5,9 @@
 @SuperBuilder
 public class GroupUpdateEvent extends BaseGroupEvent {
 
+    private final String groupName;
+    private final String oldGroupName;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_UPDATE;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java
@@ -8,9 +8,4 @@
 @SuperBuilder
 public abstract class BaseGroupMemberEvent extends AbstractEvent {
 
-    private final String groupId;
-    private final String groupName;
-    private final String memberId;
-    private final String memberName;
-    private final String memberRole;
 }
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java
@@ -5,6 +5,12 @@
 @SuperBuilder
 public class GroupMemberAddEvent extends BaseGroupMemberEvent {
 
+    private final String groupId;
+    private final String groupName;
+    private final String memberId;
+    private final String memberName;
+    private final String memberRole;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_MEMBER_ADD;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java
@@ -5,6 +5,12 @@
 @SuperBuilder
 public class GroupMemberLeaveEvent extends BaseGroupMemberEvent {
 
+    private final String groupId;
+    private final String groupName;
+    private final String memberId;
+    private final String memberName;
+    private final String memberRole;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_MEMBER_LEAVE;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java
@@ -5,6 +5,12 @@
 @SuperBuilder
 public class GroupMemberRemoveEvent extends BaseGroupMemberEvent {
 
+    private final String groupId;
+    private final String groupName;
+    private final String memberId;
+    private final String memberName;
+    private final String memberRole;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_MEMBER_REMOVE;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java
@@ -5,6 +5,12 @@
 @SuperBuilder
 public class GroupMemberRoleUpdateEvent extends BaseGroupMemberEvent {
 
+    private final String groupId;
+    private final String groupName;
+    private final String memberId;
+    private final String memberName;
+    private final String memberRole;
+
     @Override
     public EventType getEventType() {
         return EventType.GROUP_MEMBER_ROLE_UPDATE;
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java
@@ -482,7 +482,8 @@ public Mono<Void> publishGroupUpdateEvent(boolean publish, Group previousGroup,
                                     .orgId(tuple.getT1().getOrgId())
                                     .userId(tuple.getT1().getUserId())
                                     .groupId(previousGroup.getId())
-                                    .groupName(previousGroup.getName(locale) + " => " + newGroupName)
+                                    .groupName(newGroupName)
+                                    .oldGroupName(previousGroup.getName(locale))
                                     .isAnonymous(Authentication.isAnonymousUser(tuple.getT1().getUserId()))
                                     .sessionHash(Hashing.sha512().hashString(tuple.getT2(), StandardCharsets.UTF_8).toString())
                                     .build();

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,4 @@`
`9`	`9`	`public abstract class BaseGroupEvent extends AbstractEvent {`
`10`	`10`
`11`	`11`	`private final String groupId;`
`12`		`- private final String groupName;`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,4 @@`
`8`	`8`	`@SuperBuilder`
`9`	`9`	`public abstract class BaseGroupMemberEvent extends AbstractEvent {`
`10`	`10`
`11`		`- private final String groupId;`
`12`		`- private final String groupName;`
`13`		`- private final String memberId;`
`14`		`- private final String memberName;`
`15`		`- private final String memberRole;`
`16`	`11`	`}`