feat: 회원 탈퇴 사유 저장 로직 추가 및 cors 관련 재설정 (#123)

* refactor: SecurityConfig Cors 관련 전체 허용으로 변경 및 회원 카드 등록 API permitAll 로 변경 (#117) * refactor: 기존 엔티티 관련 리팩토링 (#117) * feat: WithdrawReason 생성 sql 추가 (#117) * feat: WithdrawReason 관련 도메인 구현 (#117) * feat: 회원 탈퇴 시 탈퇴 사유 기능 추가 (#117) * test: 회원 탈퇴 단위 테스트 (#117) * refactor: 회원 탈퇴 API POST 로 수정 (#117) * refactor: 회원탈퇴 관련 통합 테스트 수정 및 요청 DTO 수정 (#117) * refactor: meeting 엔티티명 다시 복구 - 모든 테이블에 `s` 붙이는 방향 논의 필요 (#117) * feat: withdraw_reason 테이블 이름 변경 (#117) * fix: CI 에러 해결 (#117)
depromeet · Jan 19, 2024 · f1ec12a · f1ec12a
1 parent 59f1794
commit f1ec12a
Show file tree

Hide file tree

Showing 17 changed files with 205 additions and 29 deletions.
diff --git a/src/main/java/net/teumteum/core/security/SecurityConfig.java b/src/main/java/net/teumteum/core/security/SecurityConfig.java
@@ -49,7 +49,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
     SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http.csrf(AbstractHttpConfigurer::disable).cors(cors -> cors.configurationSource(corsConfigurationSource()))
             .authorizeHttpRequests(request -> request.requestMatchers(PATTERNS).permitAll()
-                .requestMatchers(HttpMethod.POST, "/users/registers").permitAll()
+                .requestMatchers(HttpMethod.POST, "/users").permitAll()
                 .anyRequest().authenticated()).httpBasic(AbstractHttpConfigurer::disable)
             .formLogin(AbstractHttpConfigurer::disable)
             .sessionManagement(sessionManagement -> sessionManagement.sessionCreationPolicy(STATELESS))
@@ -64,7 +64,7 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
     @Bean
     CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedOrigin("http://localhost:3000");
+        config.addAllowedOrigin("*");
         config.addAllowedHeader("*");
         config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
         config.addExposedHeader("Authorization");

diff --git a/src/main/java/net/teumteum/meeting/domain/Meeting.java b/src/main/java/net/teumteum/meeting/domain/Meeting.java
@@ -1,23 +1,33 @@
 package net.teumteum.meeting.domain;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.PrePersist;
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import net.teumteum.core.entity.TimeBaseEntity;
 import org.springframework.util.Assert;
 
-import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-@Entity
 @Getter
 @Builder
-@NoArgsConstructor
 @AllArgsConstructor
+@Entity(name = "meeting")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Meeting extends TimeBaseEntity {
 
     @Id

diff --git a/src/main/java/net/teumteum/teum_teum/service/TeumTeumService.java b/src/main/java/net/teumteum/teum_teum/service/TeumTeumService.java
@@ -73,11 +73,13 @@ private UserAroundLocationsResponse getUserAroundLocationsResponse(GeoResults<Ge
         int count = 0;
 
         for (GeoResult<GeoLocation<Object>> geoResult : Objects.requireNonNull(geoResults)) {
-            String userSavedTime = String.valueOf(geoResult.getContent().getName()).split(":")[1];
+            String userSavedTime = String.valueOf(geoResult.getContent().getName()).split(":")[5];
             long timestamp = Long.parseLong(userSavedTime);
 
             if (currentTime - timestamp < LOCATION_EXPIRATION.toMillis()) {
-                String userDataJson = String.valueOf(geoResult.getContent().getName()).split(":")[0];
+                String savedUserLocation = String.valueOf(geoResult.getContent().getName());
+                String userDataJson = savedUserLocation.substring(savedUserLocation.lastIndexOf(":") + 1);
+
                 UserData userData = null;
                 try {
                     userData = objectMapper.readValue(userDataJson, UserData.class);

diff --git a/src/main/java/net/teumteum/user/controller/UserController.java b/src/main/java/net/teumteum/user/controller/UserController.java
@@ -9,6 +9,7 @@
 import net.teumteum.core.security.service.SecurityService;
 import net.teumteum.user.domain.request.UserRegisterRequest;
 import net.teumteum.user.domain.request.UserUpdateRequest;
+import net.teumteum.user.domain.request.UserWithdrawRequest;
 import net.teumteum.user.domain.response.FriendsResponse;
 import net.teumteum.user.domain.response.InterestQuestionResponse;
 import net.teumteum.user.domain.response.UserGetResponse;
@@ -20,7 +21,6 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -87,10 +87,10 @@ public InterestQuestionResponse getInterestQuestion(@RequestParam("user-id") Lis
         return userService.getInterestQuestionByUserIds(userIds, balance);
     }
 
-    @DeleteMapping
+    @PostMapping("/withdraw")
     @ResponseStatus(HttpStatus.OK)
-    public void withdraw() {
-        userService.withdraw(getCurrentUserId());
+    public void withdraw(@Valid @RequestBody UserWithdrawRequest request) {
+        userService.withdraw(request, getCurrentUserId());
     }
 
     @PostMapping

diff --git a/src/main/java/net/teumteum/user/domain/User.java b/src/main/java/net/teumteum/user/domain/User.java
@@ -15,6 +15,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -24,9 +25,9 @@
 import org.springframework.util.Assert;
 
 @Getter
-@Entity(name = "users")
-@NoArgsConstructor
 @AllArgsConstructor
+@Entity(name = "users")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class User extends TimeBaseEntity {
 
     @Id

diff --git a/src/main/java/net/teumteum/user/domain/WithdrawReason.java b/src/main/java/net/teumteum/user/domain/WithdrawReason.java
@@ -0,0 +1,26 @@
+package net.teumteum.user.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import net.teumteum.core.entity.TimeBaseEntity;
+
+@Getter
+@AllArgsConstructor
+@Entity(name = "withdraw_reasons")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class WithdrawReason extends TimeBaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "withdraw_reason", nullable = false)
+    private String reason;
+}
diff --git a/src/main/java/net/teumteum/user/domain/WithdrawReasonRepository.java b/src/main/java/net/teumteum/user/domain/WithdrawReasonRepository.java
@@ -0,0 +1,7 @@
+package net.teumteum.user.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface WithdrawReasonRepository extends JpaRepository<WithdrawReason, Long> {
+
+}
diff --git a/src/main/java/net/teumteum/user/domain/request/UserWithdrawRequest.java b/src/main/java/net/teumteum/user/domain/request/UserWithdrawRequest.java
@@ -0,0 +1,22 @@
+package net.teumteum.user.domain.request;
+
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+import net.teumteum.user.domain.WithdrawReason;
+
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public record UserWithdrawRequest(
+    @Size(min = 1, max = 3, message = "탈퇴 사유는 최소 1개, 최대 3개의 입력값입니다.")
+    List<String> withdrawReasons
+) {
+
+    private static final Long IGNORE_ID = null;
+
+    public List<WithdrawReason> toEntity() {
+        return withdrawReasons.stream()
+            .map(withdrawReason -> new WithdrawReason(IGNORE_ID, withdrawReason))
+            .toList();
+    }
+}
diff --git a/src/main/java/net/teumteum/user/service/UserService.java b/src/main/java/net/teumteum/user/service/UserService.java
@@ -10,8 +10,10 @@
 import net.teumteum.user.domain.InterestQuestion;
 import net.teumteum.user.domain.User;
 import net.teumteum.user.domain.UserRepository;
+import net.teumteum.user.domain.WithdrawReasonRepository;
 import net.teumteum.user.domain.request.UserRegisterRequest;
 import net.teumteum.user.domain.request.UserUpdateRequest;
+import net.teumteum.user.domain.request.UserWithdrawRequest;
 import net.teumteum.user.domain.response.FriendsResponse;
 import net.teumteum.user.domain.response.InterestQuestionResponse;
 import net.teumteum.user.domain.response.UserGetResponse;
@@ -28,6 +30,7 @@
 public class UserService {
 
     private final UserRepository userRepository;
+    private final WithdrawReasonRepository withdrawReasonRepository;
     private final InterestQuestion interestQuestion;
     private final RedisService redisService;
     private final JwtService jwtService;
@@ -71,11 +74,13 @@ public void addFriends(Long myId, Long friendId) {
     }
 
     @Transactional
-    public void withdraw(Long userId) {
+    public void withdraw(UserWithdrawRequest request, Long userId) {
         var existUser = getUser(userId);
 
         userRepository.delete(existUser);
         redisService.deleteData(String.valueOf(userId));
+
+        withdrawReasonRepository.saveAll(request.toEntity());
     }
 
     @Transactional

diff --git a/src/main/resources/db/migration/V7__create_withdraw_reason.sql b/src/main/resources/db/migration/V7__create_withdraw_reason.sql
@@ -0,0 +1,8 @@
+create table if not exists withdraw_reason
+(
+    id              bigint       not null auto_increment,
+    withdraw_reason varchar(30)  not null,
+    created_at      timestamp(6) not null,
+    updated_at      timestamp(6) not null,
+    primary key (id)
+);
diff --git a/src/main/resources/db/migration/V8__rename_withdraw_reason.sql b/src/main/resources/db/migration/V8__rename_withdraw_reason.sql
@@ -0,0 +1,10 @@
+drop table withdraw_reason;
+
+create table if not exists withdraw_reasons
+(
+    id              bigint       not null auto_increment,
+    withdraw_reason varchar(30)  not null,
+    created_at      timestamp(6) not null,
+    updated_at      timestamp(6) not null,
+    primary key (id)
+);
diff --git a/src/test/java/net/teumteum/integration/Api.java b/src/test/java/net/teumteum/integration/Api.java
@@ -6,6 +6,7 @@
 import net.teumteum.teum_teum.domain.request.UserLocationRequest;
 import net.teumteum.user.domain.request.UserRegisterRequest;
 import net.teumteum.user.domain.request.UserUpdateRequest;
+import net.teumteum.user.domain.request.UserWithdrawRequest;
 import org.springframework.boot.test.context.TestComponent;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Pageable;
@@ -137,10 +138,12 @@ ResponseSpec reissueJwt(String accessToken, String refreshToken) {
             .exchange();
     }
 
-    ResponseSpec withdrawUser(String accessToken) {
-        return webTestClient.delete()
-            .uri("/users")
+    ResponseSpec withdrawUser(String accessToken, UserWithdrawRequest request) {
+        return webTestClient
+            .post()
+            .uri("/users/withdraw")
             .header(HttpHeaders.AUTHORIZATION, accessToken)
+            .bodyValue(request)
             .exchange();
     }
 

diff --git a/src/test/java/net/teumteum/integration/RequestFixture.java b/src/test/java/net/teumteum/integration/RequestFixture.java
@@ -1,5 +1,6 @@
 package net.teumteum.integration;
 
+import java.util.List;
 import java.util.UUID;
 import net.teumteum.core.security.Authenticated;
 import net.teumteum.user.domain.User;
@@ -8,9 +9,14 @@
 import net.teumteum.user.domain.request.UserRegisterRequest.Terms;
 import net.teumteum.user.domain.request.UserUpdateRequest;
 import net.teumteum.user.domain.request.UserUpdateRequest.NewJob;
+import net.teumteum.user.domain.request.UserWithdrawRequest;
 
 public class RequestFixture {
 
+    public static UserWithdrawRequest userWithdrawRequest(List<String> withdrawReasons) {
+        return new UserWithdrawRequest(withdrawReasons);
+    }
+
     public static UserUpdateRequest userUpdateRequest(User user) {
         return new UserUpdateRequest(user.getId(), "new_name", user.getBirth(), user.getCharacterId(),
             user.getActivityArea(), user.getMbti(), user.getStatus().name(), user.getGoal(), newJob(user),

diff --git a/src/test/java/net/teumteum/integration/UserIntegrationTest.java b/src/test/java/net/teumteum/integration/UserIntegrationTest.java
@@ -240,9 +240,10 @@ void Withdraw_user_info_api() {
 
             loginContext.setUserId(me.getId());
 
-            // when & then
+            var request = RequestFixture.userWithdrawRequest(List.of("쓰지 않는 앱이에요", "오류가 생겨서 쓸 수 없어요"));
 
-            assertThatCode(() -> api.withdrawUser(VALID_TOKEN))
+            // when & then
+            assertThatCode(() -> api.withdrawUser(VALID_TOKEN, request))
                 .doesNotThrowAnyException();
         }
 
@@ -252,8 +253,10 @@ void Return_500_error_if_user_not_exist() {
             // given
             repository.clearUserRepository();
 
+            var request = RequestFixture.userWithdrawRequest(List.of("쓰지 않는 앱이에요", "오류가 생겨서 쓸 수 없어요"));
+
             // when
-            var result = api.withdrawUser(VALID_TOKEN);
+            var result = api.withdrawUser(VALID_TOKEN, request);
 
             // then
             Assertions.assertThat(result.expectStatus().is5xxServerError()

diff --git a/src/test/java/net/teumteum/unit/user/controller/UserControllerTest.java b/src/test/java/net/teumteum/unit/user/controller/UserControllerTest.java
@@ -12,6 +12,8 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
 import net.teumteum.core.security.SecurityConfig;
 import net.teumteum.core.security.filter.JwtAuthenticationFilter;
 import net.teumteum.core.security.service.JwtService;
@@ -22,6 +24,7 @@
 import net.teumteum.user.domain.User;
 import net.teumteum.user.domain.UserFixture;
 import net.teumteum.user.domain.request.UserRegisterRequest;
+import net.teumteum.user.domain.request.UserWithdrawRequest;
 import net.teumteum.user.domain.response.UserRegisterResponse;
 import net.teumteum.user.service.UserService;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,7 +38,6 @@
 import org.springframework.context.annotation.FilterType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
-import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
 @WebMvcTest(value = UserController.class,
     excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = SecurityConfig.class),
@@ -48,8 +50,10 @@
 public class UserControllerTest {
 
     @Autowired
-    private MockMvc mockMvc;
+    ObjectMapper objectMapper;
 
+    @Autowired
+    private MockMvc mockMvc;
     @MockBean
     private UserService userService;
 
@@ -79,7 +83,7 @@ void Register_user_card_with_201_created() throws Exception {
 
             // when & then
             mockMvc.perform(post("/users")
-                    .content(new ObjectMapper().writeValueAsString(request))
+                    .content(objectMapper.writeValueAsString(request))
                     .contentType(APPLICATION_JSON)
                     .with(csrf())
                     .header(AUTHORIZATION, VALID_ACCESS_TOKEN))
@@ -98,7 +102,7 @@ void Register_user_card_with_400_bad_request() throws Exception {
             // when
             // then
             mockMvc.perform(post("/users")
-                    .content(new ObjectMapper().writeValueAsString(request))
+                    .content(objectMapper.writeValueAsString(request))
                     .contentType(APPLICATION_JSON)
                     .with(csrf())
                     .header(AUTHORIZATION, VALID_ACCESS_TOKEN))
@@ -107,4 +111,26 @@ void Register_user_card_with_400_bad_request() throws Exception {
                 .andExpect(jsonPath("$.message").isNotEmpty());
         }
     }
+
+    @Nested
+    @DisplayName("회원 탈퇴 API는")
+    class Withdraw_user_api_unit {
+
+        @Test
+        @DisplayName("회원 탈퇴 사유와 회원 탈퇴 요청이 들어오면, 탈퇴를 진행하고 200 OK을 반환한다.")
+        void Withdraw_user_with_200_ok() throws Exception {
+            // given
+            UserWithdrawRequest request
+                = RequestFixture.userWithdrawRequest(List.of("쓰지 않는 앱이에요", "오류가 생겨서 쓸 수 없어요"));
+
+            // when & then
+            mockMvc.perform(post("/users/withdraw")
+                    .content(new ObjectMapper().writeValueAsString(request))
+                    .contentType(APPLICATION_JSON)
+                    .with(csrf())
+                    .header(AUTHORIZATION, VALID_ACCESS_TOKEN))
+                .andDo(print())
+                .andExpect(status().isOk());
+        }
+    }
 }