Feature/transactions

.gitignore

@@ -6,6 +6,7 @@ build/
 !**/src/test/**/build/
 h2/
 src/main/resources/application.yaml
+src/main/resources/application.yml
 
 ### STS ###
 .apt_generated
@@ -29,7 +30,7 @@ out/
 !**/src/test/**/out/
 
 ### env ###
-src/main/java/com/app/treen/.env
+.env
 
 ### NetBeans ###
 /nbproject/private/

build/resources/main/application.yml

@@ -5,6 +5,9 @@
 #    username: ${DB_USERNAME:root}
 #    password: ${DB_PASSWORD:password}
 spring:
+  redis:
+    host: localhost
+    port: 6379
   config:
     import: optional:file:.env[.properties]  # .env 파일을 직접 로드
   datasource:
@@ -13,16 +16,15 @@ spring:
     username: sa      # 기본 사용자명
     password:
   jpa:
-    hibernate.ddl-auto: create
+    hibernate.ddl-auto: update
     show-sql: true
     properties:
       hibernate:
         format_sql: true
-    database-platform: org.hibernate.dialect.H2Dialect  # H2Dialect 설정
   data:
     mongodb:
-      uri: mongodb+srv://cymn6032:leeujin0309%40@cluster0.q68ku.mongodb.net/
-      database: treen_dev
+      uri: ${MONGO_DB_URI}
+      database: ${MONGO_DB_DATABASE}
 #    database-platform: org.hibernate.dialect.MySQL8Dialect
 cloud:
   aws:
@@ -36,5 +38,9 @@ cloud:
       auto: false
 jwt:
   secret:
-    key: 780f7e25c9e36b276459459a13b081bbe121af603c2d039b4228739a690d399c75386d3d89f63a099ba817e3764fbf1c7bf744c060c24d2e812e10d511cc3b64
-    refresh: 4dedc73032e5574ca6133ddfd6c767b4d7567012482d21f3a268248209997fc52af16f46a3624da10116d9e3e6cacd2ae0750b468738d15e12ba9952d710a7af
+    key: ${JWT_SECRET_KEY}
+    refresh: ${JWT_REFRESH_KEY}
+coolsms:
+  apiKey: ${COOL_SMS_KEY}
+  apiSecret: ${COOL_SMS_SECRET_KEY}
+  senderNumber: ${COOL_SMS_SEND_NUMBER}

src/main/generated/com/app/treen/products/entity/QTransProduct.java

@@ -35,8 +35,6 @@ public class QTransProduct extends EntityPathBase<TransProduct> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final ListPath<TransPImg, QTransPImg> images = this.<TransPImg, QTransPImg>createList("images", TransPImg.class, QTransPImg.class, PathInits.DIRECT2);
-
     public final NumberPath<Long> likedCount = createNumber("likedCount", Long.class);
 
     public final EnumPath<com.app.treen.products.entity.enumeration.Method> method = createEnum("method", com.app.treen.products.entity.enumeration.Method.class);

src/main/java/com/app/treen/TreenApplication.java

@@ -8,7 +8,7 @@
 
 @EnableJpaAuditing
 @EnableJpaRepositories(basePackages = "com.app.treen.jpa.repository")
