Skip to content

Commit d1d0886

Browse files
dragonpooludomikula
authored andcommitted
Added before/after detail of group member event
1 parent 603edca commit d1d0886

File tree

10 files changed

+35
-7
lines changed

10 files changed

+35
-7
lines changed

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
public abstract class BaseGroupEvent extends AbstractEvent {
1010

1111
private final String groupId;
12-
private final String groupName;
1312
}

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupCreateEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_CREATE;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupDeleteEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_DELETE;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupUpdateEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_UPDATE;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,4 @@
88
@SuperBuilder
99
public abstract class BaseGroupMemberEvent extends AbstractEvent {
1010

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;
1611
}

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberAddEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_ADD;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberLeaveEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_LEAVE;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberRemoveEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_REMOVE;

server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberRoleUpdateEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_ROLE_UPDATE;

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,8 @@ public Mono<Void> publishGroupUpdateEvent(boolean publish, Group previousGroup,
482482
.orgId(tuple.getT1().getOrgId())
483483
.userId(tuple.getT1().getUserId())
484484
.groupId(previousGroup.getId())
485-
.groupName(previousGroup.getName(locale) + " => " + newGroupName)
485+
.groupName(newGroupName)
486+
.oldGroupName(previousGroup.getName(locale))
486487
.isAnonymous(Authentication.isAnonymousUser(tuple.getT1().getUserId()))
487488
.sessionHash(Hashing.sha512().hashString(tuple.getT2(), StandardCharsets.UTF_8).toString())
488489
.build();

0 commit comments

Comments
 (0)