[REFACTOR] common과 external 모듈 분리

src/main/java/sopt/org/umbba/domain/user/social/apple/AppleLoginService.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.apple;
+package sopt.org.umbba.external.client.auth.apple;
 
 import io.jsonwebtoken.Claims;
 import lombok.RequiredArgsConstructor;

src/main/java/sopt/org/umbba/domain/user/social/apple/verify/AppleClaimsValidator.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.apple.verify;
+package sopt.org.umbba.external.client.auth.apple.verify;
 
 import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/sopt/org/umbba/domain/user/social/apple/verify/AppleJwtParser.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.apple.verify;
+package sopt.org.umbba.external.client.auth.apple.verify;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/sopt/org/umbba/domain/user/social/apple/verify/EncryptUtils.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.apple.verify;
+package sopt.org.umbba.external.client.auth.apple.verify;
 
 import sopt.org.umbba.global.exception.CustomException;
 import sopt.org.umbba.global.exception.ErrorType;

src/main/java/sopt/org/umbba/domain/user/social/apple/verify/PublicKeyGenerator.java

@@ -1,9 +1,9 @@
-package sopt.org.umbba.domain.user.social.apple.verify;
+package sopt.org.umbba.external.client.auth.apple.verify;
 
 import org.springframework.stereotype.Component;
 import org.springframework.util.Base64Utils;
-import sopt.org.umbba.domain.user.social.apple.response.ApplePublicKey;
-import sopt.org.umbba.domain.user.social.apple.response.ApplePublicKeys;
+import sopt.org.umbba.external.client.auth.apple.response.ApplePublicKey;
+import sopt.org.umbba.external.client.auth.apple.response.ApplePublicKeys;
 import sopt.org.umbba.global.exception.CustomException;
 import sopt.org.umbba.global.exception.ErrorType;
 

src/main/java/sopt/org/umbba/domain/user/social/kakao/KakaoLoginService.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.kakao;
+package sopt.org.umbba.external.client.auth.kakao;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

umbba-common/build.gradle

