[#45, #46, #56] 유저 이메일 찾기, 비밀번호 찾기, 회원 복구

build.gradle

@@ -21,10 +21,13 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.session:spring-session-data-redis'
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
-    implementation 'org.springframework.boot:spring-boot-starter-aop'
     implementation 'org.mindrot:jbcrypt:0.4'
     implementation 'org.mapstruct:mapstruct:1.5.2.Final'
+    implementation 'com.google.guava:guava:31.1-jre'
+
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.2.2'
@@ -34,6 +37,7 @@ dependencies {
     runtimeOnly 'mysql:mysql-connector-java'
 
     annotationProcessor 'org.projectlombok:lombok'
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.2.Final'
 }
 

intellij-java-google-style.xml

@@ -1,4 +1,32 @@
 <code_scheme name="GoogleStyle" version="173">
+  <option name="OTHER_INDENT_OPTIONS">
+    <value>
+      <option name="INDENT_SIZE" value="2"/>
+      <option name="CONTINUATION_INDENT_SIZE" value="4"/>
+      <option name="TAB_SIZE" value="2"/>
+    </value>
+  </option>
+  <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
+  <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0"/>
+  <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
+  <option name="ALIGN_MULTILINE_FOR" value="false"/>
+  <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
+  <option name="CALL_PARAMETERS_WRAP" value="1"/>
+  <option name="METHOD_PARAMETERS_WRAP" value="1"/>
+  <option name="EXTENDS_LIST_WRAP" value="1"/>
+  <option name="THROWS_KEYWORD_WRAP" value="1"/>
+  <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
+  <option name="BINARY_OPERATION_WRAP" value="1"/>
+  <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
+  <option name="TERNARY_OPERATION_WRAP" value="1"/>
+  <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
+  <option name="FOR_STATEMENT_WRAP" value="1"/>
+  <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
+  <option name="WRAP_COMMENTS" value="true"/>
+  <option name="IF_BRACE_FORCE" value="3"/>
+  <option name="DOWHILE_BRACE_FORCE" value="3"/>
+  <option name="WHILE_BRACE_FORCE" value="3"/>
+  <option name="FOR_BRACE_FORCE" value="3"/>
   <AndroidXmlCodeStyleSettings>
     <option name="USE_CUSTOM_SETTINGS" value="true"/>
     <option name="LAYOUT_SETTINGS">
@@ -110,6 +138,37 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JAVA">
+    <option name="RIGHT_MARGIN" value="120"/>
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
+    <option name="BLANK_LINES_AROUND_FIELD" value="1"/>
+    <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1"/>
+    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
+    <option name="ALIGN_MULTILINE_RESOURCES" value="false"/>
+    <option name="ALIGN_MULTILINE_FOR" value="false"/>
+    <option name="CALL_PARAMETERS_WRAP" value="1"/>
+    <option name="METHOD_PARAMETERS_WRAP" value="1"/>
+    <option name="EXTENDS_LIST_WRAP" value="1"/>
+    <option name="THROWS_KEYWORD_WRAP" value="1"/>
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
+    <option name="BINARY_OPERATION_WRAP" value="1"/>
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
+    <option name="TERNARY_OPERATION_WRAP" value="1"/>
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
+    <option name="FOR_STATEMENT_WRAP" value="1"/>
+    <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
+    <option name="WRAP_COMMENTS" value="true"/>
+    <option name="IF_BRACE_FORCE" value="3"/>
+    <option name="DOWHILE_BRACE_FORCE" value="3"/>
+    <option name="WHILE_BRACE_FORCE" value="3"/>
+    <option name="FOR_BRACE_FORCE" value="3"/>
+    <option name="WRAP_ON_TYPING" value="0"/>
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2"/>
+      <option name="CONTINUATION_INDENT_SIZE" value="4"/>
+      <option name="TAB_SIZE" value="2"/>
+    </indentOptions>
     <arrangement>
       <rules>
         <section>
@@ -370,37 +429,6 @@
         </section>
       </rules>
     </arrangement>
-    <indentOptions>
-      <option name="INDENT_SIZE" value="2"/>
-      <option name="CONTINUATION_INDENT_SIZE" value="4"/>
-      <option name="TAB_SIZE" value="2"/>
-    </indentOptions>
-    <option name="RIGHT_MARGIN" value="120"/>
-    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
-    <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
-    <option name="BLANK_LINES_AROUND_FIELD" value="1"/>
-    <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1"/>
-    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
-    <option name="ALIGN_MULTILINE_RESOURCES" value="false"/>
-    <option name="ALIGN_MULTILINE_FOR" value="false"/>
-    <option name="CALL_PARAMETERS_WRAP" value="1"/>
-    <option name="METHOD_PARAMETERS_WRAP" value="1"/>
-    <option name="EXTENDS_LIST_WRAP" value="1"/>
-    <option name="THROWS_KEYWORD_WRAP" value="1"/>
-    <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
-    <option name="BINARY_OPERATION_WRAP" value="1"/>
-    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
-    <option name="TERNARY_OPERATION_WRAP" value="1"/>
-    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
-    <option name="FOR_STATEMENT_WRAP" value="1"/>
-    <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
-    <option name="WRAP_COMMENTS" value="true"/>
-    <option name="IF_BRACE_FORCE" value="3"/>
-    <option name="DOWHILE_BRACE_FORCE" value="3"/>
-    <option name="WHILE_BRACE_FORCE" value="3"/>
-    <option name="FOR_BRACE_FORCE" value="3"/>
-    <option name="WRAP_ON_TYPING" value="0"/>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
     <indentOptions>
@@ -409,10 +437,6 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
-    <indentOptions>
-      <option name="INDENT_SIZE" value="2"/>
-      <option name="TAB_SIZE" value="2"/>
-    </indentOptions>
     <option name="RIGHT_MARGIN" value="80"/>
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
@@ -429,6 +453,10 @@
     <option name="DOWHILE_BRACE_FORCE" value="3"/>
     <option name="WHILE_BRACE_FORCE" value="3"/>
     <option name="FOR_BRACE_FORCE" value="3"/>
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2"/>
+      <option name="TAB_SIZE" value="2"/>
+    </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="ObjectiveC">
     <indentOptions>
@@ -485,6 +513,11 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2"/>
+      <option name="CONTINUATION_INDENT_SIZE" value="2"/>
+      <option name="TAB_SIZE" value="2"/>
+    </indentOptions>
     <arrangement>
       <rules>
         <section>
@@ -796,49 +829,15 @@
                 <XML_NAMESPACE>.*</XML_NAMESPACE>
               </AND>
             </match>
-            <order>BY_NAME</order>
           </rule>
         </section>
       </rules>
     </arrangement>
-    <indentOptions>
-      <option name="INDENT_SIZE" value="2"/>
-      <option name="CONTINUATION_INDENT_SIZE" value="2"/>
-      <option name="TAB_SIZE" value="2"/>
-    </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="protobuf">
+    <option name="RIGHT_MARGIN" value="80"/>
     <indentOptions>
       <option name="CONTINUATION_INDENT_SIZE" value="2"/>
     </indentOptions>
-    <option name="RIGHT_MARGIN" value="80"/>
   </codeStyleSettings>
-  <option name="OTHER_INDENT_OPTIONS">
-    <value>
-      <option name="INDENT_SIZE" value="2"/>
-      <option name="CONTINUATION_INDENT_SIZE" value="4"/>
-      <option name="TAB_SIZE" value="2"/>
-    </value>
-  </option>
-  <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
-  <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0"/>
-  <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
-  <option name="ALIGN_MULTILINE_FOR" value="false"/>
-  <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
-  <option name="CALL_PARAMETERS_WRAP" value="1"/>
-  <option name="METHOD_PARAMETERS_WRAP" value="1"/>
-  <option name="EXTENDS_LIST_WRAP" value="1"/>
-  <option name="THROWS_KEYWORD_WRAP" value="1"/>
-  <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
-  <option name="BINARY_OPERATION_WRAP" value="1"/>
-  <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
-  <option name="TERNARY_OPERATION_WRAP" value="1"/>
-  <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
-  <option name="FOR_STATEMENT_WRAP" value="1"/>
-  <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
-  <option name="WRAP_COMMENTS" value="true"/>
-  <option name="IF_BRACE_FORCE" value="3"/>
-  <option name="DOWHILE_BRACE_FORCE" value="3"/>
-  <option name="WHILE_BRACE_FORCE" value="3"/>
-  <option name="FOR_BRACE_FORCE" value="3"/>
 </code_scheme>

src/main/java/com/airjnc/common/annotation/TwoFieldMatch.java

@@ -0,0 +1,37 @@
+package com.airjnc.common.annotation;
+
+import com.airjnc.common.util.beanvalidator.TwoFieldMatchValidator;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+// DTO 바인딩 검사에서 선택된 두 필드에 대하여 해당 두 필드의 값이 동일한 지 체크하는 애노테이션입니다.
+// 향후 사용할 가능성이 있을 것 같아, 현재 사용하진 않지만 지우지 않고 남겨둡니다.
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Constraint(validatedBy = TwoFieldMatchValidator.class)
+public @interface TwoFieldMatch {
+
+  String first();
+
+  Class<?>[] groups() default {};
+
+  String message() default "{TwoFieldMatch}";
+
+  Class<? extends Payload>[] payload() default {};
+
+  String second();
+
+  @Target({ElementType.TYPE})
+  @Retention(RetentionPolicy.RUNTIME)
+  @Documented
+  @interface List {
+
+    TwoFieldMatch[] value();
+  }
+}

src/main/java/com/airjnc/common/config/SessionConfig.java

@@ -0,0 +1,49 @@
+package com.airjnc.common.config;
+
+import com.airjnc.common.properties.SessionTtlProperties;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+
+@Configuration
+@EnableRedisHttpSession
+@EnableConfigurationProperties(SessionTtlProperties.class)
+public class SessionConfig {
+
+  @Value("${spring.redis.session.host}")
+  private String host;
+
+  @Value("${spring.redis.session.port}")
+  private int port;
+
+  @Value("${spring.redis.session.password}")
+  private String password;
+
+  @Bean
+  public RedisConnectionFactory redisConnectionFactory() {
+    RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration();
+
+    configuration.setHostName(host);
+    configuration.setPort(port);
+    configuration.setPassword(password);
+
+    return new LettuceConnectionFactory(configuration);
+  }
+
+  @Bean
+  public RedisTemplate<String, String> redisTemplate(
+      RedisConnectionFactory redisConnectionFactory) {
+    // 아직까진 value 를 객체 등등.. 문자열 그 외의 타입으로 사용할 예정이 없으므로 String으로만 serialize 진행
+    // 추후에, value가 복잡해진다면 `GenericJackson2JsonRedisSerializer` 을 사용할 예정
+    StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
+    stringRedisTemplate.setConnectionFactory(redisConnectionFactory);
+    return stringRedisTemplate;
+  }
+}

src/main/java/com/airjnc/common/dao/RedisDao.java

@@ -0,0 +1,34 @@
+package com.airjnc.common.dao;
+
+import com.airjnc.common.exception.NotFoundException;
+import java.time.Duration;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class RedisDao {
+
+  private final RedisTemplate<String, String> redisTemplate;
+
+  public Boolean delete(String key) {
+    return redisTemplate.delete(key);
+  }
+
+  public String get(String key) {
+    String value = redisTemplate.opsForValue().get(key);
+    if (value == null) {
+      throw new NotFoundException(this.getClass().getSimpleName(), new Object[]{key});
+    }
+    return value;
+  }
+
+  public void store(String key, String value, Duration timeout) {
+    redisTemplate.opsForValue().set(
+        key,
+        value,
+        timeout
+    );
+  }
+}

src/main/java/com/airjnc/common/properties/NcpCredentialProperties.java

@@ -0,0 +1,17 @@
+package com.airjnc.common.properties;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+
+@Getter
+@RequiredArgsConstructor
+@ConstructorBinding
+@ConfigurationProperties("cloud.naver.credential")
+public class NcpCredentialProperties {
+
+  private final String accessKey;
+
+  private final String secretKey;
+}

src/main/java/com/airjnc/common/properties/SessionTtlProperties.java

@@ -0,0 +1,16 @@
+package com.airjnc.common.properties;
+
+import java.time.Duration;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+
+@Getter
+@RequiredArgsConstructor
+@ConstructorBinding
+@ConfigurationProperties(prefix = "spring.redis.session.ttl")
+public class SessionTtlProperties {
+
+  private final Duration resetPasswordCode;
+}