diff --git a/src/main/java/com/gloddy/server/apply/application/ApplyService.java b/src/main/java/com/gloddy/server/apply/application/ApplyService.java index 9076af15..61665b70 100644 --- a/src/main/java/com/gloddy/server/apply/application/ApplyService.java +++ b/src/main/java/com/gloddy/server/apply/application/ApplyService.java @@ -40,7 +40,7 @@ public ApplyResponse.Create createApply(Long userId, Long groupId, ApplyRequest. Apply apply = applyCommandHandler.save( group.createApply(user, request.getIntroduce(), request.getReason()) ); - applyEventProducer.produceEvent(new ApplyCreateEvent(userId, groupId)); + applyEventProducer.produceEvent(new ApplyCreateEvent(group.getCaptainId(), groupId, userId)); return new ApplyResponse.Create(apply.getId()); } diff --git a/src/main/java/com/gloddy/server/apply/event/ApplyCreateEvent.java b/src/main/java/com/gloddy/server/apply/event/ApplyCreateEvent.java index 8dbf9776..4366894c 100644 --- a/src/main/java/com/gloddy/server/apply/event/ApplyCreateEvent.java +++ b/src/main/java/com/gloddy/server/apply/event/ApplyCreateEvent.java @@ -10,6 +10,7 @@ @AllArgsConstructor @Getter public class ApplyCreateEvent implements Event { - private Long userId; + private Long captainId; private Long groupId; + private Long applyUserId; } diff --git a/src/main/java/com/gloddy/server/apply/event/ApplyStatusUpdateEvent.java b/src/main/java/com/gloddy/server/apply/event/ApplyStatusUpdateEvent.java index 8e19a223..7091bae5 100644 --- a/src/main/java/com/gloddy/server/apply/event/ApplyStatusUpdateEvent.java +++ b/src/main/java/com/gloddy/server/apply/event/ApplyStatusUpdateEvent.java @@ -11,8 +11,8 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class ApplyStatusUpdateEvent implements Event { - private Long userId; - private Long applyGroupId; + private Long captainId; + private Long groupId; private Long applyUserId; private Status status; } diff --git a/src/main/java/com/gloddy/server/group/domain/Group.java b/src/main/java/com/gloddy/server/group/domain/Group.java index f0eb1c8c..f9c503eb 100644 --- a/src/main/java/com/gloddy/server/group/domain/Group.java +++ b/src/main/java/com/gloddy/server/group/domain/Group.java @@ -98,6 +98,10 @@ public int getMemberCount() { return this.groupMemberVOs.getSize(); } + public Long getCaptainId() { + return this.captain.getId(); + } + public Apply createApply(User applier, String introduce, String reason) { return Apply.builder() .user(applier) diff --git a/src/main/java/com/gloddy/server/messaging/adapter/apply/mapper/ApplyEventMapper.java b/src/main/java/com/gloddy/server/messaging/adapter/apply/mapper/ApplyEventMapper.java index 994cd3c2..f965c7ee 100644 --- a/src/main/java/com/gloddy/server/messaging/adapter/apply/mapper/ApplyEventMapper.java +++ b/src/main/java/com/gloddy/server/messaging/adapter/apply/mapper/ApplyEventMapper.java @@ -10,17 +10,17 @@ public class ApplyEventMapper { public static ApplyAdapterEvent mapToApplyAdapterEventFrom(ApplyCreateEvent applyCreateEvent) { return new ApplyAdapterEvent( - applyCreateEvent.getUserId(), + applyCreateEvent.getCaptainId(), applyCreateEvent.getGroupId(), - applyCreateEvent.getUserId(), + applyCreateEvent.getApplyUserId(), ApplyEventType.APPLY_CREATE ); } public static ApplyAdapterEvent mapToApplyAdapterEventFrom(ApplyStatusUpdateEvent applyStatusUpdateEvent) { return new ApplyAdapterEvent( - applyStatusUpdateEvent.getUserId(), - applyStatusUpdateEvent.getApplyGroupId(), + applyStatusUpdateEvent.getCaptainId(), + applyStatusUpdateEvent.getGroupId(), applyStatusUpdateEvent.getApplyUserId(), getApplyEventType(applyStatusUpdateEvent.getStatus()) );