refactor: 방, filter, aop 수정 (#243)

* fix: 방 상세 페이지 버그 수정 * refactor: 필터, AOP 수정
team-moabam · Dec 3, 2023 · 8917d5b · 8917d5b
1 parent a4a14ff
commit 8917d5b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 13 deletions.
diff --git a/src/main/java/com/moabam/api/application/room/SearchService.java b/src/main/java/com/moabam/api/application/room/SearchService.java
@@ -328,6 +328,7 @@ private List<TodayCertificateRankResponse> uncompletedMembers(
 		List<TodayCertificateRankResponse> responses = new ArrayList<>();
 
 		List<Long> allMemberIds = participants.stream()
+			.filter(p -> p.getDeletedAt() == null)
 			.map(Participant::getMemberId)
 			.distinct()
 			.collect(Collectors.toList());

diff --git a/src/main/java/com/moabam/global/auth/filter/CorsFilter.java b/src/main/java/com/moabam/global/auth/filter/CorsFilter.java
@@ -37,11 +37,10 @@ public class CorsFilter extends OncePerRequestFilter {
 	@Override
 	protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
 		FilterChain filterChain) throws ServletException, IOException {
-		String refer = httpServletRequest.getHeader("referer");
-		String origin = secureMatch(refer);
+		String refer = getReferer(httpServletRequest);
 
 		try {
-			if (Objects.isNull(origin)) {
+			if (Objects.isNull(refer)) {
 				throw new UnauthorizedException(ErrorMessage.INVALID_REQUEST_URL);
 			}
 		} catch (UnauthorizedException unauthorizedException) {
@@ -51,6 +50,8 @@ protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServl
 			return;
 		}
 
+		String origin = secureMatch(refer);
+
 		httpServletResponse.setHeader("Access-Control-Allow-Origin", origin);
 		httpServletResponse.setHeader("Access-Control-Allow-Methods", ALLOWED_METHOD_NAMES);
 		httpServletResponse.setHeader("Access-Control-Allow-Headers", ALLOWED_HEADERS);
@@ -64,6 +65,10 @@ protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServl
 		filterChain.doFilter(httpServletRequest, httpServletResponse);
 	}
 
+	public String getReferer(HttpServletRequest httpServletRequest) {
+		return httpServletRequest.getHeader("referer");
+	}
+
 	public String secureMatch(String refer) {
 		return allowOriginsConfig.origin().stream().filter(refer::contains).findFirst().orElse(null);
 	}

diff --git a/src/main/java/com/moabam/global/common/util/LogAspect.java b/src/main/java/com/moabam/global/common/util/LogAspect.java
@@ -5,6 +5,8 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 
+import com.moabam.global.error.exception.UnauthorizedException;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Aspect
@@ -17,7 +19,9 @@ public Object printExceptionLog(ProceedingJoinPoint joinPoint) throws Throwable
 		Object[] args = joinPoint.getArgs();
 		Exception exception = (Exception)args[0];
 
-		log.error("===== EXCEPTION LOG =====", exception);
+		if (!(exception instanceof UnauthorizedException)) {
+			log.error("===== EXCEPTION LOG =====", exception);
+		}
 
 		return joinPoint.proceed();
 	}

diff --git a/src/main/java/com/moabam/global/common/util/SystemClockHolder.java b/src/main/java/com/moabam/global/common/util/SystemClockHolder.java
@@ -3,9 +3,11 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 @Component
+@Profile({"dev", "prod"})
 public class SystemClockHolder implements ClockHolder {
 
 	@Override

diff --git a/src/test/java/com/moabam/api/presentation/MemberAuthorizeControllerTest.java b/src/test/java/com/moabam/api/presentation/MemberAuthorizeControllerTest.java
@@ -89,7 +89,7 @@ void setUp() {
 		RestTemplate restTemplate = restTemplateBuilder.build();
 		ReflectionTestUtils.setField(oAuth2AuthorizationServerRequestService, "restTemplate", restTemplate);
 		mockRestServiceServer = MockRestServiceServer.createServer(restTemplate);
-		willReturn("http://localhost").given(corsFilter).secureMatch(any());
+		willReturn("http://localhost").given(corsFilter).getReferer(any());
 	}
 
 	@DisplayName("인가 코드 받기 위한 로그인 페이지 요청")

diff --git a/src/test/java/com/moabam/api/presentation/RoomControllerTest.java b/src/test/java/com/moabam/api/presentation/RoomControllerTest.java
@@ -8,7 +8,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,11 +18,9 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.BDDMockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,7 +48,7 @@
 import com.moabam.api.dto.room.CreateRoomRequest;
 import com.moabam.api.dto.room.EnterRoomRequest;
 import com.moabam.api.dto.room.ModifyRoomRequest;
-import com.moabam.global.common.util.SystemClockHolder;
+import com.moabam.global.common.util.ClockHolder;
 import com.moabam.support.annotation.WithMember;
 import com.moabam.support.common.WithoutFilterSupporter;
 import com.moabam.support.fixture.BugFixture;
@@ -102,8 +99,8 @@ class RoomControllerTest extends WithoutFilterSupporter {
 	@Autowired
 	private InventoryRepository inventoryRepository;
 
-	@SpyBean
-	private SystemClockHolder clockHolder;
+	@Autowired
+	private ClockHolder clockHolder;
 
 	Member member;
 
@@ -431,7 +428,6 @@ void enter_room_with_password_success() throws Exception {
 	@Test
 	void enter_room_with_no_password_success() throws Exception {
 		// given
-		BDDMockito.given(clockHolder.times()).willReturn(LocalDateTime.of(2023, 12, 3, 14, 30, 0));
 		Room room = RoomFixture.room();
 
 		roomRepository.save(room);

diff --git a/src/test/java/com/moabam/support/common/TestClockHolder.java b/src/test/java/com/moabam/support/common/TestClockHolder.java
@@ -0,0 +1,24 @@
+package com.moabam.support.common;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+import com.moabam.global.common.util.ClockHolder;
+
+@Component
+@Profile("test")
+public class TestClockHolder implements ClockHolder {
+
+	@Override
+	public LocalDateTime times() {
+		return LocalDateTime.of(2023, 12, 3, 14, 30, 0);
+	}
+
+	@Override
+	public LocalDate date() {
+		return times().toLocalDate();
+	}
+}
diff --git a/src/test/java/com/moabam/support/common/WithoutFilterSupporter.java b/src/test/java/com/moabam/support/common/WithoutFilterSupporter.java
@@ -36,7 +36,7 @@ public class WithoutFilterSupporter {
 	@BeforeEach
 	void setUpMock() {
 		willReturn("http://localhost:8080")
-			.given(corsFilter).secureMatch(any());
+			.given(corsFilter).getReferer(any());
 
 		willReturn(Optional.of(PathResolver.Path.builder()
 			.uri("/")