-@EnableMongoRepositories(basePackages = "com.app.treen.mongo")
+@EnableMongoRepositories(basePackages = "com.app.treen.mongo.repository")
 @SpringBootApplication
 public class TreenApplication {
 

src/main/java/com/app/treen/chat_room/controller/ChatRoomController.java

@@ -1,124 +1,57 @@
-//package com.app.treen.chat_room.controller;
-//
-//import com.app.treen.chat_room.dto.request.ChatRoomRequestDto;
-//import com.app.treen.chat_room.dto.request.MessageRequestDto;
-//import com.app.treen.chat_room.dto.response.*;
-//import com.app.treen.chat_room.service.ChatRoomService;
-//import com.app.treen.common.jwt.service.dto.CustomUserDetails;
-//import com.app.treen.common.response.ResponseEntity;
-//import jakarta.validation.Valid;
-//import lombok.RequiredArgsConstructor;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.messaging.handler.annotation.MessageMapping;
-//import org.springframework.messaging.simp.SimpMessageSendingOperations;
-//import org.springframework.security.core.annotation.AuthenticationPrincipal;
-//import org.springframework.web.bind.annotation.*;
-//import reactor.core.publisher.Flux;
-//import reactor.core.publisher.Mono;
-//
-//import java.util.List;
-//
-//@RestController
-//@RequiredArgsConstructor
-//public class ChatRoomController {
-//
-//    private final SimpMessageSendingOperations template;
-//    private final ChatRoomService chatRoomService;
-//
-//    // 채팅리스트 반환
-////    @GetMapping("/chat/{id}")
-////    public ResponseEntity<List<ChatMessageResponseDto>> getChatMessages(@PathVariable Long id) {
-////        // 임시로 리스트 형식으로 구현, 실제로는 DB 접근 필요
-////        ChatMessageResponseDto test = new ChatMessageResponseDto(1L, "test", "test");
-////        return ResponseEntity.ok().body(List.of(test));
-////    }
-//
-//    // 메시지 송신 및 수신, /pub가 생략된 모습. 클라이언트 단에서는 /pub/message 로 요청
-////    @MessageMapping("/message")
-////    public ResponseEntity<Void> receiveMessage(@RequestBody MessageResponseDto chat) {
-////        // 메시지를 해당 채팅방 구독자들에게 전송
-////        template.convertAndSend("/sub/chatroom/1", chat);
-////        return ResponseEntity.ok().build();
-////    }
-//
-//    // 채팅방 목록 조회
-//    @GetMapping("/auth/chat-list")
-//    public ResponseEntity<ChatRoomsResponse> getChatRooms(@AuthenticationPrincipal CustomUserDetails userDetails) {
-//
-//        ChatRoomsResponse chatRoomsResponse = ChatRoomsResponse.builder()
-//                .chatRooms(chatRoomService.getChatRooms(userDetails.getMember().getId()))
-//                .build();
-//
-//        return ResponseEntity.onSuccess(chatRoomsResponse);
-//    }
-//
-//    // 채팅방 조회
-//    @GetMapping("auth/{chatRoomId}")
-//    public Mono<ResponseEntity<ChatRoomDetailResponse>> getChatRoomDetail(@AuthenticationPrincipal CustomUserDetails userDetails,
-//                                                                 @PathVariable Long chatRoomId) {
-//
-//        return chatRoomService.getChatRoomDetail(userDetails.getMember().getId(), chatRoomId)
-//                .map(ResponseEntity::onSuccess);
-//    }
-//
-//    // 채팅방 생성
-//    @PostMapping("auth/create")
-//    public ResponseEntity<ChatRoomCreateResponse> createChatRoom(@AuthenticationPrincipal CustomUserDetails userDetails,
-//                                                              @Valid @RequestBody ChatRoomRequestDto dto) {
-//        Long chatRoomId = chatRoomService.saveChatRoom(userDetails.getMember().getId(),
-//                dto.getSellerId(), dto.getProductId());
-//        return ResponseEntity.onSuccess(ChatRoomCreateResponse.builder()
-//                .chatRoomId(chatRoomId)
-//                .build());
-//    }
-//
-//    // 이전 채팅 메시지들 조회
-//    @GetMapping("/find/chat/list/{id}")
-//    public Mono<ResponseEntity<List<MessageResponseDto>>> findMessages(@PathVariable("id") Long id) {
-//        Flux<MessageResponseDto> response = chatRoomService.findChatMessages(id);
-//        return response.collectList().map(ResponseEntity::onSuccess);
-//    }
-//
-//    // 메시지 송신 및 수신
-//    @MessageMapping("/message")
-//    public Mono<ResponseEntity<Void>> receiveMessage(@RequestBody MessageRequestDto chat) {
-//        return chatRoomService.saveChatMessage(chat).doOnNext(message -> {
-//            // 메시지를 해당 채팅방 구독자들에게 전송
-//            template.convertAndSend("/sub/chatroom/" + chat.getRoomId(),
-//                    MessageResponseDto.of(message));
-//
-//        }).thenReturn(ResponseEntity.ok().build());
-//    }
-//
-//}
-/*
+package com.app.treen.chat_room.controller;
+
+import com.app.treen.chat_room.dto.request.ChatRoomRequestDto;
+import com.app.treen.chat_room.dto.request.MessageRequestDto;
+import com.app.treen.chat_room.dto.response.*;
+import com.app.treen.chat_room.service.ChatRoomService;
+import com.app.treen.user.service.CustomUserDetails;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessageSendingOperations;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/chatroom")
+public class ChatRoomController {
+
+    private final SimpMessageSendingOperations template;
+    private final ChatRoomService chatRoomService;
+
     // 채팅방 목록 조회
     @GetMapping("/auth/chat-list")
     public ResponseEntity<ChatRoomsResponse> getChatRooms(@AuthenticationPrincipal CustomUserDetails userDetails) {
 
         ChatRoomsResponse chatRoomsResponse = ChatRoomsResponse.builder()
-                .chatRooms(chatRoomService.getChatRooms(userDetails.getMember().getId()))
+                .chatRooms(chatRoomService.getChatRooms(userDetails.getUser().getId()))
                 .build();
 
-        return ResponseEntity.onSuccess(chatRoomsResponse);
+        return ResponseEntity.ok(chatRoomsResponse);
     }
 
     // 채팅방 조회
     @GetMapping("auth/{chatRoomId}")
     public Mono<ResponseEntity<ChatRoomDetailResponse>> getChatRoomDetail(@AuthenticationPrincipal CustomUserDetails userDetails,
-                                                                 @PathVariable Long chatRoomId) {
+                                                                          @PathVariable Long chatRoomId) {
 
-        return chatRoomService.getChatRoomDetail(userDetails.getMember().getId(), chatRoomId)
-                .map(ResponseEntity::onSuccess);
+        return chatRoomService.getChatRoomDetail(userDetails.getUser().getId(), chatRoomId)
+                .map(ResponseEntity::ok);
     }
 
     // 채팅방 생성
     @PostMapping("auth/create")
     public ResponseEntity<ChatRoomCreateResponse> createChatRoom(@AuthenticationPrincipal CustomUserDetails userDetails,
-                                                              @Valid @RequestBody ChatRoomRequestDto dto) {
-        Long chatRoomId = chatRoomService.saveChatRoom(userDetails.getMember().getId(),
+                                                                 @Valid @RequestBody ChatRoomRequestDto dto) {
+        Long chatRoomId = chatRoomService.saveChatRoom(userDetails.getUser().getId(),
                 dto.getSellerId(), dto.getProductId());
-        return ResponseEntity.onSuccess(ChatRoomCreateResponse.builder()
+        return ResponseEntity.ok(ChatRoomCreateResponse.builder()
                 .chatRoomId(chatRoomId)
                 .build());
     }
@@ -127,12 +60,39 @@ public ResponseEntity<ChatRoomCreateResponse> createChatRoom(@AuthenticationPrin
     @GetMapping("/find/chat/list/{id}")
     public Mono<ResponseEntity<List<MessageResponseDto>>> findMessages(@PathVariable("id") Long id) {
         Flux<MessageResponseDto> response = chatRoomService.findChatMessages(id);
-        return response.collectList().map(ResponseEntity::onSuccess);
+        return response.collectList().map(ResponseEntity::ok);
+    }
+
+    // ======== 테스트 API 작성 ==========
+
+    // 채팅방 조회
+    @GetMapping("test/{chatRoomId}")
+    public Mono<ResponseEntity<ChatRoomDetailResponse>> getChatRoomDetailTest(
+            @PathVariable("chatRoomId") Long chatRoomId) {
+
+        return chatRoomService.getChatRoomDetail(1L, chatRoomId)
+                .map(ResponseEntity::ok);
+    }
+
+    @PostMapping("test/create")
+    public ResponseEntity<ChatRoomCreateResponse> createChatRoomTest(
+            @Valid @RequestBody ChatRoomRequestDto dto) {
+        Long chatRoomId = chatRoomService.saveChatRoom(1L,
+                dto.getSellerId(), dto.getProductId());
+        return ResponseEntity.ok(ChatRoomCreateResponse.builder()
+                .chatRoomId(chatRoomId)
+                .build());
+    }
+
+    @GetMapping("test/find/chat/list/{id}")
+    public Mono<ResponseEntity<List<MessageResponseDto>>> findMessagesTest(@PathVariable("id") Long id) {
+        Flux<MessageResponseDto> response = chatRoomService.findChatMessages(id);
+        return response.collectList().map(ResponseEntity::ok);
     }
 
- */
+}
 
