Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop_back_core' into develop_…
Browse files Browse the repository at this point in the history
…back_core

# Conflicts:
#	backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java
  • Loading branch information
seokho-1116 committed Jun 19, 2024
2 parents c92e952 + df94416 commit 277bbbb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ private CapsuleSkin(String skinName, String imageUrl, Motion motionName, Member
}

private CapsuleSkin(String skinName, String imageUrl, Member member) {
this.skinName =
this.imageUrl = imageUrl;
this.skinName = skinName;
this.imageUrl = imageUrl;
this.member = member;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public record GroupInviteNotificationDto(
) {

public static GroupInviteNotificationDto createOf(
final String groupProfileUrl,
final String ownerNickname,
final String groupProfileUrl,
final List<Long> targetIds

) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,10 @@ public void sendGroupInviteMessage(
final String groupProfileUrl,
final List<Long> targetIds
) {
String preSignedUrl = s3PreSignedUrlManager.getS3PreSignedUrlForGet(groupProfileUrl);

basicRabbitTemplate.convertAndSend(
RabbitmqComponentConstants.GROUP_INVITE_NOTIFICATION_EXCHANGE.getSuccessComponent(),
RabbitmqComponentConstants.GROUP_INVITE_NOTIFICATION_QUEUE.getSuccessComponent(),
GroupInviteNotificationDto.createOf(ownerNickname, preSignedUrl, targetIds)
GroupInviteNotificationDto.createOf(ownerNickname, groupProfileUrl, targetIds)
);
}

Expand Down

0 comments on commit 277bbbb

Please sign in to comment.