Merge branch 'dev' into release

db/src/main/java/db/domain/chat/enums/ChatRoomStatus.java

@@ -0,0 +1,17 @@
+package db.domain.chat.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ChatRoomStatus {
+
+    ACTIVE(1, "활성화 채팅방", "활성화된 채팅방입니다."),
+    INACTIVE(2, "비활성화 채팅방", "비활성화된 채팅방입니다.")
+    ;
+
+    private final int current;
+    private final String status;
+    private final String description;
+}

db/src/main/java/db/domain/chat/message/ChatMessageEntity.java

@@ -0,0 +1,39 @@
+package db.domain.chat.message;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.io.Serial;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "chat_message")
+@SuperBuilder
+public class ChatMessageEntity implements Serializable  {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    private Long id;
+
+    @Column(nullable = false)
+    private String message; // 메시지 내용
+
+    @Column(nullable = false)
+    private Long chatRoomId; // 방 ID
+
+    @Column(nullable = false)
+    private Long userId; // 발신자 ID
+
+    private String createdAt;
+
+}

db/src/main/java/db/domain/chat/message/ChatMessageRepository.java

@@ -0,0 +1,10 @@
+package db.domain.chat.message;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ChatMessageRepository extends JpaRepository<ChatMessageEntity, Long> {
+
+    List<ChatMessageEntity> findAllByChatRoomId(Long chatRoomId);
+
+}

db/src/main/java/db/domain/chat/room/ChatRoomEntity.java

@@ -0,0 +1,45 @@
+package db.domain.chat.room;
+
+import db.domain.chat.enums.ChatRoomStatus;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "chat_room")
+@SuperBuilder
+public class ChatRoomEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    private Long id;
+
+    @Column(nullable = false)
+    private Long userId; // 구매자 id
+
+    @Column(nullable = false)
+
+    private Long usedGoodsId; // 중고 판매 글 ID
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private ChatRoomStatus status;
+
+    private LocalDateTime createdAt;
+
+}

db/src/main/java/db/domain/chat/room/ChatRoomRepository.java

@@ -0,0 +1,21 @@
+package db.domain.chat.room;
+
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ChatRoomRepository extends JpaRepository<ChatRoomEntity,Long> {
+
+    Optional<ChatRoomEntity> findFirstByUsedGoodsIdAndUserId(Long usedGoodsId, Long userId);
+
+    List<ChatRoomEntity> findAll();
+
+    void deleteById(Long id);
+
+    Optional<ChatRoomEntity> findFirstById(Long id);
+
+    List<ChatRoomEntity> findByUsedGoodsIdIn(List<Long> usedGoodsId);
+
+    List<ChatRoomEntity> findByUserId(Long userid);
+
+}

db/src/main/java/db/domain/usedgoods/UsedGoodsRepository.java

@@ -1,6 +1,7 @@
 package db.domain.usedgoods;
 
 import db.domain.usedgoods.enums.UsedGoodsStatus;
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -10,4 +11,6 @@ public interface UsedGoodsRepository extends JpaRepository<UsedGoodsEntity, Long
 
     Optional<UsedGoodsEntity> findFirstById(Long usedGoodsId);
 
+    List<UsedGoodsEntity> findByUserId(Long userId);
+
 }

warehouse/build.gradle

