Merge pull request #9 from FinalDoubleTen/BE-50-Configure-Kafka

BE-50-Configure-Kafka

.http/NaverMap.http

@@ -1,5 +1,5 @@
 ### 주소 좌표값 변환 api
-GET https://naveropenapi.apigw.ntruss.com/map-geocode/v2/geocode?query=부산
+GET https://naveropenapi.apigw.ntruss.com/map-geocode/v2/geocode?query=강남대로 396
 X-NCP-APIGW-API-KEY-ID: {{naver-map-client-id}}
 X-NCP-APIGW-API-KEY: {{naver-map-client-secret}}
 

.http/Trip.http

@@ -3,7 +3,78 @@ GET https://api.weplanplans.site/trips
 Content-Type: application/json
 
 {
-  "endPoint" : "/trip",
+  "endPoint" : "/place",
+  "tripId": 1,
+  "visitDate": "2024-01-03",
+  "tripEditMessage" : {
+    "tripId": 1,
+    "startDate": "2024-01-03",
+    "endDate" : "2024-01-05",
+    "numberOfPeople": 2,
+    "tripName": "success",
+    "tripStatus": "BEFORE",
+    "area": "서울",
+    "subarea": "송파구",
+    "budget": 10000
+  },
+  "tripMemberMessage": null,
+  "tripPlaceMessage": {
+    "places": [
+      {
+        "tripItemId": 1,
+        "seqNum": 1,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.1051573",
+        "latitude": "37.3718141"
+      },
+      {
+        "tripItemId": 2,
+        "seqNum": 2,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "126.9271941",
+        "latitude": "37.5266691"
+      },
+      {
+        "tripItemId": 3,
+        "seqNum": 3,
+        "transportation": "PUBLIC_TRANSPORTATION",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.0283079",
+        "latitude": "37.4981647"
+      },
+      {
+        "tripItemId": 4,
+        "seqNum": 4,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.1051573",
+        "latitude": "37.3718141"
+      },
+      {
+        "tripItemId": 5,
+        "seqNum": 5,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.0283079",
+        "latitude": "37.4981647"
+      }
+    ]
+  }
+}
+
+### test
+POST http://localhost:8080/trips
+Content-Type: application/json
+
+{
+  "endPoint" : "/place",
   "tripId": 1,
   "visitDate": "2024-01-03",
   "tripEditMessage" : {
@@ -18,6 +89,54 @@ Content-Type: application/json
     "budget": 10000
   },
   "tripMemberMessage": null,
-  "tripPlaceMessage": null
+  "tripPlaceMessage": {
+    "places": [
+      {
+        "tripItemId": 1,
+        "seqNum": 1,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.1051573",
+        "latitude": "37.3718141"
+      },
+      {
+        "tripItemId": 2,
+        "seqNum": 2,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "126.9271941",
+        "latitude": "37.5266691"
+      },
+      {
+        "tripItemId": 3,
+        "seqNum": 3,
+        "transportation": "PUBLIC_TRANSPORTATION",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.0283079",
+        "latitude": "37.4981647"
+      },
+      {
+        "tripItemId": 4,
+        "seqNum": 4,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.1051573",
+        "latitude": "37.3718141"
+      },
+      {
+        "tripItemId": 5,
+        "seqNum": 5,
+        "transportation": "CAR",
+        "visitDate": "2023-12-31",
+        "estimatePrice": 10000,
+        "longitude": "127.0283079",
+        "latitude": "37.4981647"
+      }
+    ]
+  }
 }
 

src/main/java/org/tenten/tentenstomp/config/AsyncConfig.java

@@ -0,0 +1,8 @@
+package org.tenten.tentenstomp.config;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AsyncConfig {
+
+}

src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java

@@ -5,10 +5,9 @@
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.web.bind.annotation.RestController;
-import org.tenten.tentenstomp.domain.trip.dto.request.TripRequestMsg;
-import org.tenten.tentenstomp.domain.trip.pubsub.RedisPublisher;
+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

src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripItemController.java

