Merge branch 'develop' into feat/request/2

Author: HYEONSIKOH

src/main/java/org/dfbf/soundlink/domain/chat/controller/ChatController.java

@@ -28,4 +28,16 @@ public ResponseResult requestChat(@AuthenticationPrincipal Long id, @RequestBody
     public ResponseResult cancelChatRequest(@AuthenticationPrincipal Long id, @RequestBody Long emotionRecordId) {
         return chatRoomService.deleteRequestFromRedis(id, emotionRecordId);
     }
+
+    @PostMapping("/create")
+    @Operation(summary = "채팅요청 시 채팅방 생성", description = "requestId, responseId 값 확인")
+    public ResponseResult create(@AuthenticationPrincipal Long userId, @RequestParam Long recordId) {
+        return chatRoomService.createChatRoom(userId, recordId);
+    }
+
+    @PostMapping("/close")
+    @Operation(summary = "채팅방 닫기" , description="닫을 시 상태값 'close'변경, 레디스에서 삭제")
+    public ResponseResult close(@AuthenticationPrincipal Long userId, Long chatRoomId) {
+        return chatRoomService.closeChatRoom(userId, chatRoomId);
+    }
 }

src/main/java/org/dfbf/soundlink/domain/chat/dto/ChatReqDto.java

@@ -0,0 +1,7 @@
+package org.dfbf.soundlink.domain.chat.dto;
+
+
+public record ChatReqDto (
+        Long requestId,
+        Long responseId
+){}

src/main/java/org/dfbf/soundlink/domain/chat/entity/ChatRoom.java

@@ -0,0 +1,69 @@
+package org.dfbf.soundlink.domain.chat.entity;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
+import org.dfbf.soundlink.domain.user.entity.User;
+import org.dfbf.soundlink.global.comm.enums.RoomStatus;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import java.sql.Timestamp;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ChatRoom {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "chat_room_id")
+    private Long chatRoomId;
+
+    @Column(name = "start_time")
+    private Timestamp startTime;
+
+    @Column(name = "end_time")
+    private Timestamp endTime;
+
+    @ManyToOne
+    @JoinColumn (name = "request_user_id")
+    private User requestUserId;
+
+    @ManyToOne
+    @JoinColumn(name = "record_id")
+    private EmotionRecord recordId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status")
+    private RoomStatus status;
+
+    @CreationTimestamp
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @UpdateTimestamp
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
+
+    @Builder
+    public ChatRoom(User requestUserId, EmotionRecord recordId, RoomStatus status,
+                    Timestamp startTime, Timestamp endTime) {
+        this.requestUserId = requestUserId;
+        this.recordId = recordId;
+        this.status = status;
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    //채팅방 상태 업데이트
+    public void updateChatRoomStatus(RoomStatus status){
+        this.status = status;
+        if(status == RoomStatus.CLOSED){
+            this.endTime = new Timestamp(System.currentTimeMillis());
+        }
+    }
+
+}

src/main/java/org/dfbf/soundlink/domain/chat/exception/ChatRoomNotFoundException.java

@@ -0,0 +1,8 @@
+package org.dfbf.soundlink.domain.chat.exception;
+
+import org.dfbf.soundlink.global.exception.BusinessException;
+import org.dfbf.soundlink.global.exception.ErrorCode;
+
+public class ChatRoomNotFoundException extends BusinessException {
+    public ChatRoomNotFoundException() {super(ErrorCode.CHATROOM_NOT_FOUND); }
+}

src/main/java/org/dfbf/soundlink/domain/chat/exception/UnauthorizedAccessException.java

@@ -0,0 +1,10 @@
+package org.dfbf.soundlink.domain.chat.exception;
+
+import org.dfbf.soundlink.global.exception.BusinessException;
+import org.dfbf.soundlink.global.exception.ErrorCode;
+
+public class UnauthorizedAccessException extends BusinessException {
+    public UnauthorizedAccessException() {
+        super(ErrorCode.CHAT_UNAUTHORIZED);
+    }
+}

src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomRepository.java

@@ -0,0 +1,10 @@
+package org.dfbf.soundlink.domain.chat.repository;
+
+import org.dfbf.soundlink.domain.chat.entity.ChatRoom;
+import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
+import org.dfbf.soundlink.domain.user.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
+    boolean existsByRequestUserIdAndRecordId(User requestUserId, EmotionRecord recordId);
+}

src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java

@@ -2,20 +2,37 @@
 
 import lombok.RequiredArgsConstructor;
 import org.dfbf.soundlink.domain.chat.entity.redis.ChatRequest;
+import org.dfbf.soundlink.domain.chat.dto.ChatReqDto;
+import org.dfbf.soundlink.domain.chat.entity.ChatRoom;
+import org.dfbf.soundlink.domain.chat.exception.ChatRoomNotFoundException;
+import org.dfbf.soundlink.domain.chat.exception.UnauthorizedAccessException;
+import org.dfbf.soundlink.domain.chat.repository.ChatRoomRepository;
+import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
 import org.dfbf.soundlink.domain.emotionRecord.exception.EmotionRecordNotFoundException;
