refactor : 모듈 service, service-api로 분리

account-service/.gitignore

@@ -37,3 +37,4 @@ out/
 .vscode/
 
 **/security/*
+**/generated/*

account-service/account-service-api/.gitignore

@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

account-service/account-service-api/build.gradle

@@ -0,0 +1,15 @@
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}
+
+bootJar {
+    enabled = false
+}

account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/TokenResult.java

@@ -0,0 +1,10 @@
+package com.synapse.account_service_api.dto;
+
+import java.time.Instant;
+
+public record TokenResult(
+    String token, 
+    Instant expiresAt
+) {
+
+}

account-service/src/main/java/com/synapse/account_service/dto/request/LoginRequest.java → account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.dto.request;
+package com.synapse.account_service_api.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

account-service/src/main/java/com/synapse/account_service/dto/request/SignUpRequest.java → account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/request/SignUpRequest.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.dto.request;
+package com.synapse.account_service_api.dto.request;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

account-service/src/main/java/com/synapse/account_service/dto/AccessTokenResponse.java → account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/response/AccessTokenResponse.java

@@ -1,6 +1,7 @@
-package com.synapse.account_service.dto;
+package com.synapse.account_service_api.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.synapse.account_service_api.dto.TokenResult;
 
 public record AccessTokenResponse(
     @JsonProperty("accessToken") String token,
@@ -12,3 +13,4 @@ public static AccessTokenResponse from(TokenResult tokenResult) {
                 tokenResult.expiresAt().toEpochMilli());
     }
 }
+

account-service/src/main/java/com/synapse/account_service/dto/RefreshTokenResponse.java → account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/response/RefreshTokenResponse.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.dto;
+package com.synapse.account_service_api.dto.response;
 
 import org.springframework.http.ResponseCookie;
 

account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/response/SignUpResponse.java

@@ -0,0 +1,13 @@
+package com.synapse.account_service_api.dto.response;
+
+import java.util.UUID;
+
+public record SignUpResponse(
+    UUID id,
+    String email,
+    String username,
+    String role
+) {
+
+}
+

account-service/account-service-api/src/main/java/com/synapse/account_service_api/dto/response/TokenResponse.java

@@ -0,0 +1,10 @@
+package com.synapse.account_service_api.dto.response;
+
+import com.synapse.account_service_api.dto.TokenResult;
+
+public record TokenResponse(
+    TokenResult accessToken, 
+    TokenResult refreshToken
+) {
+
+}

account-service/account-service-api/src/main/java/com/synapse/account_service_api/event/MemberDomainEvent.java

@@ -0,0 +1,7 @@
+package com.synapse.account_service_api.event;
+
+import io.eventuate.tram.events.common.DomainEvent;
+
+public interface MemberDomainEvent extends DomainEvent {
+
+}

account-service/account-service-api/src/main/java/com/synapse/account_service_api/event/MemberRegisteredEvent.java

@@ -0,0 +1,36 @@
+package com.synapse.account_service_api.event;
+
+import java.util.UUID;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+public class MemberRegisteredEvent implements MemberDomainEvent {
+    private UUID userId;
+    private String email;
+    private String username;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}

account-service/account-service-api/src/main/java/com/synapse/account_service_api/event/SocialAccountLinkedEvent.java

@@ -0,0 +1,33 @@
+package com.synapse.account_service_api.event;
+
+import java.util.UUID;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import lombok.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+public class SocialAccountLinkedEvent implements MemberDomainEvent{
+    private UUID userId;
+    private String providerId;
+    private String registrationId;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}

account-service/account-service/.gitignore

@@ -0,0 +1,39 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+**/security/*

account-service/account-service/build.gradle

@@ -0,0 +1,25 @@
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation project(':account-service-api')
+}
+
+def generated = 'src/main/generated'
+
+tasks.withType(JavaCompile) {
+    options.getGeneratedSourceOutputDirectory().set(file(generated))
+}
+
+sourceSets {
+    main.java.srcDirs += [ generated ]
+}
+
+clean {
+    delete file(generated)
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

account-service/account-service/src/main/java/com/synapse/account_service/AccountServiceConfig.java

@@ -0,0 +1,12 @@
+package com.synapse.account_service;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@EnableJpaAuditing
+@ComponentScan
+@EnableAutoConfiguration
+public class AccountServiceConfig {
+
+}

account-service/src/main/java/com/synapse/account_service/config/ObjectMapperConfig.java → account-service/account-service/src/main/java/com/synapse/account_service/configuration/ObjectMapperConfig.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.config;
+package com.synapse.account_service.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

account-service/src/main/java/com/synapse/account_service/config/PasswordEncoderConfig.java → account-service/account-service/src/main/java/com/synapse/account_service/configuration/PasswordEncoderConfig.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.config;
+package com.synapse.account_service.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,4 +11,4 @@ public class PasswordEncoderConfig {
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
-} 
+} 

account-service/src/main/java/com/synapse/account_service/config/ResourceServerConfig.java → account-service/account-service/src/main/java/com/synapse/account_service/configuration/ResourceServerConfig.java

@@ -1,6 +1,4 @@
-package com.synapse.account_service.config;
-
-import static org.springframework.security.config.Customizer.withDefaults;
+package com.synapse.account_service.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +8,8 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 
+import static org.springframework.security.config.Customizer.withDefaults;
+
 @Configuration(proxyBeanMethods = false)
 @EnableMethodSecurity
 public class ResourceServerConfig {
@@ -25,4 +25,4 @@ public SecurityFilterChain securityResourceServerFilterChain(HttpSecurity http)
             .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()));
         return http.build();
     }
-} 
+}

account-service/src/main/java/com/synapse/account_service/config/SecurityConfig.java → account-service/account-service/src/main/java/com/synapse/account_service/configuration/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.synapse.account_service.config;
+package com.synapse.account_service.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,6 +38,7 @@ public class SecurityConfig {
     private final ObjectMapper objectMapper;
     private final PasswordEncoder passwordEncoder;
 
+
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http, JwtAuthenticationFilter jwtAuthenticationFilter) throws Exception {
         http.csrf(csrf -> csrf.disable())
@@ -62,16 +63,17 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, JwtAuthenticat
             .addFilterAt(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
 
             .exceptionHandling(
-                exceptionHandlingConfigurer -> exceptionHandlingConfigurer.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login")));
+                exceptionHandlingConfigurer -> exceptionHandlingConfigurer.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login"))
+            );
 
         return http.build();
     }
 
     @Bean
-    public DaoAuthenticationProvider authenticationProvider() {
+    public DaoAuthenticationProvider authenticationProvider(GrantedAuthoritiesMapper grantedAuthoritiesMapper) {
         DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(customUserDetailsService);
         authProvider.setPasswordEncoder(passwordEncoder);
-        authProvider.setAuthoritiesMapper(customAuthorityMapper());
+        authProvider.setAuthoritiesMapper(grantedAuthoritiesMapper);
         return authProvider;
     }
 

account-service/src/main/java/com/synapse/account_service/controller/AccountController.java → account-service/account-service/src/main/java/com/synapse/account_service/controller/AccountController.java

@@ -1,20 +1,20 @@
 package com.synapse.account_service.controller;
 
+import static org.springframework.http.HttpStatus.CREATED;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.synapse.account_service.dto.request.SignUpRequest;
-import com.synapse.account_service.dto.response.SignUpResponse;
 import com.synapse.account_service.service.AccountService;
+import com.synapse.account_service_api.dto.request.SignUpRequest;
+import com.synapse.account_service_api.dto.response.SignUpResponse;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
-import static org.springframework.http.HttpStatus.CREATED;
-
 @RestController
 @RequestMapping("/api/accounts")
 @RequiredArgsConstructor