Pet 71 feat: 이벤트 기반 user 생성

Auth-Module/auth-application/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
     implementation project(":Auth-Module:JWT")
+    implementation project(":User-Module:user-application")
     // Feign
     implementation 'io.github.openfeign:feign-httpclient:12.1'
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.4'

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/common/exception/AccountAlreadyExistException.java

@@ -0,0 +1,10 @@
+package com.pawith.authmodule.application.common.exception;
+
+import com.pawith.commonmodule.exception.BusinessException;
+import com.pawith.commonmodule.exception.Error;
+
+public class AccountAlreadyExistException extends BusinessException {
+    public AccountAlreadyExistException(Error error) {
+        super(error);
+    }
+}

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/dto/OAuthUserInfo.java

@@ -8,4 +8,5 @@
 public class OAuthUserInfo {
     private final String username;
     private final String email;
+    private final String provider;
 }

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/port/out/observer/observer/Impl/AppleOAuthObserver.java

@@ -42,7 +42,7 @@ protected OAuthUserInfo attemptLogin(String accessToken) {
         Jws<Claims> oidcTokenJws = sigVerificationAndGetJws(accessToken);
         // 토큰 바디 파싱해서 사용자 정보 획득
         String email = (String) oidcTokenJws.getBody().get("email");
-        return new OAuthUserInfo("포잇",email);
+        return new OAuthUserInfo("포잇", email, PROVIDER.toString());
     }
 
     @Override

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/port/out/observer/observer/Impl/GoogleOAuthObserver.java

