[MERGE] [BVFH-170] main 브렌치에 병합

.github/workflows/CI.yaml

@@ -0,0 +1,49 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - BVFH-170-develop
+
+
+env:
+  AWS_REGION: ap-northeast-2
+  ECR_REPOSITORY: cabbage/chat-service
+  SERVICE_NAME: chat-service
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build Docker image
+        run: |
+          ./gradlew bootJar
+          docker build -t ${{ env.ECR_REPOSITORY }}:latest -f Dockerfile .
+
+      - name: Tag & Push to ECR
+        run: |
+          REPO_URI=$(aws ecr describe-repositories --repository-names ${{ env.ECR_REPOSITORY }} --region ${{ env.AWS_REGION }} --query "repositories[0].repositoryUri" --output text)
+          docker tag ${{ env.ECR_REPOSITORY }}:latest $REPO_URI:latest
+          docker push $REPO_URI:latest
+
+      - name: Get image digest
+        id: digest
+        run: |
+          IMAGE_DIGEST=$(aws ecr describe-images --repository-name ${{ env.ECR_REPOSITORY }} --image-ids imageTag=latest --query 'imageDetails[0].imageDigest' --output text)
+          echo "Image digest: $IMAGE_DIGEST"
+          echo "digest=$IMAGE_DIGEST" >> $GITHUB_OUTPUT

.gitignore

@@ -18,6 +18,7 @@ bin/
 !**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
+ChatMessageKafkaSendTestController.java
 .idea
 *.iws
 *.iml
@@ -27,7 +28,6 @@ out/
 !**/src/test/**/out/
 
 ### Spring ###
-application*.yml
 .env
 logs/
 tmp/

Dockerfile

@@ -0,0 +1,6 @@
+FROM eclipse-temurin:17-jdk-alpine
+WORKDIR /app
+COPY build/libs/chatservice-0.0.1-SNAPSHOT.jar app.jar
+
+# :흰색_확인_표시: ENTRYPOINT로 java만 실행
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.5.0'
+    id 'org.springframework.boot' version '3.4.1'
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
@@ -24,10 +24,25 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    //jpa
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    //mongoDB
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    //websocket
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
+    //kafka
+    implementation 'org.springframework.kafka:spring-kafka'
+    //swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
+    //feign client
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+    // S3
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.281'
+    //actuator
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
@@ -38,3 +53,9 @@ dependencies {
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2024.0.1"
+    }
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/mapper/ChatMessageQueryVoMapper.java

