diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeController.kt similarity index 64% rename from src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeController.kt rename to src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeController.kt index cc7965bf..75477284 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeController.kt @@ -1,10 +1,9 @@ -package kr.co.vividnext.sodalive.v2.creator.channel.adapter.`in`.web +package kr.co.vividnext.sodalive.v2.api.creator.channel.home.adapter.`in`.web import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.member.Member -import kr.co.vividnext.sodalive.v2.creator.channel.application.CreatorChannelHomeQueryService -import kr.co.vividnext.sodalive.v2.creator.channel.dto.CreatorChannelHomeResponse +import kr.co.vividnext.sodalive.v2.api.creator.channel.home.application.CreatorChannelHomeFacade import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController @RestController @RequestMapping("/api/v2/creator-channels") class CreatorChannelHomeController( - private val creatorChannelHomeQueryService: CreatorChannelHomeQueryService + private val creatorChannelHomeFacade: CreatorChannelHomeFacade ) { @GetMapping("/{creatorId}/home") fun getHome( @@ -22,11 +21,9 @@ class CreatorChannelHomeController( @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? ) = run { ApiResponse.ok( - CreatorChannelHomeResponse.from( - creatorChannelHomeQueryService.getHome( - creatorId = creatorId, - viewer = requireMember(member) - ) + creatorChannelHomeFacade.getHome( + creatorId = creatorId, + viewer = requireMember(member) ) ) } diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeControllerTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeControllerTest.kt similarity index 95% rename from src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeControllerTest.kt rename to src/test/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeControllerTest.kt index 284b3c36..90d261d9 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/adapter/in/web/CreatorChannelHomeControllerTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/adapter/in/web/CreatorChannelHomeControllerTest.kt @@ -1,4 +1,4 @@ -package kr.co.vividnext.sodalive.v2.creator.channel.adapter.`in`.web +package kr.co.vividnext.sodalive.v2.api.creator.channel.home.adapter.`in`.web import kr.co.vividnext.sodalive.common.CountryContext import kr.co.vividnext.sodalive.i18n.LangContext @@ -6,8 +6,9 @@ import kr.co.vividnext.sodalive.i18n.SodaMessageSource import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberAdapter import kr.co.vividnext.sodalive.member.MemberRole +import kr.co.vividnext.sodalive.v2.api.creator.channel.home.application.CreatorChannelHomeFacade +import kr.co.vividnext.sodalive.v2.api.creator.channel.home.dto.CreatorChannelHomeResponse import kr.co.vividnext.sodalive.v2.common.domain.CreatorActivityType -import kr.co.vividnext.sodalive.v2.creator.channel.application.CreatorChannelHomeQueryService import kr.co.vividnext.sodalive.v2.creator.channel.domain.CreatorChannelActivity import kr.co.vividnext.sodalive.v2.creator.channel.domain.CreatorChannelAudioContent import kr.co.vividnext.sodalive.v2.creator.channel.domain.CreatorChannelCommunityPost @@ -48,7 +49,7 @@ class CreatorChannelHomeControllerTest @Autowired constructor( private val mockMvc: MockMvc ) { @MockBean - private lateinit var service: CreatorChannelHomeQueryService + private lateinit var facade: CreatorChannelHomeFacade @MockBean private lateinit var countryContext: CountryContext @@ -87,10 +88,10 @@ class CreatorChannelHomeControllerTest @Autowired constructor( } @Test - @DisplayName("크리에이터 채널 홈 조회는 인증 회원과 creatorId를 서비스에 전달하고 성공 응답을 반환한다") + @DisplayName("크리에이터 채널 홈 조회는 인증 회원과 creatorId를 facade에 전달하고 성공 응답을 반환한다") fun shouldReturnCreatorChannelHomeForAuthenticatedMember() { val viewer = createMember(id = 10L) - Mockito.doReturn(createHome()).`when`(service).getHome( + Mockito.doReturn(CreatorChannelHomeResponse.from(createHome())).`when`(facade).getHome( Mockito.eq(1L), Mockito.any(Member::class.java) ?: viewer, Mockito.any(LocalDateTime::class.java) ?: LocalDateTime.now() @@ -134,7 +135,7 @@ class CreatorChannelHomeControllerTest @Autowired constructor( .andExpect(jsonPath("$.data.series[0].isNew").value(true)) .andExpect(jsonPath("$.data.series[0].isOriginal").value(true)) - Mockito.verify(service).getHome( + Mockito.verify(facade).getHome( Mockito.eq(1L), Mockito.eq(viewer) ?: viewer, Mockito.any(LocalDateTime::class.java) ?: LocalDateTime.now()