[HOTFIX] stomp 헤더 사용하지 않도록 수정

HongDam-org · Jan 15, 2024 · b4672fd · b4672fd
1 parent c12d25d
commit b4672fd
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 82 deletions.
diff --git a/backend/src/docs/member.adoc b/backend/src/docs/member.adoc
@@ -10,3 +10,6 @@ operation::get duplicate nickname[snippets='http-request,http-response']
 
 === 닉네임으로 멤버 검색
 operation::get member nickname[snippets='http-request,http-response']
+
+=== 닉네임으로 멤버 검색
+operation::get member id[snippets='http-request,http-response']
diff --git a/backend/src/main/java/com/twtw/backend/config/security/SecurityConfig.java b/backend/src/main/java/com/twtw/backend/config/security/SecurityConfig.java
@@ -35,6 +35,7 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
                                                 "auth/save",
                                                 "auth/login",
                                                 "member/duplicate/**",
+                                                "plan/**",
                                                 "actuator/**")
                                         .permitAll()
                                         .anyRequest()

diff --git a/backend/src/main/java/com/twtw/backend/config/socket/StompConfig.java b/backend/src/main/java/com/twtw/backend/config/socket/StompConfig.java
@@ -1,12 +1,9 @@
 package com.twtw.backend.config.socket;
 
 import com.twtw.backend.global.properties.RabbitMQProperties;
-
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.messaging.simp.config.ChannelRegistration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
@@ -20,7 +17,6 @@
 public class StompConfig implements WebSocketMessageBrokerConfigurer {
 
     private final RabbitMQProperties rabbitMQProperties;
-    private final StompHandler stompHandler;
 
     @Override
     public void registerStompEndpoints(final StompEndpointRegistry registry) {
@@ -39,9 +35,4 @@ public void configureMessageBroker(final MessageBrokerRegistry registry) {
 
         registry.setApplicationDestinationPrefixes("/pub");
     }
-
-    @Override
-    public void configureClientInboundChannel(ChannelRegistration registration) {
-        registration.interceptors(stompHandler);
-    }
 }
diff --git a/backend/src/main/java/com/twtw/backend/config/socket/StompHandler.java b/backend/src/main/java/com/twtw/backend/config/socket/StompHandler.java
diff --git a/backend/src/main/java/com/twtw/backend/domain/location/dto/request/LocationRequest.java b/backend/src/main/java/com/twtw/backend/domain/location/dto/request/LocationRequest.java
@@ -4,10 +4,13 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.UUID;
+
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
 public class LocationRequest {
+    private UUID memberId;
     private String nickname;
     private Double longitude;
     private Double latitude;

diff --git a/backend/src/main/java/com/twtw/backend/domain/location/service/LocationService.java b/backend/src/main/java/com/twtw/backend/domain/location/service/LocationService.java
@@ -5,12 +5,10 @@
 import com.twtw.backend.domain.location.dto.response.LocationResponse;
 import com.twtw.backend.domain.location.mapper.LocationMapper;
 import com.twtw.backend.domain.member.entity.Member;
-import com.twtw.backend.domain.member.service.AuthService;
+import com.twtw.backend.domain.member.service.MemberService;
 import com.twtw.backend.domain.plan.entity.Plan;
 import com.twtw.backend.domain.plan.service.PlanService;
-
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,13 +20,13 @@
 public class LocationService {
 
     private final LocationMapper locationMapper;
-    private final AuthService authService;
+    private final MemberService memberService;
     private final PlanService planService;
     private final GeoService geoService;
 
     @Transactional
     public LocationResponse addInfo(final UUID planId, final LocationRequest locationRequest) {
-        final Member member = authService.getMemberByJwt();
+        final Member member = memberService.getMemberById(locationRequest.getMemberId());
         final Plan plan = planService.getPlanEntity(planId);
 
         plan.updateMemberLocation(

diff --git a/backend/src/main/java/com/twtw/backend/domain/member/controller/MemberController.java b/backend/src/main/java/com/twtw/backend/domain/member/controller/MemberController.java
@@ -1,9 +1,9 @@
 package com.twtw.backend.domain.member.controller;
 
 import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse;
+import com.twtw.backend.domain.member.dto.response.IdResponse;
 import com.twtw.backend.domain.member.dto.response.MemberResponse;
 import com.twtw.backend.domain.member.service.MemberService;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,4 +28,9 @@ public ResponseEntity<List<MemberResponse>> searchMemberByNickname(
             @RequestParam(name = "nickname") String nickname) {
         return ResponseEntity.ok(memberService.getMemberByNickname(nickname));
     }
+
+    @GetMapping("/me")
+    public ResponseEntity<IdResponse> getMemberByJwt() {
+        return ResponseEntity.ok(memberService.getMemberId());
+    }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/member/dto/response/IdResponse.java b/backend/src/main/java/com/twtw/backend/domain/member/dto/response/IdResponse.java
@@ -0,0 +1,12 @@
+package com.twtw.backend.domain.member.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.UUID;
+
+@Getter
+@AllArgsConstructor
+public class IdResponse {
+    private UUID id;
+}
diff --git a/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java b/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java
@@ -1,6 +1,7 @@
 package com.twtw.backend.domain.member.service;
 
 import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse;
+import com.twtw.backend.domain.member.dto.response.IdResponse;
 import com.twtw.backend.domain.member.dto.response.MemberResponse;
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.member.mapper.MemberMapper;
@@ -60,4 +61,8 @@ public List<MemberResponse> getMemberResponses(final Plan plan) {
     public List<Member> getMembersByIds(final List<UUID> friendMemberIds) {
         return memberRepository.findAllById(friendMemberIds);
     }
+
+    public IdResponse getMemberId() {
+        return new IdResponse(authService.getMemberByJwt().getId());
+    }
 }
diff --git a/backend/src/test/java/com/twtw/backend/domain/member/controller/MemberControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/member/controller/MemberControllerTest.java
@@ -1,21 +1,10 @@
 package com.twtw.backend.domain.member.controller;
 
-import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentRequest;
-import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentResponse;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.given;
-import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
-import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse;
+import com.twtw.backend.domain.member.dto.response.IdResponse;
 import com.twtw.backend.domain.member.dto.response.MemberResponse;
 import com.twtw.backend.domain.member.service.MemberService;
 import com.twtw.backend.support.docs.RestDocsTest;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -26,6 +15,16 @@
 import java.util.List;
 import java.util.UUID;
 
+import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentRequest;
+import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentResponse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @DisplayName("MemberController의")
 @WebMvcTest(MemberController.class)
 public class MemberControllerTest extends RestDocsTest {
@@ -84,4 +83,31 @@ void searchMemberByNickname() throws Exception {
                                 getDocumentRequest(),
                                 getDocumentResponse()));
     }
+
+    @Test
+    @DisplayName("Member id가 조회되는가")
+    void getMemberId() throws Exception {
+        // given
+        final IdResponse expected = new IdResponse(UUID.randomUUID());
+        given(memberService.getMemberId()).willReturn(expected);
+
+        // when
+        final ResultActions perform =
+                mockMvc.perform(
+                        get("/member/me")
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .header(
+                                        "Authorization",
+                                        "Bearer wefa3fsdczf32.gaoiuergf92.gb5hsa2jgh"));
+
+        // then
+        perform.andExpect(status().isOk());
+
+        perform.andDo(print())
+                .andDo(
+                        document(
+                                "get member id",
+                                getDocumentRequest(),
+                                getDocumentResponse()));
+    }
 }