배포 버전 0.3.1

.github/workflows/cd.yml

@@ -9,8 +9,11 @@ jobs:
   test_and_deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: 현재 작업중인 Repository 가져온다.
+      - name: 현재 작업중인 Repository를 서브 모듈과 함께 가져온다.
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.ACTION_TOKEN }}
 
       - name: CD 프로세스를 최적화 하기 위해 Gradle 정보를 캐싱한다.
         uses: actions/cache@v3

.gitignore

@@ -4,7 +4,6 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-.env
 
 ### STS ###
 .apt_generated
@@ -36,3 +35,7 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### Secret ###
+firebase-service-key.json
+.env

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/main/resources/secret"]
+	path = src/main/resources/secret
+	url = https://github.com/coffee-meet/secret.git

build.gradle

@@ -71,7 +71,8 @@ dependencies {
     swaggerUI 'org.webjars:swagger-ui:4.11.1'
 
     /* Cloud */
-    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.581'
+    implementation 'com.google.firebase:firebase-admin:9.1.1'
 
     /* WebSocket */
     implementation 'org.springframework.boot:spring-boot-starter-websocket'

src/main/java/coffeemeet/server/certification/exception/CertificationErrorCode.java

@@ -17,12 +17,12 @@ public enum CertificationErrorCode implements ErrorCode {
 
   @Override
   public String code() {
-    return null;
+    return errorCode;
   }
 
   @Override
   public String message() {
-    return null;
+    return message;
   }
 
 }

src/main/java/coffeemeet/server/chatting/current/presentation/ChattingMessageController.java

@@ -1,10 +1,9 @@
 package coffeemeet.server.chatting.current.presentation;
 
 import coffeemeet.server.chatting.current.presentation.dto.ChatStomp;
-import coffeemeet.server.chatting.current.presentation.dto.ChatStomp.Response;
 import coffeemeet.server.chatting.current.service.ChattingMessageService;
+import coffeemeet.server.chatting.current.service.dto.ChattingDto;
 import jakarta.validation.Valid;
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
@@ -42,10 +41,10 @@ public void onDisconnect(SessionDisconnectEvent event) {
   @MessageMapping("/chatting/messages")
   public void message(@Valid ChatStomp.Request request, SimpMessageHeaderAccessor accessor) {
     Long userId = sessions.get(accessor.getSessionId());
-    chattingMessageService.createChattingMessage(request.roomId(), request.content(), userId);
-    log.info("채팅 = {}", request.content());
+    ChattingDto.Response response = chattingMessageService.chatting(request.roomId(),
+        request.content(), userId);
     simpMessageSendingOperations.convertAndSend("/sub/chatting/rooms/" + request.roomId(),
-        new Response("유명한", request.content(), LocalDateTime.now()));
+        ChatStomp.Response.from(response));
   }
 
 }

src/main/java/coffeemeet/server/chatting/current/presentation/dto/ChatStomp.java

@@ -1,5 +1,6 @@
 package coffeemeet.server.chatting.current.presentation.dto;
 
+import coffeemeet.server.chatting.current.service.dto.ChattingDto;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
@@ -21,6 +22,14 @@ record Response(
       LocalDateTime createdAt
   ) implements ChatStomp {
 
+    public static ChatStomp.Response from(ChattingDto.Response response) {
+      return new ChatStomp.Response(
+          response.nickname(),
+          response.content(),
+          response.createdAt()
+      );
+    }
+
   }
 
 }

src/main/java/coffeemeet/server/chatting/current/service/ChattingMessageService.java

@@ -1,8 +1,10 @@
 package coffeemeet.server.chatting.current.service;
 
+import coffeemeet.server.chatting.current.domain.ChattingMessage;
 import coffeemeet.server.chatting.current.domain.ChattingRoom;
 import coffeemeet.server.chatting.current.implement.ChattingMessageCommand;
 import coffeemeet.server.chatting.current.implement.ChattingRoomQuery;
+import coffeemeet.server.chatting.current.service.dto.ChattingDto;
 import coffeemeet.server.user.domain.User;
 import coffeemeet.server.user.implement.UserQuery;
 import lombok.RequiredArgsConstructor;
