✨ [feature] #25 - 회원 쪽지 보내기 API 구현

.github/pull_request_template.md

@@ -1,17 +1,14 @@
-## PR 타입(하나 이상의 PR 타입을 선택해주세요)
+### PR 타입(하나 이상의 PR 타입을 선택해주세요)
 - [ ] 기능 추가
 - [ ] 기능 삭제
 - [ ] 버그 수정
 - [ ] 의존성, 환경 변수, 빌드 관련 코드 업데이트
 
-## 반영 브랜치
+### 반영 브랜치
 ex) feat/login -> develop
 
-## 변경 사항
+### 변경 사항
 ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다.
 
-## 이슈
-- 
-
-## 테스트 결과
+### 테스트 결과
 ex) 베이스 브랜치에 포함되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린샷, GIF, 혹은 라이브 데모가 가능하도록 샘플API를 첨부할 수도 있습니다.

build.gradle

@@ -34,8 +34,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' //Swagger 의존성 추가
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' // AWS 서비스 의존성 추가
-	implementation 'org.springframework.boot:spring-boot-starter-validation' // validation
-
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
 	annotationProcessor 'org.projectlombok:lombok'

src/main/java/gaji/service/ServiceApplication.java

@@ -9,7 +9,7 @@
 import java.util.TimeZone;
 
 @EnableJpaAuditing