+import org.dfbf.soundlink.domain.emotionRecord.exception.UserNotFoundException;
 import org.dfbf.soundlink.domain.emotionRecord.repository.EmotionRecordRepository;
+import org.dfbf.soundlink.domain.user.entity.User;
+import org.dfbf.soundlink.domain.user.repository.UserRepository;
+import org.dfbf.soundlink.global.comm.enums.RoomStatus;
 import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Duration;
+import java.sql.Timestamp;
 
 @Service
 @RequiredArgsConstructor
 public class ChatRoomService {
+
     private final RedisTemplate<String, Object> redisTemplate;
     private final EmotionRecordRepository emotionRecordRepository;
+    private final ChatRoomRepository chatRoomRepository;
+    private final UserRepository userRepository;
 
     private static final String CHAT_REQUEST_KEY = "chatRequest";
 
@@ -73,7 +90,68 @@ public ResponseResult deleteRequestFromRedis(Long requestUserId, Long emotionRec
             return new ResponseResult(ErrorCode.FAIL_TO_FIND_EMOTION_RECORD);
         } catch (Exception e) {
             return new ResponseResult(400, "Chat request failed.");
+    }
+
+    @Transactional
+    public ResponseResult createChatRoom(@AuthenticationPrincipal Long userId, Long recordId){
+        try {
+            // 요청 보내는사람
+            User requestUserId = userRepository.findById(userId)
+                    .orElseThrow(UserNotFoundException::new);
+
+            // 감정기록 조회
+            EmotionRecord emotionRecord = emotionRecordRepository.findById(recordId)
+                    .orElseThrow(EmotionRecordNotFoundException::new);
+
+            // 이미 존재하는 채팅방인지 확인
+            if(chatRoomRepository.existsByRequestUserIdAndRecordId(requestUserId,emotionRecord)){
+                return new ResponseResult(ErrorCode.CHAT_FAILED, "이미 존재하는 채팅방입니다.");
+            }
+
+            Long responseUserId = emotionRecord.getUser().getUserId();
+
+            ChatRoom chatRoom = ChatRoom.builder()
+                    .requestUserId(requestUserId)
+                    .recordId(emotionRecord)
+                    .status(RoomStatus.WAITING) //상태 : 대기
+                    .startTime(new Timestamp(System.currentTimeMillis()))
+                    .endTime(null)
+                    .build();
+
+            // DB에 저장
+            chatRoomRepository.save(chatRoom);
+
+            ChatReqDto chatReqDto = new ChatReqDto(userId, responseUserId);
+            
+            // 레디스에 저장
+            redisTemplate.opsForValue().set("Room::"+chatRoom.getChatRoomId(), String.valueOf(chatReqDto));
+
+            return new ResponseResult(ErrorCode.SUCCESS, chatRoom);
+        } catch (Exception e) {
+            return new ResponseResult(ErrorCode.INTERNAL_SERVER_ERROR, e.getMessage());
         }
     }
 
+    // 채팅방 닫기
+    @Transactional
+    public ResponseResult closeChatRoom(@AuthenticationPrincipal Long userId, Long chatRoomId) {
+        try {
+            ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
+                    .orElseThrow(ChatRoomNotFoundException::new);
+
+            // 요청자 또는 응답자가 아니면 예외 처리
+            if(!chatRoom.getRequestUserId().getUserId().equals(userId) &&
+                    !chatRoom.getRecordId().getUser().getUserId().equals(userId)) {
+                throw new UnauthorizedAccessException(); // 권한이 없을 경우 예외 발생
+            }
+
+            chatRoom.updateChatRoomStatus(RoomStatus.CLOSED); // 삳태 '닫기'로 변경
+            chatRoomRepository.save(chatRoom); // DB에 저장
+
+            redisTemplate.delete("Room::"+chatRoomId); // 레디스에서 삭제
+            return new ResponseResult(ErrorCode.SUCCESS);
+        } catch (Exception e) {
+            return new ResponseResult(ErrorCode.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
 }

src/main/java/org/dfbf/soundlink/global/exception/ErrorCode.java

@@ -56,7 +56,13 @@ public enum ErrorCode {
     KAKAOPAY_READY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "카카오페이 결제 준비 에러"),
     KAKAOPAY_APPROVE_REDIS_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "TID가 REDIS 안에 없습니다."),
     KAKAOPAY_APPROVE_FEIGN_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "카카오페이 승인 API 통신 실패"),
-    KAKAOPAY_APPROVE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "카카오페이 결제 승인 에러");
+    KAKAOPAY_APPROVE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "카카오페이 결제 승인 에러"),
+
+    //채팅방 관련 에러
+    CHAT_UNAUTHORIZED(HttpStatus.FORBIDDEN,"권한이 없습니다"),
+    CHATROOM_NOT_FOUND(HttpStatus.NOT_FOUND,"채팅방을 찾을 수 없습니다."),
+    CHAT_FAILED(HttpStatus.INTERNAL_SERVER_ERROR,"서버 내부 에러. 중복된 레코드가 존재합니다.");
+
 
     private final HttpStatus status;
     private final String message;