-//    // 메시지 송신 및 수신
+    // 메시지 송신 및 수신
 //    @MessageMapping("/message")
 //    public Mono<ResponseEntity<Void>> receiveMessage(@RequestBody MessageRequestDto chat) {
 //        return chatRoomService.saveChatMessage(chat).doOnNext(message -> {

src/main/java/com/app/treen/chat_room/dto/response/ChatRoomDetailResponse.java

@@ -1,6 +1,12 @@
 package com.app.treen.chat_room.dto.response;
 
 import com.app.treen.message.document.Message;
+import com.app.treen.products.entity.TransProduct;
+import com.app.treen.products.entity.enumeration.Gender;
+import com.app.treen.products.entity.enumeration.Method;
+import com.app.treen.products.entity.enumeration.Size;
+import com.app.treen.products.entity.enumeration.UsedRank;
+import com.app.treen.transactions.entity.Transactions;
 import com.app.treen.user.entity.User;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;
@@ -17,6 +23,8 @@ public class ChatRoomDetailResponse {
     private List<MessageDto> messages;
     private MemberDto buyer;
     private MemberDto seller;
+    private TransProductDto transProduct;
+    private TransactionsDto transaction;
 
     @Data
     @Builder
@@ -52,4 +60,56 @@ public static MessageDto from(Message message) {
         }
     }
 