-@SpringBootApplication
+@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
 public class ServiceApplication {
 
 	public static void main(String[] args) {

src/main/java/gaji/service/config/AmazonConfig.java

@@ -28,19 +28,19 @@ public class AmazonConfig {
     @Value("${cloud.aws.region.static}")
     private String region;
 
-    @Value("${cloud.aws.s3.bucket}")
+    @Value("${cloud.aws.s3.bucket")
     private String bucket;
 
-    @Value("${cloud.aws.s3.path.blog}")
+    @Value("${cloud.aws.s3.path.blog")
     private String blogPath;
 
-    @Value("${cloud.aws.s3.path.project}")
+    @Value("${cloud.aws.s3.path.project")
     private String projectPath;
 
-    @Value("${cloud.aws.s3.path.question}")
+    @Value("${cloud.aws.s3.path.question")
     private String questionPath;
 
-    @Value("${cloud.aws.s3.path.study}")
+    @Value("${cloud.aws.s3.path.study")
     private String studyPath;
 
     @PostConstruct

src/main/java/gaji/service/domain/Report.java

@@ -2,6 +2,7 @@
 
 import gaji.service.domain.enums.ReportPostEnum;
 import gaji.service.domain.enums.ReportPostTypeEnum;
+import gaji.service.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/gaji/service/domain/alram/Alarm.java

@@ -1,6 +1,6 @@
 package gaji.service.domain.alram;
 
-import gaji.service.domain.User;
+import gaji.service.domain.user.entity.User;
 import gaji.service.domain.enums.IsConfirmed;
 import jakarta.persistence.*;
 import lombok.AccessLevel;

src/main/java/gaji/service/domain/alram/UserAlarm.java

@@ -1,6 +1,5 @@
 package gaji.service.domain.alram;
 
-import gaji.service.domain.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/gaji/service/domain/common/entity/BaseEntity.java → src/main/java/gaji/service/domain/common/BaseEntity.java

@@ -1,12 +1,12 @@
-package gaji.service.domain.common.entity;
+package gaji.service.domain.common;
 
 import jakarta.persistence.Column;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 
 import java.time.LocalDateTime;
 
-public abstract class BaseEntity {
+public class BaseEntity {
     @CreatedDate
     @Column(updatable = false)
     private LocalDateTime createdAt;

src/main/java/gaji/service/domain/enums/PostStatusEnum.java

@@ -1,35 +1,5 @@
 package gaji.service.domain.enums;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-@Getter
-@Slf4j
 public enum PostStatusEnum {
-    RECRUITING("모집중"),
-    RECRUITMENT_COMPLETED("모집완료"),
-    NEED_RESOLUTION("해결필요"),
-    RESOLVED("해결완료"),
-    DELETED("삭제됨"),
-    POSTING("게시중");
-
-    @JsonValue
-    private final String value;
-
-    PostStatusEnum(String value) {
-        this.value = value;
-    }
-
-    @JsonCreator // Json -> Object, 역직렬화 수행하는 메서드
-    public static PostStatusEnum from(String param) {
-        for (PostStatusEnum postStatusEnum : PostStatusEnum.values()) {
-            if (postStatusEnum.getValue().equals(param)) {
-                return postStatusEnum;
-            }
-        }
-        log.error("PostStatusEnum.from() exception occur param: {}", param);
-        return null;
-    }
+    RECRUITING, RECRUITMENT_COMPLETED, NEED_RESOLUTION, RESOLVED, DELETED
 }

src/main/java/gaji/service/domain/enums/PostTypeEnum.java

@@ -1,33 +1,6 @@
 package gaji.service.domain.enums;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-@Getter
-@Slf4j
 public enum PostTypeEnum {
-    BLOG("블로그"),
-    PROJECT_RECRUITMENT("프로젝트 모집"),
-    QUESTION("질문");
-
-    @JsonValue
-    private final String value;
-
-    PostTypeEnum(String value) {
-        this.value = value;
-    }
-
-    @JsonCreator // Json -> Object, 역직렬화 수행하는 메서드
-    public static PostTypeEnum from(String param) {
-        for (PostTypeEnum postTypeEnum : PostTypeEnum.values()) {
-            if (postTypeEnum.getValue().equals(param)) {
-                return postTypeEnum;
-            }
-        }
-        log.error("PostTypeEnum.from() exception occur param: {}", param);
-        return null;
-    }
+    BLOG, PROJECT_RECRUITMENT, RECRUITMENT
 
 }

src/main/java/gaji/service/domain/message/converter/MessageBodyConverter.java

@@ -0,0 +1,12 @@
+package gaji.service.domain.message.converter;
+
+import gaji.service.domain.message.entity.MessageBody;
+import gaji.service.domain.message.web.dto.MessageRequestDTO;
+
+public class MessageBodyConverter {
+    public static MessageBody toMessageBody(MessageRequestDTO.CreateMessageDTO messageRequestDTO){
+        return MessageBody.builder()
+                .body(messageRequestDTO.getBody())
+                .build();
+    }
+}

src/main/java/gaji/service/domain/message/converter/MessageConverter.java

@@ -0,0 +1,41 @@
+package gaji.service.domain.message.converter;
+
+import gaji.service.domain.message.entity.Message;
+import gaji.service.domain.message.enums.MessageTypeEnum;
+import gaji.service.domain.message.web.dto.MessageRequestDTO;
+import gaji.service.domain.message.web.dto.MessageResponseDTO;
+import gaji.service.domain.user.entity.User;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class MessageConverter {
+    public static MessageResponseDTO.CreateResultDTO toCreateResultDTO(List<Message> messageList){
+        List<Long> messageIds = messageList.stream()
+                .map(Message::getId)
+                .collect(Collectors.toList());
+
+        return MessageResponseDTO.CreateResultDTO.builder()
+                .messageIds(messageIds)
+                .build();
+    }
+
+    public static Message toSendMessage(User mine, User other){
+        return Message.builder()
+                .mine(mine)
+                .other(other)
+                .type(MessageTypeEnum.Send)
+                .sendDate(LocalDateTime.now())
+                .build();
+    }
+
+    public static Message toReceiveMessage(User mine, User other){
+        return Message.builder()
+                .mine(other)
+                .other(mine)
+                .type(MessageTypeEnum.Receive)
+                .sendDate(LocalDateTime.now()).
+                build();
+    }
+}

src/main/java/gaji/service/domain/message/Message.java → src/main/java/gaji/service/domain/message/entity/Message.java

@@ -1,8 +1,10 @@
-package gaji.service.domain.message;
+package gaji.service.domain.message.entity;
 
-import gaji.service.domain.User;
+import gaji.service.domain.message.enums.MessageTypeEnum;
+import gaji.service.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -21,20 +23,31 @@ public class Message {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "my_id", referencedColumnName = "user_id")
-    private User sender;
+    private User self;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "other_id", referencedColumnName = "user_id")
-    private User receiver;
+    private User other;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "message_body_id")
     private MessageBody messageBody;
 
-    private Boolean type;
+    private MessageTypeEnum type;
     private LocalDateTime readDate;
     private LocalDateTime sendDate;
 
-
+    @Builder
+    public Message(User mine, User other, MessageTypeEnum type, LocalDateTime sendDate) {
+        this.self = mine;
+        this.other = other;
+        this.type = type;
+        this.sendDate = sendDate;
+    }
+
+    public void setMessageBody(MessageBody messageBody) {
+        this.messageBody = messageBody;
+        messageBody.getMessageList().add(this);
+    }
 
 }

src/main/java/gaji/service/domain/message/MessageBody.java → src/main/java/gaji/service/domain/message/entity/MessageBody.java

@@ -1,7 +1,9 @@
-package gaji.service.domain.message;
+package gaji.service.domain.message.entity;
 
+import gaji.service.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -21,4 +23,8 @@ public class MessageBody {
 
     private String body;
 
+    @Builder
+    public MessageBody(String body) {
+        this.body = body;
+    }
 }

src/main/java/gaji/service/domain/message/enums/MessageTypeEnum.java

@@ -0,0 +1,5 @@
+package gaji.service.domain.message.enums;
+
+public enum MessageTypeEnum {
+    Send, Receive
+}

src/main/java/gaji/service/domain/message/repository/MessageBodyRepository.java

@@ -0,0 +1,7 @@
+package gaji.service.domain.message.repository;
+
+import gaji.service.domain.message.entity.MessageBody;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MessageBodyRepository extends JpaRepository<MessageBody, Long> {
+}