@@ -0,0 +1,57 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.mapper;
+
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.ReplyPreviewVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in.GetMessagesRequestVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in.GetReadCheckPointRequestVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.out.GetMessagesResponseVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.out.GetReadCheckPointResponseVo;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.in.GetMessagesRequestDto;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.in.GetReadCheckPointRequestDto;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.out.GetMessagesResponseDto;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.out.GetReadCheckPointResponseDto;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ChatMessageQueryVoMapper {
+
+    public GetMessagesRequestDto toGetMessagesRequestDto(GetMessagesRequestVo getMessagesRequestVo, String memberUuid) {
+        return GetMessagesRequestDto.builder()
+                .chatRoomUuid(getMessagesRequestVo.getChatRoomUuid())
+                .memberUuid(memberUuid)
+                .lastMessageId(getMessagesRequestVo.getLastMessageId())
+                .limit(getMessagesRequestVo.getLimit() != null ? getMessagesRequestVo.getLimit() : 20)
+                .build();
+    }
+
+    public GetMessagesResponseVo toGetMessagesResponseVo(GetMessagesResponseDto getMessagesResponseDto) {
+        return GetMessagesResponseVo.builder()
+                .messageUuid(getMessagesResponseDto.getMessageUuid())
+                .chatRoomUuid(getMessagesResponseDto.getChatRoomUuid())
+                .senderUuid(getMessagesResponseDto.getSenderUuid())
+                .message(getMessagesResponseDto.getMessage())
+                .messageType(getMessagesResponseDto.getMessageType())
+                .sentAt(getMessagesResponseDto.getSentAt().toString())
+                .replyToMessageUuid(getMessagesResponseDto.getReplyToMessageUuid())
+                .replyPreview(getMessagesResponseDto.getReplyPreview() != null ?
+                        ReplyPreviewVo.builder()
+                                .senderUuid(getMessagesResponseDto.getReplyPreview().getSenderUuid())
+                                .message(getMessagesResponseDto.getReplyPreview().getMessage())
+                                .messageType(getMessagesResponseDto.getReplyPreview().getMessageType())
+                                .build()
+                        : null)
+                .build();
+    }
+
+    public GetReadCheckPointRequestDto toGetReadCheckPointRequestDto(GetReadCheckPointRequestVo getReadCheckPointRequestVo) {
+        return GetReadCheckPointRequestDto.builder()
+                .chatRoomUuid(getReadCheckPointRequestVo.getChatRoomUuid())
+                .memberUuid(getReadCheckPointRequestVo.getMemberUuid())
+                .build();
+    }
+
+    public GetReadCheckPointResponseVo toGetReadCheckPointResponseVo(GetReadCheckPointResponseDto getReadCheckPointResponseDto) {
+        return GetReadCheckPointResponseVo.builder()
+                .lastReadMessageSentAt(getReadCheckPointResponseDto.getLastReadMessageSentAt().toString())
+                .build();
+    }
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/mapper/ChatMessageVoMapper.java

@@ -0,0 +1,33 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.mapper;
+
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in.ReadMessageRequestVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in.SendMessageRequestVo;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.in.ReadMessageRequestDto;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.in.SendMessageRequestDto;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+@Component
+public class ChatMessageVoMapper {
+
+    public SendMessageRequestDto toSendMessageRequestDto(SendMessageRequestVo sendMessageRequestVo) {
+        return SendMessageRequestDto.builder()
+                .chatRoomUuid(sendMessageRequestVo.getChatRoomUuid())
+                .senderUuid(sendMessageRequestVo.getSenderUuid())
+                .message(sendMessageRequestVo.getMessage())
+                .messageType(sendMessageRequestVo.getMessageType())
+                .sentAt(LocalDateTime.now(ZoneId.of("Asia/Seoul")))
+                .replyToMessageUuid(sendMessageRequestVo.getReplyToMessageUuid())
+                .build();
+    }
+
+    public ReadMessageRequestDto toReadMessageRequestDto(ReadMessageRequestVo readMessageRequestVo) {
+        return ReadMessageRequestDto.builder()
+                .chatRoomUuid(readMessageRequestVo.getChatRoomUuid())
+                .memberUuid(readMessageRequestVo.getMemberUuid())
+                .lastReadMessageSentAt(readMessageRequestVo.getLastReadMessageSentAt())
+                .build();
+    }
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/mapper/PreSignedUrlVoMapper.java

@@ -0,0 +1,25 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.mapper;
+
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in.PreSignedUrlRequestVo;
+import com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.out.PreSignedUrlResponseVo;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.in.PreSignedUrlRequestDto;
+import com.chalnakchalnak.chatservice.chatmessage.application.dto.out.PreSignedUrlResponseDto;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PreSignedUrlVoMapper {
+
+    public PreSignedUrlRequestDto toPreSignedUrlRequestDto(PreSignedUrlRequestVo preSignedUrlRequestVo, String memberUuid) {
+        return PreSignedUrlRequestDto.builder()
+                .memberUuid(memberUuid)
+                .contentType(preSignedUrlRequestVo.getContentType())
+                .build();
+    }
+
+    public PreSignedUrlResponseVo toPreSignedUrlResponseVo(PreSignedUrlResponseDto preSignedUrlResponseDto) {
+        return PreSignedUrlResponseVo.builder()
+                .url(preSignedUrlResponseDto.getUrl())
+                .fields(preSignedUrlResponseDto.getFields())
+                .build();
+    }
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/ReplyPreviewVo.java

@@ -0,0 +1,20 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ReplyPreviewVo {
+    private String senderUuid;
+    private String message;
+    private String messageType;
+
+    @Builder
+    public ReplyPreviewVo(String senderUuid, String message, String messageType) {
+        this.senderUuid = senderUuid;
+        this.message = message;
+        this.messageType = messageType;
+    }
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/in/GetMessagesRequestVo.java

@@ -0,0 +1,18 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class GetMessagesRequestVo {
+
+    @NotBlank(message = "채팅방 UUID는 필수입니다.")
+    private String chatRoomUuid;
+
+    private String lastMessageId;
+
+    private Integer limit;
+
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/in/GetReadCheckPointRequestVo.java

@@ -0,0 +1,16 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class GetReadCheckPointRequestVo {
+
+    @NotBlank(message = "chatRoomUuid는 필수 값입니다.")
+    private String chatRoomUuid;
+
+    @NotBlank(message = "memberUuid는 필수 값입니다.")
+    private String memberUuid;
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/in/PreSignedUrlRequestVo.java

@@ -0,0 +1,19 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class PreSignedUrlRequestVo {
+
+    @NotBlank(message = "파일 형식은 필수입니다.")
+    @Pattern(
+            regexp = "image/(png|jpeg|webp|bmp)",
+            message = "지원하지 않는 이미지 형식입니다."
+    )
+    private String contentType;
+}
+

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/in/ReadMessageRequestVo.java

@@ -0,0 +1,19 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+public class ReadMessageRequestVo {
+
+    @NotBlank(message = "chatRoomUuid 는 필수 값입니다.")
+    private String chatRoomUuid;
+
+    @NotBlank(message = "memberUuid 는 필수 값입니다.")
+    private String memberUuid;
+
+    private LocalDateTime lastReadMessageSentAt;
+
+}

src/main/java/com/chalnakchalnak/chatservice/chatmessage/adpater/in/vo/in/SendMessageRequestVo.java

@@ -0,0 +1,37 @@
+package com.chalnakchalnak.chatservice.chatmessage.adpater.in.vo.in;
+
+import com.chalnakchalnak.chatservice.chatmessage.domain.MessageType;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+
+@Getter
+public class SendMessageRequestVo {
+
+    @NotBlank(message = "ChatRoomUuid는 필수 입력값입니다.")
+    private String chatRoomUuid;
+
+    @NotBlank(message = "SenderUuid는 필수 입력값입니다.")
+    private String senderUuid;
+
+    @NotBlank(message = "Message는 필수 입력값입니다.")
+    @Size(max = 5000, message = "메시지는 최대 5000자까지 입력 가능합니다.")
+    private String message;
+
+    @NotNull(message = "MessageType은 필수 입력값입니다.")
+    private MessageType messageType;
+
+    private String replyToMessageUuid;
+
+    @AssertTrue(message = "REPLY 타입일 경우 replyToMessageId는 필수입니다.")
+    private boolean isValidReplyCondition() {
+        if (messageType == null) return true;
+        if (messageType == MessageType.REPLY) {
+            return replyToMessageUuid != null && !replyToMessageUuid.isBlank();
+        } else {
+            return replyToMessageUuid == null || replyToMessageUuid.isBlank();
+        }
+    }
+}