@@ -27,6 +27,10 @@ dependencies {
 
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
 
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
+
+
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'

warehouse/src/main/java/warehouse/WarehouseApplication.java

@@ -5,13 +5,15 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import warehouse.domain.image.properties.FileStorageProperties;
 
 @OpenAPIDefinition(servers = {@Server(url = "https://baobab.run/warehouse/", description = "Baobab Dev Server API")})
 @SpringBootApplication
 @EnableConfigurationProperties({
     FileStorageProperties.class
 })
+@EnableScheduling
 public class WarehouseApplication {
 
     public static void main(String[] args) {

warehouse/src/main/java/warehouse/common/config/async/AsyncConfig.java

@@ -3,13 +3,15 @@
 import java.util.concurrent.Executor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @EnableAsync
 @Configuration
 public class AsyncConfig {
 
+    @Primary
     @Bean(name = "imageUploadExecutor")
     public Executor imageUploadExecutor() {
 

warehouse/src/main/java/warehouse/common/config/redis/RedisConfig.java

@@ -0,0 +1,52 @@
+package warehouse.common.config.redis;
+
+import db.domain.chat.message.ChatMessageEntity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.serializer.GenericToStringSerializer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@RequiredArgsConstructor
+@Configuration
+public class RedisConfig {
+
+    /**
+     * redis pub/sub 메시지를 처리하는 listener 설정
+     */
+    @Bean
+    public RedisMessageListenerContainer redisMessageListener(
+        RedisConnectionFactory connectionFactory) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        return container;
+    }
+
+    /**
+     * ChatRoom 사용할 redisTemplate 설정
+     */
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(connectionFactory);
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(String.class)); // 모든 Object를 JSON으로 직렬화
+        return redisTemplate;
+    }
+
+    /**
+     * ChatMessage 사용할 redisTemplate 설정
+     */
+    @Bean
+    public RedisTemplate<Long, ChatMessageEntity> chatMessageRedisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<Long, ChatMessageEntity> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(connectionFactory);
+        redisTemplate.setKeySerializer(new GenericToStringSerializer<>(Long.class));
+        redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(ChatMessageEntity.class));
+        return redisTemplate;
+    }
+}

warehouse/src/main/java/warehouse/common/config/security/SecurityConfig.java

@@ -33,7 +33,7 @@ public class SecurityConfig {
     private final TokenService tokenService;
 
     private final List<String> WHITE_LIST = List.of("/swagger-ui.html", "/swagger-ui/**",
-        "/v3/api-docs/**", "/open-api/**");
+        "/v3/api-docs/**", "/open-api/**", "/chatting/**");
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {

warehouse/src/main/java/warehouse/common/config/websocket/WebSocketConfig.java

@@ -0,0 +1,27 @@
+package warehouse.common.config.websocket;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@RequiredArgsConstructor
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        registry.enableSimpleBroker("/sub");
+        registry.setApplicationDestinationPrefixes("/pub");
+    }
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/chatting").setAllowedOrigins("*");
+            //.withSockJS();
+    }
+}

warehouse/src/main/java/warehouse/common/error/ChatErrorCode.java

@@ -0,0 +1,24 @@
+package warehouse.common.error;
+
+import global.errorcode.ErrorCodeIfs;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum ChatErrorCode implements ErrorCodeIfs {
+
+    CHAT_ROOM_NOT_FOUND(HttpStatus.NOT_FOUND.value(), 1700, "채팅방이 존재하지 않습니다."),
+    CHAT_MESSAGE_NOT_FOUND(HttpStatus.NOT_FOUND.value(), 1701, "채팅 메시지가 존재하지 않습니다."),
+    CHAT_ROOM_EXISTS(HttpStatus.BAD_REQUEST.value(), 1702, "이미 존재하는 채팅방 입니다."),
+    SELLER_AND_BUYER_SAME(HttpStatus.BAD_REQUEST.value(), 1703, "판매자는 자신의 상품에 대해 채팅방을 생성할 수 없습니다."),
+    CHAT_ROOM_INACTIVE(HttpStatus.BAD_REQUEST.value(), 1704, "채팅방이 비활성화 되어 채팅 전송이 불가능합니다."),
+    CHAT_ROOM_ACCESS_DENIED(HttpStatus.BAD_REQUEST.value(), 1705, "채팅방 접근 권한이 존재하지 않습니다.")
+    ;
+
+    private final Integer httpCode;
+    private final Integer errorCode;
+    private final String description;
+
+}