Feat : 패키지구조 수정

WePlanPlans · Jan 6, 2024 · a08faa5 · a08faa5
1 parent 1de8274
commit a08faa5
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java b/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java
@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.tenten.tentenstomp.domain.trip.dto.request.*;
 import org.tenten.tentenstomp.domain.trip.service.TripService;
-import org.tenten.tentenstomp.global.producer.KafkaProducer;
+import org.tenten.tentenstomp.global.messaging.kafka.producer.KafkaProducer;
 
 @RestController
 @RequiredArgsConstructor
@@ -45,5 +45,4 @@ public void connectMember(@DestinationVariable String tripId, @Payload MemberCon
     public void disconnectMember(@DestinationVariable String tripId, @Payload MemberDisconnectMsg memberDisconnectMsg) {
         tripService.disconnectMember(tripId, memberDisconnectMsg);
     }
-
 }
diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java
@@ -1,23 +1,22 @@
 package org.tenten.tentenstomp.domain.trip.service;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.tenten.tentenstomp.domain.trip.dto.request.TripItemPriceUpdateMsg;
 import org.tenten.tentenstomp.domain.trip.dto.request.TripItemVisitDateUpdateMsg;
 import org.tenten.tentenstomp.domain.trip.repository.TripItemRepository;
-import org.tenten.tentenstomp.global.publisher.RedisPublisher;
+import org.tenten.tentenstomp.global.messaging.kafka.producer.KafkaProducer;
+import org.tenten.tentenstomp.global.messaging.redis.publisher.RedisPublisher;
 import org.tenten.tentenstomp.global.util.RedisChannelUtil;
 
-import static org.tenten.tentenstomp.global.common.constant.EndPointConstant.TRIP_ITEM;
-
 @Service
 @RequiredArgsConstructor
 public class TripItemService {
     private final TripItemRepository tripItemRepository;
     private final RedisChannelUtil redisChannelUtil;
     private final RedisPublisher redisPublisher;
+    private final KafkaProducer kafkaProducer;
     @Transactional
     public void updateTripItemPrice(String tripItemId, TripItemPriceUpdateMsg priceUpdateMsg) {
         // TODO : /sub/{tripId}/tripItems/{visitDate}

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
@@ -8,8 +8,8 @@
 import org.tenten.tentenstomp.domain.trip.dto.response.TripInfoMsg;
 import org.tenten.tentenstomp.domain.trip.entity.Trip;
 import org.tenten.tentenstomp.domain.trip.repository.TripItemRepository;
-import org.tenten.tentenstomp.global.common.constant.EndPointConstant;
-import org.tenten.tentenstomp.global.publisher.RedisPublisher;
+import org.tenten.tentenstomp.global.messaging.kafka.producer.KafkaProducer;
+import org.tenten.tentenstomp.global.messaging.redis.publisher.RedisPublisher;
 import org.tenten.tentenstomp.domain.trip.repository.TripRepository;
 import org.tenten.tentenstomp.global.response.GlobalStompResponse;
 import org.tenten.tentenstomp.global.util.RedisChannelUtil;
@@ -28,6 +28,7 @@ public class TripService {
     private final RedisChannelUtil redisChannelUtil;
     private final TripItemRepository tripItemRepository;
     private final RedisPublisher redisPublisher;
+    private final KafkaProducer kafkaProducer;
 
     private final Map<String, HashSet<Long>> connectedMemberMap = new HashMap<>();
 //    private final PathComponent pathComponent;

diff --git a/...nstomp/global/consumer/KafkaConsumer.java → ...ssaging/kafka/consumer/KafkaConsumer.java b/...nstomp/global/consumer/KafkaConsumer.java → ...ssaging/kafka/consumer/KafkaConsumer.java
@@ -1,4 +1,4 @@
-package org.tenten.tentenstomp.global.consumer;
+package org.tenten.tentenstomp.global.messaging.kafka.consumer;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.kafka.clients.consumer.ConsumerConfig;

diff --git a/...nstomp/global/producer/KafkaProducer.java → ...ssaging/kafka/producer/KafkaProducer.java b/...nstomp/global/producer/KafkaProducer.java → ...ssaging/kafka/producer/KafkaProducer.java
@@ -1,4 +1,4 @@
-package org.tenten.tentenstomp.global.producer;
+package org.tenten.tentenstomp.global.messaging.kafka.producer;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.kafka.core.KafkaTemplate;

diff --git a/...tomp/global/publisher/RedisPublisher.java → ...aging/redis/publisher/RedisPublisher.java b/...tomp/global/publisher/RedisPublisher.java → ...aging/redis/publisher/RedisPublisher.java
@@ -1,4 +1,4 @@
-package org.tenten.tentenstomp.global.publisher;
+package org.tenten.tentenstomp.global.messaging.redis.publisher;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;

diff --git a/...mp/global/subscriber/RedisSubscriber.java → ...ing/redis/subscriber/RedisSubscriber.java b/...mp/global/subscriber/RedisSubscriber.java → ...ing/redis/subscriber/RedisSubscriber.java
@@ -1,4 +1,4 @@
-package org.tenten.tentenstomp.global.subscriber;
+package org.tenten.tentenstomp.global.messaging.redis.subscriber;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/org/tenten/tentenstomp/global/util/RedisChannelUtil.java b/src/main/java/org/tenten/tentenstomp/global/util/RedisChannelUtil.java
@@ -4,7 +4,7 @@
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
-import org.tenten.tentenstomp.global.subscriber.RedisSubscriber;
+import org.tenten.tentenstomp.global.messaging.redis.subscriber.RedisSubscriber;
 
 import java.util.HashMap;
 import java.util.Map;