@@ -1,6 +1,10 @@
 bootJar { enabled = false }
 jar { enabled = true }
 dependencies {
+
+ // for HttpStatus
+ implementation 'org.springframework.boot:spring-boot-starter-web'
+
  // redis
  implementation "org.springframework.boot:spring-boot-starter-data-redis"
 

src/main/java/sopt/org/umbba/global/exception/ErrorType.java → umbba-common/src/main/java/sopt/org/umbba/common/exception/ErrorType.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.global.exception;
+package sopt.org.umbba.common.exception;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/sopt/org/umbba/global/exception/SuccessType.java → umbba-common/src/main/java/sopt/org/umbba/common/exception/SuccessType.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.global.exception;
+package sopt.org.umbba.common.exception;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/sopt/org/umbba/global/common/dto/ApiResponse.java → umbba-common/src/main/java/sopt/org/umbba/common/exception/dto/ApiResponse.java

@@ -1,13 +1,13 @@
-package sopt.org.umbba.global.common.dto;
+package sopt.org.umbba.common.exception.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import sopt.org.umbba.global.exception.ErrorType;
-import sopt.org.umbba.global.exception.SuccessType;
+import sopt.org.umbba.common.exception.ErrorType;
+import sopt.org.umbba.common.exception.SuccessType;
 
 @Getter
 @JsonPropertyOrder({"status", "message", "data"})

src/main/java/sopt/org/umbba/global/exception/CustomException.java → umbba-common/src/main/java/sopt/org/umbba/common/exception/model/CustomException.java

@@ -1,6 +1,7 @@
-package sopt.org.umbba.global.exception;
+package sopt.org.umbba.common.exception.model;
 
 import lombok.Getter;
+import sopt.org.umbba.common.exception.ErrorType;
 
 @Getter
 public class CustomException extends RuntimeException {

umbba-common/src/main/java/sopt/org/umbba/common/sqs/MessageType.java

@@ -0,0 +1,12 @@
+package sopt.org.umbba.common.sqs;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class MessageType {
+
+ public static final String MESSAGE_TYPE_HEADER = "TYPE";
+ public static final String FIREBASE = "FIREBASE";
+ public static final String SLACK = "SLACK";
+}

umbba-common/src/main/java/sopt/org/umbba/common/sqs/MessageUtils.java

@@ -0,0 +1,17 @@
+package sopt.org.umbba.common.sqs;
+
+public class MessageUtils {
+
+ public static <P1> String generate(String message, P1 param1) {
+ return String.format(message, param1);
+ }
+
+ public static <P1, P2> String generate(String message, P1 param1, P2 param2) {
+ return String.format(message, param1, param2);
+ }
+
+ public static <P1, P2, P3> String generate(String message, P1 param1, P2 param2, P3 param3) {
+ return String.format(message, param1, param2, param3);
+ }
+
+}

umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/FirebaseDto.java

@@ -0,0 +1,26 @@
+package sopt.org.umbba.common.sqs.dto;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+import sopt.org.umbba.common.sqs.MessageType;
+
+@ToString
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@SuperBuilder
+public class FirebaseDto extends MessageDto {
+
+ private String fcmToken;
+ private String title;
+ private String body;
+
+ public static FirebaseDto of(String fcmToken, String title, String body) {
+ return FirebaseDto.builder()
+ .type(MessageType.FIREBASE)
+ .fcmToken(fcmToken)
+ .title(title)
+ .body(body)
+ .build();
+ }
+}

umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/MessageDto.java

@@ -0,0 +1,14 @@
+package sopt.org.umbba.common.sqs.dto;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@ToString
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@SuperBuilder
+public class MessageDto {
+
+ protected String type;
+}

umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/SlackDto.java

@@ -0,0 +1,26 @@
+package sopt.org.umbba.common.sqs.dto;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+import sopt.org.umbba.common.sqs.MessageType;
+
+@ToString
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@SuperBuilder
+public class SlackDto extends MessageDto {
+
+ private Exception error;
+ private String requestMethod;
+ private String requestURI;
+
+ public static SlackDto of(Exception error, String requestMethod, String requestURI) {
+ return SlackDto.builder()
+ .type(MessageType.SLACK)
+ .error(error)
+ .requestMethod(requestMethod)
+ .requestURI(requestURI)
+ .build();
+ }
+}

src/main/java/sopt/org/umbba/domain/user/social/apple/feign/AppleApiClient.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/apple/AppleApiClient.java

@@ -1,8 +1,8 @@
-package sopt.org.umbba.domain.user.social.apple.feign;
+package sopt.org.umbba.external.client.auth.apple;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import sopt.org.umbba.domain.user.social.apple.response.ApplePublicKeys;
+import sopt.org.umbba.external.client.auth.apple.response.ApplePublicKeys;
 
 @FeignClient(name = "apple-public-verify-client", url = "https://appleid.apple.com/auth")
 public interface AppleApiClient {

src/main/java/sopt/org/umbba/domain/user/social/apple/response/ApplePublicKey.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/apple/response/ApplePublicKey.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.apple.response;
+package sopt.org.umbba.external.client.auth.apple.response;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/sopt/org/umbba/domain/user/social/apple/response/ApplePublicKeys.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/apple/response/ApplePublicKeys.java

@@ -1,11 +1,11 @@
-package sopt.org.umbba.domain.user.social.apple.response;
+package sopt.org.umbba.external.client.auth.apple.response;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import sopt.org.umbba.global.exception.CustomException;
-import sopt.org.umbba.global.exception.ErrorType;
+import sopt.org.umbba.common.exception.model.CustomException;
+import sopt.org.umbba.common.exception.ErrorType;
 
 import java.util.List;
 

src/main/java/sopt/org/umbba/domain/user/social/kakao/feign/KakaoApiClient.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/KakaoApiClient.java

@@ -1,10 +1,10 @@
-package sopt.org.umbba.domain.user.social.kakao.feign;
+package sopt.org.umbba.external.client.auth.kakao;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
-import sopt.org.umbba.domain.user.social.kakao.response.KakaoUserResponse;
+import sopt.org.umbba.external.client.auth.kakao.response.KakaoUserResponse;
 
 @FeignClient(name = "kakaoApiClient", url = "https://kapi.kakao.com")
 public interface KakaoApiClient {

src/main/java/sopt/org/umbba/domain/user/social/kakao/feign/KakaoAuthApiClient.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/KakaoAuthApiClient.java

@@ -1,10 +1,10 @@
-package sopt.org.umbba.domain.user.social.kakao.feign;
+package sopt.org.umbba.external.client.auth.kakao;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import sopt.org.umbba.domain.user.social.kakao.response.KakaoAccessTokenResponse;
+import sopt.org.umbba.external.client.auth.kakao.response.KakaoAccessTokenResponse;
 
 @FeignClient(name = "kakaoAuthApiClient", url = "https://kauth.kakao.com")
 public interface KakaoAuthApiClient {

src/main/java/sopt/org/umbba/domain/user/social/kakao/response/KakaoAccessTokenResponse.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/response/KakaoAccessTokenResponse.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.kakao.response;
+package sopt.org.umbba.external.client.auth.kakao.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

src/main/java/sopt/org/umbba/domain/user/social/kakao/response/KakaoAccount.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/response/KakaoAccount.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.kakao.response;
+package sopt.org.umbba.external.client.auth.kakao.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

src/main/java/sopt/org/umbba/domain/user/social/kakao/response/KakaoUserProfile.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/response/KakaoUserProfile.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.kakao.response;
+package sopt.org.umbba.external.client.auth.kakao.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

src/main/java/sopt/org/umbba/domain/user/social/kakao/response/KakaoUserResponse.java → umbba-external/src/main/java/sopt/org/umbba/external/client/auth/kakao/response/KakaoUserResponse.java

@@ -1,4 +1,4 @@
-package sopt.org.umbba.domain.user.social.kakao.response;
+package sopt.org.umbba.external.client.auth.kakao.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;