From cc40d49f5fafa38e4f84051ab6238be61ee897d4 Mon Sep 17 00:00:00 2001 From: dh1010a Date: Sat, 22 Feb 2025 20:58:59 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=B9=9C=EA=B5=AC=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EC=A0=84=EC=86=A1=EC=8B=9C=20Type=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userserver/global/kafka/PresenceEventConsumerService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backend/user-server/src/main/java/com/bbebig/userserver/global/kafka/PresenceEventConsumerService.java b/src/backend/user-server/src/main/java/com/bbebig/userserver/global/kafka/PresenceEventConsumerService.java index eed57820..9e1e3900 100644 --- a/src/backend/user-server/src/main/java/com/bbebig/userserver/global/kafka/PresenceEventConsumerService.java +++ b/src/backend/user-server/src/main/java/com/bbebig/userserver/global/kafka/PresenceEventConsumerService.java @@ -2,6 +2,7 @@ import com.bbebig.commonmodule.kafka.dto.PresenceEventDto; import com.bbebig.commonmodule.kafka.dto.notification.FriendPresenceEventDto; +import com.bbebig.commonmodule.kafka.dto.notification.NotificationEventType; import com.bbebig.userserver.friend.service.FriendService; import com.bbebig.userserver.member.service.KafkaProducerService; import lombok.RequiredArgsConstructor; @@ -41,6 +42,7 @@ private void handleEvent(PresenceEventDto presenceEventDto) { for (Long friendMemberId : friendMemberIds) { FriendPresenceEventDto friendPresenceEventDto = FriendPresenceEventDto.builder() .memberId(friendMemberId) + .type(NotificationEventType.FRIEND_PRESENCE) .friendMemberId(memberId) .globalStatus(presenceEventDto.getGlobalStatus()) .build(); From 223c6b2d9e22d9c24cf6de34a7ebfbd6ddb5174f Mon Sep 17 00:00:00 2001 From: dh1010a Date: Mon, 24 Feb 2025 15:55:11 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=EC=B9=9C=EA=B5=AC=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EC=A0=84=EC=86=A1=EC=8B=9C=20Type=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/user-server/src/main/resources/application.yml b/src/backend/user-server/src/main/resources/application.yml index 87169707..ead9b37a 100644 --- a/src/backend/user-server/src/main/resources/application.yml +++ b/src/backend/user-server/src/main/resources/application.yml @@ -33,14 +33,14 @@ spring: consumer: group-id: - channel-chat-event: "${spring.application.name}-channelChatEventGroup-${INSTANCE_ID}" - dm-chat-event: "${spring.application.name}-dmChatEventGroup-${INSTANCE_ID}" - notification-event: "${spring.application.name}-notificationEventGroup-${INSTANCE_ID}" - server-event: "${spring.application.name}-serverEventGroup-${INSTANCE_ID}" - channel-event: "${spring.application.name}-channelEventGroup-${INSTANCE_ID}" - connection-event: "${spring.application.name}-connectionEventGroup-${INSTANCE_ID}" - presence-event: "${spring.application.name}-presenceEventGroup-${INSTANCE_ID}" - member-event: "${spring.application.name}-memberEventGroup-${INSTANCE_ID}" + channel-chat-event: "${spring.application.name}-channelChatEventGroup" + dm-chat-event: "${spring.application.name}-dmChatEventGroup" + notification-event: "${spring.application.name}-notificationEventGroup" + server-event: "${spring.application.name}-serverEventGroup" + channel-event: "${spring.application.name}-channelEventGroup" + connection-event: "${spring.application.name}-connectionEventGroup" + presence-event: "${spring.application.name}-presenceEventGroup" + member-event: "${spring.application.name}-memberEventGroup" enable-auto-commit: true From 39e97525fa6b78a1c69139fb63eeb268b9a9af79 Mon Sep 17 00:00:00 2001 From: dh1010a Date: Mon, 24 Feb 2025 16:05:45 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EB=8B=89?= =?UTF-8?q?=EB=84=A4=EC=9E=84=EC=9C=BC=EB=A1=9C=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 13 +++++++++++++ .../member/repository/MemberRepository.java | 4 ++++ .../userserver/member/service/MemberService.java | 10 +++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/controller/MemberController.java b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/controller/MemberController.java index 6f72661e..7e9b5d92 100644 --- a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/controller/MemberController.java +++ b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/controller/MemberController.java @@ -96,4 +96,17 @@ public CommonResponse readMember( return CommonResponse.onSuccess(memberService.readMember(memberId)); } + @Operation(summary = "멤버 닉네임으로 검색", description = "멤버 닉네임으로 조회합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "멤버 조회 성공", useReturnTypeSchema = true), + @ApiResponse(responseCode = "400", description = "", content = @Content) + }) + @GetMapping("/search") + public CommonResponse getMemberByNickName( + @RequestParam("nickName") String nickName + ) { + log.info("[Member] 닉네임으로 멤버 조회 요청: nickName = {}", nickName); + return CommonResponse.onSuccess(memberService.getMemberByNickname(nickName)); + } + } diff --git a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/repository/MemberRepository.java b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/repository/MemberRepository.java index d420a59a..cd0a7ca1 100644 --- a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/repository/MemberRepository.java +++ b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/repository/MemberRepository.java @@ -3,5 +3,9 @@ import com.bbebig.userserver.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface MemberRepository extends JpaRepository { + + Optional findByNickname(String nickname); } diff --git a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/service/MemberService.java b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/service/MemberService.java index d2d1314b..0739dcfe 100644 --- a/src/backend/user-server/src/main/java/com/bbebig/userserver/member/service/MemberService.java +++ b/src/backend/user-server/src/main/java/com/bbebig/userserver/member/service/MemberService.java @@ -1,6 +1,5 @@ package com.bbebig.userserver.member.service; -import com.bbebig.commonmodule.clientDto.UserFeignResponseDto; import com.bbebig.commonmodule.clientDto.UserFeignResponseDto.*; import com.bbebig.commonmodule.global.response.code.error.ErrorStatus; import com.bbebig.commonmodule.global.response.exception.ErrorHandler; @@ -26,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Optional; @Slf4j @Service @@ -143,6 +143,12 @@ public MemberReadResponseDto readMember(Long memberId) { return MemberReadResponseDto.convertToMemberReadResponseDto(member); } + @Transactional(readOnly = true) + public MemberReadResponseDto getMemberByNickname(String nickname) { + Optional member = memberRepository.findByNickname(nickname); + return member.map(MemberReadResponseDto::convertToMemberReadResponseDto).orElse(null); + } + /** * 멤버 정보 조회 (For Feign Client) */ @@ -164,6 +170,8 @@ public MemberInfoResponseDto getMemberInfo(Long memberId) { .build(); } + + /** * 멤버 전역 상태 조회 */ From 9326959b53d68516c81c1595d2e23af9e17b084d Mon Sep 17 00:00:00 2001 From: dh1010a Date: Mon, 24 Feb 2025 16:09:37 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=EC=84=9C=EB=B2=84=20=EC=8A=A4?= =?UTF-8?q?=EC=BC=80=EC=9D=BC=EC=95=84=EC=9B=83=20=EC=A4=80=EB=B9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/state-server/src/main/resources/application.yml b/src/backend/state-server/src/main/resources/application.yml index d4631103..0fb2c938 100644 --- a/src/backend/state-server/src/main/resources/application.yml +++ b/src/backend/state-server/src/main/resources/application.yml @@ -29,14 +29,14 @@ spring: consumer: group-id: - channel-chat-event: "${spring.application.name}-channelChatEventGroup-${INSTANCE_ID}" - dm-chat-event: "${spring.application.name}-dmChatEventGroup-${INSTANCE_ID}" - notification-event: "${spring.application.name}-notificationEventGroup-${INSTANCE_ID}" - server-event: "${spring.application.name}-serverEventGroup-${INSTANCE_ID}" - channel-event: "${spring.application.name}-channelEventGroup-${INSTANCE_ID}" - connection-event: "${spring.application.name}-connectionEventGroup-${INSTANCE_ID}" - presence-event: "${spring.application.name}-presenceEventGroup-${INSTANCE_ID}" - member-event: "${spring.application.name}-memberEventGroup-${INSTANCE_ID}" + channel-chat-event: "${spring.application.name}-channelChatEventGroup" + dm-chat-event: "${spring.application.name}-dmChatEventGroup" + notification-event: "${spring.application.name}-notificationEventGroup" + server-event: "${spring.application.name}-serverEventGroup" + channel-event: "${spring.application.name}-channelEventGroup" + connection-event: "${spring.application.name}-connectionEventGroup" + presence-event: "${spring.application.name}-presenceEventGroup" + member-event: "${spring.application.name}-memberEventGroup" enable-auto-commit: true auto-offset-reset: latest From 32203d1cc9299b44d8fc7ad2d531c1b42e1650d3 Mon Sep 17 00:00:00 2001 From: dh1010a Date: Mon, 24 Feb 2025 17:55:58 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=EC=B9=B4=ED=94=84=EC=B9=B4=20?= =?UTF-8?q?=ED=81=B4=EB=9F=AC=EC=8A=A4=ED=84=B0=20=EA=B5=AC=EC=B6=95?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/user-server/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/user-server/src/main/resources/application.yml b/src/backend/user-server/src/main/resources/application.yml index ead9b37a..5292a78c 100644 --- a/src/backend/user-server/src/main/resources/application.yml +++ b/src/backend/user-server/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: host: redis kafka: - bootstrap-servers: kafka:9092 + bootstrap-servers: kafka00:9092,kafka01:9093,kafka02:9094 topic: channel-chat-event: "channelChatEvent" @@ -29,7 +29,7 @@ spring: member-event: "memberEvent" producer: - bootstrap-servers: kafka:9092 + bootstrap-servers: kafka00:9092,kafka01:9093,kafka02:9094 consumer: group-id: From 15269a0c5f6190862b9abcdd2903444f945883df Mon Sep 17 00:00:00 2001 From: dh1010a Date: Mon, 24 Feb 2025 18:36:42 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=EC=B9=B4=ED=94=84=EC=B9=B4=20?= =?UTF-8?q?=ED=81=B4=EB=9F=AC=EC=8A=A4=ED=84=B0=20=EA=B5=AC=EC=B6=95?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/user-server/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/user-server/src/main/resources/application.yml b/src/backend/user-server/src/main/resources/application.yml index 5292a78c..d1083a9e 100644 --- a/src/backend/user-server/src/main/resources/application.yml +++ b/src/backend/user-server/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: host: redis kafka: - bootstrap-servers: kafka00:9092,kafka01:9093,kafka02:9094 + bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS} topic: channel-chat-event: "channelChatEvent" @@ -29,7 +29,7 @@ spring: member-event: "memberEvent" producer: - bootstrap-servers: kafka00:9092,kafka01:9093,kafka02:9094 + bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS} consumer: group-id: