feat(account) register

habinkim · habinkim · commit 686697e65ef2 · 2024-04-28T20:08:56.000+09:00
Register API Query Parameter 추가
- type

Spring Boot Bucket4J Config 설정 완료를 하지 못해 버전 Rollback
diff --git a/build.gradle b/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
-    implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.12.6'
+    implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.10.3'
     implementation 'com.bucket4j:bucket4j-redis:8.10.1'
     implementation 'org.redisson:redisson-spring-boot-starter:3.28.0'
     implementation 'org.zalando:logbook-spring-boot-starter:3.7.2'
@@ -128,7 +128,6 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.14.0'
     implementation 'org.apache.commons:commons-rng-simple:1.5'
     implementation 'commons-io:commons-io:2.16.1'
-    implementation 'io.vavr:vavr:1.0.0-alpha-4'
 
     // API Documentation
     implementation 'com.epages:restdocs-api-spec-mockmvc:0.19.2'
@@ -160,7 +159,6 @@ dependencies {
     testImplementation 'com.icegreen:greenmail-junit5:2.0.1'
     testImplementation 'io.awspring.cloud:spring-cloud-aws-starter-secrets-manager:3.1.0'
 
-    testImplementation 'io.vavr:vavr-test:0.10.4'
     testImplementation 'org.awaitility:awaitility:4.2.1'
     testImplementation 'org.awaitility:awaitility-proxy:3.1.6'
     testImplementation 'org.junit-pioneer:junit-pioneer:2.2.0' // JUnit Extension
diff --git a/src/main/java/com/tune_fun/v1/account/adapter/input/rest/RegisterController.java b/src/main/java/com/tune_fun/v1/account/adapter/input/rest/RegisterController.java
@@ -7,11 +7,13 @@
 import com.tune_fun.v1.common.hexagon.WebAdapter;
 import com.tune_fun.v1.common.response.Response;
 import com.tune_fun.v1.common.response.ResponseMapper;
+import com.tune_fun.v1.vote.adapter.input.rest.RegisterType;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -27,8 +29,8 @@ public class RegisterController {
      * @param<p> {@link AccountCommands.Register} command
      */
     @PostMapping(value = Uris.REGISTER)
-    public ResponseEntity<Response<RegisterResult>> register(@Valid @RequestBody final AccountCommands.Register command) {
-        RegisterResult registerResult = registerUseCase.register(command);
+    public ResponseEntity<Response<RegisterResult>> register(@RequestParam(name = "type") RegisterType type, @Valid @RequestBody final AccountCommands.Register command) {
+        RegisterResult registerResult = registerUseCase.register(type, command);
         return responseMapper.ok(registerResult);
     }
 
diff --git a/src/main/java/com/tune_fun/v1/account/adapter/output/persistence/AccountMapper.java b/src/main/java/com/tune_fun/v1/account/adapter/output/persistence/AccountMapper.java
@@ -13,6 +13,8 @@
 import java.util.Collections;
 import java.util.Set;
 
+import static java.util.Collections.singleton;
+
 @Mapper(
         config = BaseMapperConfig.class,
         imports = {Collections.class, Role.class}
@@ -22,7 +24,7 @@ public abstract class AccountMapper {
     @Mapping(target = "roles", source = "roles", qualifiedByName = "roleValues")
     public abstract CurrentAccount accountInfo(final AccountJpaEntity accountJpaEntity);
 
-    @Mapping(target = "roles", expression = "java(Collections.singletonList(Role.CLIENT_0))")
+    @Mapping(target = "roles", source = "role", qualifiedByName = "roles")
     @Mapping(target = "notificationConfig.voteProgressNotification", source = "voteProgressNotification")
     @Mapping(target = "notificationConfig.voteEndNotification", source = "voteEndNotification")
     @Mapping(target = "notificationConfig.voteDeliveryNotification", source = "voteDeliveryNotification")
@@ -31,6 +33,11 @@ public abstract class AccountMapper {
     @Mapping(target = "roles", source = "roles", qualifiedByName = "roleValues")
     public abstract RegisteredAccount registeredAccountInfo(final AccountJpaEntity accountJpaEntity);
 
+    @Named("roles")
+    public Set<Role> roles(String role) {
+        return singleton(Role.valueOf(role));
+    }
+
     @Named("roleValues")
     public Set<String> roleValues(Set<Role> roles) {
         return Role.roleValues(roles);
diff --git a/src/main/java/com/tune_fun/v1/account/adapter/output/persistence/Role.java b/src/main/java/com/tune_fun/v1/account/adapter/output/persistence/Role.java
@@ -4,7 +4,6 @@
 import lombok.Getter;
 import org.springframework.security.core.GrantedAuthority;
 
-import java.util.List;
 import java.util.Set;
 
 import static java.util.stream.Collectors.toSet;
@@ -13,7 +12,7 @@
 @AllArgsConstructor
 public enum Role implements GrantedAuthority {
 
-    CLIENT_0("ROLE_CLIENT_0"),
+    NORMAL("ROLE_NORMAL"),
     ARTIST("ROLE_ARTIST"),
     ADMIN("ROLE_ADMIN");
 
diff --git a/src/main/java/com/tune_fun/v1/account/application/port/input/usecase/RegisterUseCase.java b/src/main/java/com/tune_fun/v1/account/application/port/input/usecase/RegisterUseCase.java
@@ -2,8 +2,9 @@
 
 import com.tune_fun.v1.account.application.port.input.command.AccountCommands;
 import com.tune_fun.v1.account.domain.value.RegisterResult;
+import com.tune_fun.v1.vote.adapter.input.rest.RegisterType;
 
 @FunctionalInterface
 public interface RegisterUseCase {
-    RegisterResult register(final AccountCommands.Register command);
+    RegisterResult register(RegisterType type, final AccountCommands.Register command);
 }
diff --git a/src/main/java/com/tune_fun/v1/account/application/service/RegisterService.java b/src/main/java/com/tune_fun/v1/account/application/service/RegisterService.java
@@ -13,6 +13,7 @@
 import com.tune_fun.v1.common.exception.CommonApplicationException;
 import com.tune_fun.v1.common.hexagon.UseCase;
 import com.tune_fun.v1.common.util.StringUtil;
+import com.tune_fun.v1.vote.adapter.input.rest.RegisterType;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -35,8 +36,8 @@ public class RegisterService implements RegisterUseCase {
     private final PasswordEncoder passwordEncoder;
 
     @NotNull
-    private static SaveAccount getSaveAccount(AccountCommands.Register command, String encodedPassword) {
-        return new SaveAccount(
+    private static SaveAccount getSaveAccount(final RegisterType type, final AccountCommands.Register command, final String encodedPassword) {
+        return new SaveAccount(type.name(),
                 StringUtil.uuid(), command.username(), encodedPassword,
                 command.email(), command.nickname(), command.notification().voteDeliveryNotification(),
                 command.notification().voteEndNotification(), command.notification().voteDeliveryNotification()
@@ -50,11 +51,11 @@ private static RegisterResult getRegisterResult(CurrentAccount savedAccount, Str
 
     @Override
     @Transactional
-    public RegisterResult register(final AccountCommands.Register command) {
+    public RegisterResult register(final RegisterType type, final AccountCommands.Register command) {
         checkRegisterdAccount(command);
 
         String encodedPassword = passwordEncoder.encode(command.password());
-        SaveAccount saveAccount = getSaveAccount(command, encodedPassword);
+        SaveAccount saveAccount = getSaveAccount(type, command, encodedPassword);
         CurrentAccount savedAccount = saveAccountPort.saveAccount(saveAccount);
 
         String authorities = String.join(",", savedAccount.roles());
diff --git a/src/main/java/com/tune_fun/v1/account/application/service/oauth2/handler/OAuth2AuthenticationSuccessHandler.java b/src/main/java/com/tune_fun/v1/account/application/service/oauth2/handler/OAuth2AuthenticationSuccessHandler.java
@@ -196,7 +196,7 @@ public Optional<RegisteredOAuth2Account> loadRegisteredOAuth2Account(OAuth2UserP
 
     @Transactional
     public CurrentAccount saveBaseAccount(final OAuth2UserPrincipal principal) {
-        SaveAccount saveAccountBehavior = new SaveAccount(StringUtil.uuid(), principal.userInfo().getEmail(),
+        SaveAccount saveAccountBehavior = new SaveAccount("NORMAL", StringUtil.uuid(), principal.userInfo().getEmail(),
                 "social", principal.userInfo().getEmail(), principal.userInfo().getNickname(),
                 true, true, true);
         return saveAccountPort.saveAccount(saveAccountBehavior);
diff --git a/src/main/java/com/tune_fun/v1/account/domain/behavior/SaveAccount.java b/src/main/java/com/tune_fun/v1/account/domain/behavior/SaveAccount.java
@@ -1,6 +1,7 @@
 package com.tune_fun.v1.account.domain.behavior;
 
 public record SaveAccount(
+        String role,
         String uuid,
         String username,
         String password,
diff --git a/src/main/java/com/tune_fun/v1/vote/adapter/input/rest/RegisterType.java b/src/main/java/com/tune_fun/v1/vote/adapter/input/rest/RegisterType.java
@@ -0,0 +1,5 @@
+package com.tune_fun.v1.vote.adapter.input.rest;
+
+public enum RegisterType {
+    NORMAL, ARTIST
+}
diff --git a/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperCustomRepository.java b/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperCustomRepository.java
diff --git a/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperCustomRepositoryImpl.java b/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperCustomRepositoryImpl.java
diff --git a/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperRepository.java b/src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VotePaperRepository.java
@@ -5,7 +5,7 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
-public interface VotePaperRepository extends MongoRepository<VotePaperMongoEntity, String>, VotePaperCustomRepository {
+public interface VotePaperRepository extends MongoRepository<VotePaperMongoEntity, String> {
 
     Optional<VotePaperMongoEntity> findByVoteEndAtBeforeAndAuthor(LocalDateTime voteEndAt, String author);
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -148,4 +148,4 @@ springdoc:
   default-consumes-media-type: application/json;charset=UTF-8
   default-produces-media-type: application/json;charset=UTF-8
   swagger-ui:
-    url: /docs/com.tune_fun-open-api-3.0.1.json
+    url: /docs/com.tune_fun-open-api-3.0.1.json
diff --git a/src/main/resources/application-dev_standalone.yml b/src/main/resources/application-dev_standalone.yml
@@ -149,4 +149,4 @@ springdoc:
   default-consumes-media-type: application/json;charset=UTF-8
   default-produces-media-type: application/json;charset=UTF-8
   swagger-ui:
-    url: /docs/com.tune_fun-open-api-3.0.1.json
+    url: /docs/com.tune_fun-open-api-3.0.1.json
diff --git a/src/main/resources/application-test_standalone.yml b/src/main/resources/application-test_standalone.yml
@@ -101,11 +101,10 @@ event:
   sqs:
     test:
       queue-name: test
-      message-group-id: test
 
 kms:
   jwt-signature-arn:
   encrypt-key-arn:
 
 otp:
-  validity: 3m
+  validity: 3m
diff --git a/src/test/java/com/tune_fun/v1/account/adapter/input/rest/LoginControllerIT.java b/src/test/java/com/tune_fun/v1/account/adapter/input/rest/LoginControllerIT.java
@@ -17,7 +17,7 @@
 
 import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
 import static com.epages.restdocs.apispec.ResourceSnippetParameters.builder;
-import static com.tune_fun.v1.account.adapter.output.persistence.Role.CLIENT_0;
+import static com.tune_fun.v1.account.adapter.output.persistence.Role.NORMAL;
 import static com.tune_fun.v1.base.doc.RestDocsConfig.constraint;
 import static com.tune_fun.v1.common.util.StringUtil.randomAlphaNumericSymbol;
 import static org.hamcrest.Matchers.*;
@@ -55,7 +55,7 @@ void loginSuccess() throws Exception {
                 .andExpect(jsonPath("$.data", notNullValue()))
                 .andExpect(jsonPath("$.data.username", notNullValue()))
                 .andExpect(jsonPath("$.data.roles", allOf(notNullValue(), hasSize(1))))
-                .andExpect(jsonPath("$.data.roles[0]", is(CLIENT_0.getAuthority().split("ROLE_")[1])))
+                .andExpect(jsonPath("$.data.roles[0]", is(NORMAL.getAuthority().split("ROLE_")[1])))
                 .andExpect(jsonPath("$.data.access_token", notNullValue()))
                 .andExpect(jsonPath("$.data.refresh_token", notNullValue()));
 
diff --git a/src/test/java/com/tune_fun/v1/account/adapter/input/rest/RegisterControllerIT.java b/src/test/java/com/tune_fun/v1/account/adapter/input/rest/RegisterControllerIT.java
@@ -14,19 +14,22 @@
 import org.junitpioneer.jupiter.Issue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.restdocs.payload.FieldDescriptor;
+import org.springframework.restdocs.request.ParameterDescriptor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.transaction.annotation.Transactional;
 
 import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
 import static com.epages.restdocs.apispec.ResourceSnippetParameters.builder;
-import static com.tune_fun.v1.account.adapter.output.persistence.Role.CLIENT_0;
+import static com.tune_fun.v1.account.adapter.output.persistence.Role.NORMAL;
 import static com.tune_fun.v1.base.doc.RestDocsConfig.constraint;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
 import static org.springframework.restdocs.payload.PayloadDocumentation.*;
+import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
+import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 
 class RegisterControllerIT extends ControllerBaseTest {
@@ -56,14 +59,15 @@ void registerSuccess() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(
                         post(Uris.REGISTER)
+                                .queryParam("type", "NORMAL")
                                 .content(toJson(command))
                                 .contentType(APPLICATION_JSON_VALUE)
                 )
                 .andExpectAll(baseAssertion(MessageCode.SUCCESS))
                 .andExpect(jsonPath("$.data", notNullValue()))
                 .andExpect(jsonPath("$.data.username", notNullValue()))
                 .andExpect(jsonPath("$.data.roles", allOf(notNullValue(), hasSize(1))))
-                .andExpect(jsonPath("$.data.roles[0]", is(CLIENT_0.getAuthority().split("ROLE_")[1])))
+                .andExpect(jsonPath("$.data.roles[0]", is(NORMAL.getAuthority().split("ROLE_")[1])))
                 .andExpect(jsonPath("$.data.access_token", notNullValue()))
                 .andExpect(jsonPath("$.data.refresh_token", notNullValue()));
 
@@ -72,13 +76,15 @@ void registerSuccess() throws Exception {
                         () -> assertEquals(username, accountInfo.username()),
                         () -> assertTrue(passwordEncoder.matches(password, accountInfo.password())),
                         () -> assertEquals(1, accountInfo.roles().size()),
-                        () -> assertEquals(CLIENT_0.name(), accountInfo.roles().stream().toList().getFirst())
+                        () -> assertEquals(NORMAL.name(), accountInfo.roles().stream().toList().getFirst())
                 ),
                 () -> fail("회원가입 실패")
         );
 
         assertTrue(validateAccessTokenUseCase.validateAccessToken(getAccessToken(resultActions)));
 
+        ParameterDescriptor queryParameterDescriptor = parameterWithName("type").description("회원가입 타입").attributes(constraint("NOT BLANK, NORMAL | ARTIST"));
+
         FieldDescriptor[] requestDescriptors = {
                 fieldWithPath("username").description("아이디").attributes(constraint("NOT BLANK")),
                 fieldWithPath("password").description("비밀번호").attributes(constraint("NOT BLANK")),
@@ -99,10 +105,12 @@ void registerSuccess() throws Exception {
         );
 
         resultActions.andDo(restDocs.document(
+                        queryParameters(queryParameterDescriptor),
                         requestFields(requestDescriptors), responseFields(responseDescriptors),
                         resource(
                                 builder().
                                         description("회원가입").
+                                        queryParameters(queryParameterDescriptor).
                                         requestFields(requestDescriptors).
                                         responseFields(responseDescriptors)
                                         .build()
diff --git a/src/test/java/com/tune_fun/v1/account/adapter/output/persistence/AccountPersistenceAdapterTest.java b/src/test/java/com/tune_fun/v1/account/adapter/output/persistence/AccountPersistenceAdapterTest.java
@@ -523,7 +523,7 @@ void testSaveAccount() {
 
         // Act
         CurrentAccount actualSaveAccountResult = accountPersistenceAdapter
-                .saveAccount(new SaveAccount("01234567-89AB-CDEF-FEDC-BA9876543210", "janedoe", "iloveyou",
+                .saveAccount(new SaveAccount("NORMAL", "01234567-89AB-CDEF-FEDC-BA9876543210", "janedoe", "iloveyou",
                         "jane.doe@example.org", "Nickname", true, true, true));
 
         // Assert
diff --git a/src/test/java/com/tune_fun/v1/dummy/DummyService.java b/src/test/java/com/tune_fun/v1/dummy/DummyService.java
@@ -20,6 +20,7 @@
 import com.tune_fun.v1.otp.domain.behavior.LoadOtp;
 import com.tune_fun.v1.otp.domain.value.CurrentDecryptedOtp;
 import com.tune_fun.v1.otp.domain.value.VerifyResult;
+import com.tune_fun.v1.vote.adapter.input.rest.RegisterType;
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -90,7 +91,7 @@ public void initAccount() throws NoSuchAlgorithmException {
         AccountCommands.Notification notification = new AccountCommands.Notification(true, true, true);
         AccountCommands.Register command = new AccountCommands.Register(defaultUsername, defaultPassword, defaultEmail, nickname, notification);
 
-        registerUseCase.register(command);
+        registerUseCase.register(RegisterType.NORMAL, command);
 
         defaultAccount = accountPersistenceAdapter.loadAccountByUsername(defaultUsername)
                 .orElseThrow(() -> new RuntimeException("initUser 실패"));

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`
`3`	`3`	`import com.tune_fun.v1.account.application.port.input.command.AccountCommands;`
`4`	`4`	`import com.tune_fun.v1.account.domain.value.RegisterResult;`
	`5`	`+import com.tune_fun.v1.vote.adapter.input.rest.RegisterType;`
`5`	`6`
`6`	`7`	`@FunctionalInterface`
`7`	`8`	`public interface RegisterUseCase {`
`8`		`- RegisterResult register(final AccountCommands.Register command);`
	`9`	`+ RegisterResult register(RegisterType type, final AccountCommands.Register command);`
`9`	`10`	`}`