+    @Data
+    @Builder
+    public static class TransProductDto {
+        private Long id;
+        private String name;
+        private String usedTerm;
+        private Size size;
+        private UsedRank usedRank;
+        private Long point;
+        private Method method;
+        private String category;
+        private String imageUrls;
+
+        public static TransProductDto from(TransProduct transProduct) {
+            return TransProductDto.builder()
+                    .id(transProduct.getId())
+                    .name(transProduct.getName())
+                    .usedTerm(transProduct.getUsedTerm())
+                    .size(transProduct.getSize())
+                    .point(transProduct.getPoint())
+                    .method(transProduct.getMethod())
+                    .category(transProduct.getCategory().toString())
+                    //.imageUrls(transProduct.)
+                    .build();
+        }
+    }
+
+    @Data
+    @Builder
+    public static class TransactionsDto {
+
+        private Long id;
+        private LocalDateTime transDate;
+        private boolean isDirect;
+        private String place;
+        private String deliveryAddress;
+        private String deliveryRequest;
+        private String deliveryFeeAccount;
+
+        public static TransactionsDto from(Transactions transaction) {
+            return TransactionsDto.builder()
+                    .id(transaction.getId())
+                    .transDate(transaction.getTransDate())
+                    .isDirect(transaction.isDirect())
+                    .place(transaction.getPlace())
+                    .deliveryAddress(transaction.getDeliveryAddress())
+                    .deliveryRequest(transaction.getDeliveryRequest())
+                    .deliveryFeeAccount(transaction.getDeliveryFeeAccount())
+                    .build();
+        }
+    }
+
 }

src/main/java/com/app/treen/chat_room/entity/ChatRoom.java

@@ -18,6 +18,7 @@ public class ChatRoom extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "chat_room_id")
     private Long id;
     private String title;
     private boolean isReserved; // 거래 예약 여부