@@ -16,10 +18,12 @@ public class ChattingMessageService {
   private final ChattingRoomQuery chattingRoomQuery;
   private final UserQuery userQuery;
 
-  public void createChattingMessage(Long roomId, String content, Long userId) {
+  public ChattingDto.Response chatting(Long roomId, String content, Long userId) {
     User user = userQuery.getUserById(userId);
     ChattingRoom chattingRoom = chattingRoomQuery.getChattingRoomById(roomId);
-    chattingMessageCommand.saveChattingMessage(content, chattingRoom, user);
+    ChattingMessage chattingMessage = chattingMessageCommand.saveChattingMessage(content,
+        chattingRoom, user);
+    return ChattingDto.Response.of(user, chattingMessage);
   }
 
 }

src/main/java/coffeemeet/server/chatting/current/service/dto/ChattingDto.java

@@ -0,0 +1,25 @@
+package coffeemeet.server.chatting.current.service.dto;
+
+import coffeemeet.server.chatting.current.domain.ChattingMessage;
+import coffeemeet.server.user.domain.User;
+import java.time.LocalDateTime;
+
+public sealed interface ChattingDto permits ChattingDto.Response {
+
+  record Response(
+      String nickname,
+      String content,
+      LocalDateTime createdAt
+  ) implements ChattingDto {
+
+    public static Response of(User user, ChattingMessage chattingMessage) {
+      return new Response(
+          user.getProfile().getNickname(),
+          chattingMessage.getMessage(),
+          chattingMessage.getCreatedAt()
+      );
+    }
+
+  }
+
+}

src/main/java/coffeemeet/server/common/config/AWSConfig.java

@@ -1,5 +1,6 @@
 package coffeemeet.server.common.config;
 
+import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.services.s3.AmazonS3;
@@ -25,12 +26,16 @@ public AWSConfig(
   }
 
   @Bean
-  public AmazonS3 amazonS3Client() {
-    BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+  public AWSCredentials awsCredentials() {
+    return new BasicAWSCredentials(accessKey, secretKey);
+  }
+
+  @Bean
+  public AmazonS3 amazonS3Client(AWSCredentials awsCredentials) {
     return AmazonS3ClientBuilder
         .standard()
         .withRegion(region)
-        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+        .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
         .build();
   }
 

src/main/java/coffeemeet/server/common/config/FirebaseConfig.java

@@ -0,0 +1,31 @@
+package coffeemeet.server.common.config;
+
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.messaging.FirebaseMessaging;
+import java.io.IOException;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+@Configuration
+public class FirebaseConfig {
+
+  @Bean
+  FirebaseApp firebaseApp() throws IOException {
+    String path = "secret/firebase-service-key.json";
+    ClassPathResource resource = new ClassPathResource(path);
+
+    FirebaseOptions options = FirebaseOptions.builder()
+        .setCredentials(GoogleCredentials.fromStream(resource.getInputStream())).build();
+
+    return FirebaseApp.initializeApp(options);
+  }
+
+  @Bean
+  FirebaseMessaging firebaseMessaging(FirebaseApp firebaseApp) {
+    return FirebaseMessaging.getInstance(firebaseApp);
+  }
+
+}

src/main/java/coffeemeet/server/common/execption/GlobalErrorCode.java

@@ -8,9 +8,11 @@
 public enum GlobalErrorCode implements ErrorCode {
 
   VALIDATION_ERROR("G000", "유효하지 않은 입력입니다."),
-  INVALID_S3_URL("G004", "유효하지 않은 s3 url 입니다."),
-  STOMP_ACCESSOR_NOT_FOUND("G004", "웹소켓 연결을 할 수 없습니다."),
-  INTERNAL_SERVER_ERROR("G050", "예상치 못한 오류입니다.");
+  INVALID_FCM_TOKEN("G004", "유효하지 않은 FCM토큰입니다."),
+  INVALID_S3_URL("G004", "유효하지 않은 s3 URL 입니다."),
+  STOMP_ACCESSOR_NOT_FOUND("G005", "웹소켓 연결을 할 수 없습니다."),
+  INTERNAL_SERVER_ERROR("G050", "예상치 못한 오류입니다."),
+  PUSH_NOTIFICATION_SEND_FAILURE("G050", "푸시 알림 전송에 실패했습니다.");
 
   private final String code;
   private final String message;

src/main/java/coffeemeet/server/common/execption/NotificationFailException.java

@@ -0,0 +1,15 @@
+package coffeemeet.server.common.execption;
+
+import lombok.Getter;
+
+@Getter
+public class NotificationFailException extends CoffeeMeetException {
+
+  private final ErrorCode errorCode;
+
+  public NotificationFailException(ErrorCode errorCode, String message) {
+    super(message);
+    this.errorCode = errorCode;
+  }
+
+}

src/main/java/coffeemeet/server/common/implement/FCMNotificationSender.java

@@ -0,0 +1,80 @@
+package coffeemeet.server.common.implement;
+
+import static coffeemeet.server.common.execption.GlobalErrorCode.INVALID_FCM_TOKEN;
+import static coffeemeet.server.common.execption.GlobalErrorCode.PUSH_NOTIFICATION_SEND_FAILURE;
+import static com.google.firebase.messaging.MessagingErrorCode.INVALID_ARGUMENT;
+import static com.google.firebase.messaging.MessagingErrorCode.UNREGISTERED;
+
+import coffeemeet.server.common.execption.InvalidInputException;
+import coffeemeet.server.common.execption.NotificationFailException;
+import coffeemeet.server.user.domain.NotificationInfo;
+import com.google.firebase.messaging.FirebaseMessaging;
+import com.google.firebase.messaging.FirebaseMessagingException;
+import com.google.firebase.messaging.Message;
+import com.google.firebase.messaging.MessagingErrorCode;
+import com.google.firebase.messaging.MulticastMessage;
+import com.google.firebase.messaging.Notification;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FCMNotificationSender {
+
+  private static final String INVALID_FCM_TOKEN_MESSAGE = "사용된 토큰(%s)이 유효하지 않습니다.";
+  private static final String PUSH_NOTIFICATION_SEND_FAILURE_MESSAGE = "푸시 알림 전송에 실패했습니다. 토큰: %s";
+  private final FirebaseMessaging firebaseMessaging;
+
+  public void sendNotificationByToken(NotificationInfo notificationInfo, String content) {
+    if (!notificationInfo.isSubscribedToNotification()) {
+      return;
+    }
+
+    Notification notification = createNotification(content);
+    Message message = Message.builder().setToken(notificationInfo.getToken())
+        .setNotification(notification)
+        .build();
+
+    try {
+      firebaseMessaging.send(message);
+    } catch (FirebaseMessagingException e) {
+      handleFirebaseMessagingException(e, notificationInfo.getToken());
+    }
+  }
+
+  public void sendNotificationByTokens(Set<NotificationInfo> notificationInfos, String content) {
+    notificationInfos.removeIf(notificationInfo -> !notificationInfo.isSubscribedToNotification());
+
+    Set<String> tokens = notificationInfos.stream().map(
+        NotificationInfo::getToken
+    ).collect(Collectors.toUnmodifiableSet());
+
+    Notification notification = createNotification(content);
+    MulticastMessage message = MulticastMessage.builder().addAllTokens(tokens)
+        .setNotification(notification).build();
+
+    try {
+      firebaseMessaging.sendMulticast(message);
+    } catch (FirebaseMessagingException e) {
+      handleFirebaseMessagingException(e, String.join(", ", tokens)); //
+    }
+  }
+
+  private void handleFirebaseMessagingException(FirebaseMessagingException e, String token) {
+    MessagingErrorCode messagingErrorCode = e.getMessagingErrorCode();
+
+    if (messagingErrorCode == UNREGISTERED || messagingErrorCode == INVALID_ARGUMENT) {
+      throw new InvalidInputException(INVALID_FCM_TOKEN,
+          String.format(INVALID_FCM_TOKEN_MESSAGE, token));
+    }
+    throw new NotificationFailException(PUSH_NOTIFICATION_SEND_FAILURE,
+        String.format(PUSH_NOTIFICATION_SEND_FAILURE_MESSAGE, token));
+  }
+
+  private Notification createNotification(String content) {
+    return Notification.builder().setTitle("커피밋").setBody(content).build();
+  }
+
+}

src/main/java/coffeemeet/server/oauth/domain/OAuthMemberDetail.java

@@ -3,29 +3,20 @@
 import coffeemeet.server.user.domain.OAuthProvider;
 
 public record OAuthMemberDetail(
-    String name,
     String profileImage,
-    String birthYear,
-    String birthDay,
     String email,
     OAuthProvider oAuthProvider,
     String oAuthProviderId
 ) {
 
   public static OAuthMemberDetail of(
-      String name,
       String profileImage,
-      String birthYear,
-      String birthDay,
       String email,
       OAuthProvider oAuthProvider,
       String oAuthProviderId
   ) {
     return new OAuthMemberDetail(
-        name,
         profileImage,
-        birthYear,
-        birthDay,
         email,
         oAuthProvider,
         oAuthProviderId