@@ -18,7 +18,7 @@ public class GoogleOAuthObserver  extends AbstractOAuthObserver {
     @Override
     protected OAuthUserInfo attemptLogin(String accessToken) {
         log.info("GoogleOAuthObserver attemptLogin");
-        return new OAuthUserInfo("Google username","Google email");
+        return new OAuthUserInfo("Google username","Google email", PROVIDER.toString());
     }
 
     @Override

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/port/out/observer/observer/Impl/KakaoOAuthObserver.java

@@ -18,7 +18,7 @@ public class KakaoOAuthObserver extends AbstractOAuthObserver {
     @Override
     protected OAuthUserInfo attemptLogin(String accessToken) {
         log.info("KakaoOAuthObserver attemptLogin");
-        return new OAuthUserInfo("Kakao username","Kakao email");
+        return new OAuthUserInfo("Kakao username","Kakao email", PROVIDER.toString());
     }
 
     @Override

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/port/out/observer/observer/Impl/NaverOAuthObserver.java

@@ -17,7 +17,7 @@ public class NaverOAuthObserver extends AbstractOAuthObserver {
     private final RestTemplate restTemplate;
     protected OAuthUserInfo attemptLogin(String accessToken) {
         log.info("NaverOAuthObserver attemptLogin");
-        return new OAuthUserInfo("Naver username","Naver email");
+        return new OAuthUserInfo("Naver username","Naver email", PROVIDER.toString());
     }
 
     @Override

Auth-Module/auth-application/src/main/java/com/pawith/authmodule/application/port/out/observer/subject/OAuthSubject.java

@@ -1,16 +1,20 @@
 package com.pawith.authmodule.application.port.out.observer.subject;
 
 import com.pawith.authmodule.application.common.consts.AuthConsts;
+import com.pawith.authmodule.application.common.exception.AccountAlreadyExistException;
 import com.pawith.authmodule.application.dto.OAuthRequest;
 import com.pawith.authmodule.application.dto.OAuthResponse;
 import com.pawith.authmodule.application.dto.OAuthUserInfo;
 import com.pawith.authmodule.application.port.out.observer.observer.AbstractOAuthObserver;
+import com.pawith.commonmodule.exception.Error;
 import com.pawith.commonmodule.observer.observer.Observer;
 import com.pawith.commonmodule.observer.subject.Status;
 import com.pawith.commonmodule.observer.subject.Subject;
 import com.pawith.jwt.JWTProvider;
+import com.pawith.usermodule.application.handler.event.UserSignUpEvent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEventPublisher;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +29,8 @@ public final class OAuthSubject implements Subject<OAuthRequest, OAuthResponse>
 
     private JWTProvider jwtProvider;
 
+    private ApplicationEventPublisher publisher;
+
     @Override
     public void registerObserver(Observer<? extends Status,?> o) {
         observerList.add((AbstractOAuthObserver) o);
@@ -38,6 +44,11 @@ public void removeObserver(Observer<? extends Status, ?> o) {
     @Override
     public OAuthResponse notifyObservers(OAuthRequest object) {
         final OAuthUserInfo oAuthUserInfo = attemptLogin(new OAuth(object.getProvider(), object.getAccessToken()));
+        try {
+            publisher.publishEvent(new UserSignUpEvent(oAuthUserInfo.getUsername(), oAuthUserInfo.getEmail(), oAuthUserInfo.getProvider()));
+        }catch (AccountAlreadyExistException ex) {
+            throw new AccountAlreadyExistException(Error.ACCOUNT_ALREADY_EXIST);
+        }
         return generateServerAuthenticationTokens(oAuthUserInfo);
     }
 

Common-Module/src/main/java/com/pawith/commonmodule/annotation/DomainService.java

@@ -0,0 +1,14 @@
+package com.pawith.commonmodule.annotation;
+
+import org.springframework.stereotype.Service;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Service
+public @interface DomainService {
+}

Common-Module/src/main/java/com/pawith/commonmodule/annotation/Mapper.java

@@ -0,0 +1,11 @@
+package com.pawith.commonmodule.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Mapper {
+}

Common-Module/src/main/java/com/pawith/commonmodule/domain/BaseEntity.java

@@ -0,0 +1,22 @@
+package com.pawith.commonmodule.domain;
+
+import lombok.Getter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class BaseEntity {
+
+    @CreatedDate
+    protected LocalDateTime createdAt;
+
+    @LastModifiedDate
+    protected LocalDateTime updatedAt;
+}

Common-Module/src/main/java/com/pawith/commonmodule/exception/Error.java

@@ -10,6 +10,10 @@ public enum Error {
     NOT_EXIST_TOKEN("토큰이 존재하지 않습니다.", 1003),
     INVALID_AUTHORIZATION_TYPE("유효하지 않은 Authorization Type 입니다.", 1004),
     EMPTY_AUTHORIZATION_HEADER("Authorization Header가 비어있습니다.", 1005),
+    ACCOUNT_ALREADY_EXIST("이미 가입한 계정이 있습니다", 1006),
+
+    // User
+    USER_NOT_FOUND("사용자를 찾을 수 없습니다.", 2000),
     ;
 
     private final String message;

User-Module/build.gradle

@@ -0,0 +1,5 @@
+subprojects {
+    dependencies {
+        implementation project(":Common-Module")
+    }
+}

User-Module/user-application/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    implementation project(":User-Module:user-domain")
+}

User-Module/user-application/src/main/java/com/pawith/usermodule/application/handler/UserSignUpHandler.java

@@ -0,0 +1,31 @@
+package com.pawith.usermodule.application.handler;
+
+import com.pawith.usermodule.application.handler.event.UserSignUpEvent;
+import com.pawith.usermodule.application.mapper.UserMapper;
+import com.pawith.usermodule.domain.entity.User;
+import com.pawith.usermodule.domain.repository.UserRepository;
+import com.pawith.usermodule.domain.service.UserSaveService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@RequiredArgsConstructor
+public class UserSignUpHandler {
+
+    private final UserSaveService userSaveService;
+    private final UserRepository userRepository;
+
+    @Transactional
+    @EventListener
+    public void signUp(UserSignUpEvent userSignUpEvent){
+        if(!userRepository.existsByEmail(userSignUpEvent.getEmail())) {
+            final User user = UserMapper.toEntity(userSignUpEvent);
+            userSaveService.saveUser(user);
+        }
+        else
+            throw new IllegalArgumentException("사용자 존재");
+    }
+
+}

User-Module/user-application/src/main/java/com/pawith/usermodule/application/handler/event/UserSignUpEvent.java

@@ -0,0 +1,14 @@
+package com.pawith.usermodule.application.handler.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class UserSignUpEvent {
+    private final String nickname;
+    private final String email;
+    private final String Provider;
+}

User-Module/user-application/src/main/java/com/pawith/usermodule/application/mapper/UserMapper.java

@@ -0,0 +1,18 @@
+package com.pawith.usermodule.application.mapper;
+
+import com.pawith.commonmodule.annotation.Mapper;
+import com.pawith.usermodule.application.handler.event.UserSignUpEvent;
+import com.pawith.usermodule.domain.entity.User;
+
+@Mapper
+public class UserMapper {
+
+    public static User toEntity(UserSignUpEvent userSignUpEvent){
+        return User.builder()
+                .nickname(userSignUpEvent.getNickname())
+                .email(userSignUpEvent.getEmail())
+                .provider(userSignUpEvent.getProvider())
+                .build();
+    }
+
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/entity/User.java

@@ -0,0 +1,29 @@
+package com.pawith.usermodule.domain.entity;
+
+import com.pawith.commonmodule.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class User extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "user_id")
+    private Long id;
+
+    private String nickname;
+    private String email;
+    private String profileImageUrl;
+    private String provider;
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/exception/UserException.java

@@ -0,0 +1,10 @@
+package com.pawith.usermodule.domain.exception;
+
+import com.pawith.commonmodule.exception.BusinessException;
+import com.pawith.commonmodule.exception.Error;
+
+public class UserException extends BusinessException {
+    public UserException(Error error) {
+        super(error);
+    }
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/exception/UserNotFoundException.java

@@ -0,0 +1,7 @@
+package com.pawith.usermodule.domain.exception;
+
+import com.pawith.commonmodule.exception.Error;
+
+public class UserNotFoundException extends UserException{
+    public UserNotFoundException(Error error) { super(error); }
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/repository/UserRepository.java

@@ -0,0 +1,11 @@
+package com.pawith.usermodule.domain.repository;
+
+import com.pawith.usermodule.domain.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByEmail(String email);
+    boolean existsByEmail(String email);
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/service/UserQueryService.java

@@ -0,0 +1,23 @@
+package com.pawith.usermodule.domain.service;
+
+import com.pawith.commonmodule.annotation.DomainService;
+import com.pawith.commonmodule.exception.Error;
+import com.pawith.usermodule.domain.entity.User;
+import com.pawith.usermodule.domain.exception.UserNotFoundException;
+import com.pawith.usermodule.domain.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@DomainService
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class UserQueryService {
+    private final UserRepository userRepository;
+
+
+    public User findByEmail(String email) {
+        return userRepository.findByEmail(email)
+                .orElseThrow(() -> new UserNotFoundException(Error.USER_NOT_FOUND));
+    }
+
+}

User-Module/user-domain/src/main/java/com/pawith/usermodule/domain/service/UserSaveService.java

@@ -0,0 +1,20 @@
+package com.pawith.usermodule.domain.service;
+
+import com.pawith.commonmodule.annotation.DomainService;
+import com.pawith.usermodule.domain.entity.User;
+import com.pawith.usermodule.domain.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@DomainService
+@RequiredArgsConstructor
+public class UserSaveService {
+
+    private final UserRepository userRepository;
+
+    @Transactional
+    public void saveUser(User user) {
+            userRepository.save(user);
+    }
+
+}

settings.gradle

@@ -16,4 +16,9 @@ include 'Auth-Module:auth-application'
 findProject(':Auth-Module:auth-application')?.name = 'auth-application'
 
 include 'Auth-Module:JWT'
+include 'User-Module'
+include 'User-Module:user-domain'
+findProject(':User-Module:user-domain')?.name = 'user-domain'
+include 'User-Module:user-application'
+findProject(':User-Module:user-application')?.name = 'user-application'