From 1333f5fef86d0a8fe17da9cad6c1c76d7098a405 Mon Sep 17 00:00:00 2001 From: Kim-Dong-Jun99 Date: Fri, 26 Jan 2024 00:16:05 +0900 Subject: [PATCH] =?UTF-8?q?Refactor=20:=20=EC=BB=A4=EC=84=9C=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=A0=84=EB=8B=AC=EC=8B=9C=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80=20=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/trip/dto/response/TripCursorMsg.java | 3 ++- .../domain/trip/service/TripService.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripCursorMsg.java b/src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripCursorMsg.java index 099d2da..47c728c 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripCursorMsg.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripCursorMsg.java @@ -7,6 +7,7 @@ public record TripCursorMsg( Long memberId, String name, Double x, - Double y + Double y, + String color ) { } diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java index fbd772a..5f2779a 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java @@ -29,8 +29,7 @@ import static org.tenten.tentenstomp.domain.trip.dto.response.TripInfoMsg.fromEntity; import static org.tenten.tentenstomp.domain.trip.dto.response.TripItemMsg.fromTripItemList; import static org.tenten.tentenstomp.domain.trip.dto.response.TripMemberMsg.fromEntity; -import static org.tenten.tentenstomp.global.common.constant.TopicConstant.PATH; -import static org.tenten.tentenstomp.global.common.constant.TopicConstant.TRIP_ITEM; +import static org.tenten.tentenstomp.global.common.constant.TopicConstant.*; import static org.tenten.tentenstomp.global.common.enums.Transportation.CAR; import static org.tenten.tentenstomp.global.common.enums.Transportation.fromName; import static org.tenten.tentenstomp.global.component.dto.request.TripPlace.fromTripItems; @@ -48,6 +47,13 @@ public class TripService { private final PathComponent pathComponent; private final MessageProxyRepository messageProxyRepository; private final SecurityUtil securityUtil; + private static final String[] COLORS = new String[]{ + "#FF2167", + "#7932FF", + "#29DDF6", + "#FFAC16", + "#16E7A9" + }; private final Map> tripConnectedMemberMap = new HashMap<>(); @Transactional public void connectMember(String tripId, MemberConnectMsg memberConnectMsg) { @@ -256,8 +262,8 @@ public void deleteTripMember(String tripId, Long memberId) { public void updateCursor(String tripId, CursorUpdateMsg cursorUpdateMsg) { Long memberId = securityUtil.getMemberId(cursorUpdateMsg.token()); Member member = memberRepository.getReferenceById(memberId); - TripCursorMsg tripCursorMsg = new TripCursorMsg(tripId, cursorUpdateMsg.visitDate(), memberId, member.getNickname(), cursorUpdateMsg.x(), cursorUpdateMsg.y()); - kafkaProducer.sendAndSaveToRedis(tripCursorMsg); + TripCursorMsg tripCursorMsg = new TripCursorMsg(tripId, cursorUpdateMsg.visitDate(), memberId, member.getNickname(), cursorUpdateMsg.x(), cursorUpdateMsg.y(), COLORS[memberId % 5]); + kafkaProducer.send(CURSOR, tripCursorMsg); } @WithRedissonLock @Transactional