@@ -0,0 +1,31 @@
+package org.tenten.tentenstomp.domain.trip.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.handler.annotation.DestinationVariable;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.web.bind.annotation.RestController;
+import org.tenten.tentenstomp.domain.trip.dto.request.TripItemPriceUpdateMsg;
+import org.tenten.tentenstomp.domain.trip.dto.request.TripItemVisitDateUpdateMsg;
+import org.tenten.tentenstomp.domain.trip.service.TripItemService;
+
+@RestController
+@RequiredArgsConstructor
+public class TripItemController {
+    private final TripItemService tripItemService;
+
+    @MessageMapping("/tripItems/{tripItemId}/updatePrice")
+    public void updateTripItemPrice(@DestinationVariable String tripItemId, @Payload TripItemPriceUpdateMsg priceUpdateMsg) {
+        tripItemService.updateTripItemPrice(tripItemId, priceUpdateMsg);
+    }
+
+    @MessageMapping("/tripItems/{tripItemId}/updateVisitDate")
+    public void updateTripItemVisitDate(@DestinationVariable String tripItemId, @Payload TripItemVisitDateUpdateMsg visitDateUpdateMsg) {
+        tripItemService.updateTripItemVisitDate(tripItemId, visitDateUpdateMsg);
+    }
+
+    @MessageMapping("/tripItems/{tripItemId}/deleteItem")
+    public void deleteTripItem(@DestinationVariable String tripItemId) {
+        tripItemService.deleteTripItem(tripItemId);
+    }
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/MemberConnectMsg.java

@@ -0,0 +1,6 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+public record MemberConnectMsg(
+    Long memberId
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/MemberDisconnectMsg.java

@@ -0,0 +1,6 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+public record MemberDisconnectMsg(
+    Long memberId
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripItemAddMsg.java

@@ -0,0 +1,19 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+import org.tenten.tentenstomp.global.common.enums.Transportation;
+
+import java.util.List;
+
+public record TripItemAddMsg(
+    String visitDate,
+    List<TripItemCreateRequest> newTripItems
+) {
+    public record TripItemCreateRequest(
+        Long tourItemId,
+        Transportation transportation,
+        Long seqNum,
+        Long price
+    ) {
+
+    }
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripItemOrderUpdateMsg.java

@@ -0,0 +1,14 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+import java.util.List;
+
+public record TripItemOrderUpdateMsg(
+    String visitDate,
+    List<OrderInfo> tripItemOrder
+
+) {
+    public record OrderInfo(
+        Long tripItemId,
+        Long seqNum
+    ){}
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripItemPriceUpdateMsg.java

@@ -0,0 +1,6 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+public record TripItemPriceUpdateMsg(
+    Long price
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripItemVisitDateUpdateMsg.java

@@ -0,0 +1,6 @@
+package org.tenten.tentenstomp.domain.trip.dto.request;
+
+public record TripItemVisitDateUpdateMsg(
+    String visitDate
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripInfoRequestMsg.java → src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java

@@ -2,8 +2,7 @@
 
 import org.tenten.tentenstomp.global.common.enums.TripStatus;
 
-public record TripInfoRequestMsg(
-    Long tripId,
+public record TripUpdateMsg(
     String startDate,
     String endDate,
     Long numberOfPeople,

src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripInfoResponseMsg.java → src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripInfoMsg.java

@@ -2,7 +2,7 @@
 
 import org.tenten.tentenstomp.global.common.enums.TripStatus;
 
-public record TripInfoResponseMsg(
+public record TripInfoMsg(
     Long tripId,
     String startDate,
     String endDate,

src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripItemInfoMsg.java

@@ -0,0 +1,16 @@
+package org.tenten.tentenstomp.domain.trip.dto.response;
+
+import org.tenten.tentenstomp.global.common.enums.Transportation;
+
+public record TripItemInfoMsg(
+    Long tripItemId,
+    Long tourItemId,
+    String name,
+    String thumbnailUrl,
+    String category,
+    Transportation transportation,
+    Long seqNum,
+    String visitDate,
+    Long price
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripItemMsg.java

@@ -0,0 +1,11 @@
+package org.tenten.tentenstomp.domain.trip.dto.response;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record TripItemMsg(
+    Long tripId,
+    String visitDate,
+    List<TripItemInfoMsg> tripItems
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripMemberInfoMsg.java

@@ -0,0 +1,8 @@
+package org.tenten.tentenstomp.domain.trip.dto.response;
+
+public record TripMemberInfoMsg(
+    Long memberId,
+    String name,
+    String thumbnailUrl
+) {
+}

src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripMemberMsg.java

@@ -0,0 +1,9 @@
+package org.tenten.tentenstomp.domain.trip.dto.response;
+
+import java.util.List;
+
+public record TripMemberMsg(
+    Long tripId,
+    List<TripMemberInfoMsg> connectedMembers
+) {
+}