refactor: (#176) Menu → Menus 메소드 명 변경

Team-ComIT · Dec 5, 2022 · 001815a · 001815a
1 parent f97781f
commit 001815a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/...ication/src/main/kotlin/team/comit/simtong/domain/menu/usecase/QueryMenuByMonthUseCase.kt b/...ication/src/main/kotlin/team/comit/simtong/domain/menu/usecase/QueryMenuByMonthUseCase.kt
@@ -27,7 +27,7 @@ class QueryMenuByMonthUseCase(
         val currentUserId = menuSecurityPort.getCurrentUserId()
         val user = queryUserPort.queryUserById(currentUserId) ?: throw UserNotFoundException.EXCEPTION
 
-        val menu = queryMenuPort.queryMenuByMonthAndSpotId(date, user.spotId)
+        val menu = queryMenuPort.queryMenusByMonthAndSpotId(date, user.spotId)
         val result = menu.map { MenuResponse.MenuElement(it.date, it.meal) }
 
         return MenuResponse(result)

diff --git a/...lication/src/main/kotlin/team/comit/simtong/domain/menu/usecase/QueryPublicMenuUseCase.kt b/...lication/src/main/kotlin/team/comit/simtong/domain/menu/usecase/QueryPublicMenuUseCase.kt
@@ -20,7 +20,7 @@ class QueryPublicMenuUseCase(
 ) {
 
     fun execute(date: LocalDate): MenuResponse {
-        val menu = queryMenuPort.queryMenuByMonthAndSpotName(date, Spot.HEAD_SHOP)
+        val menu = queryMenuPort.queryMenusByMonthAndSpotName(date, Spot.HEAD_SHOP)
         val result = menu.map { MenuResponse.MenuElement(it.date, it.meal) }
 
         return MenuResponse(result)

diff --git a/...on/src/test/kotlin/team/comit/simtong/domain/menu/usecase/QueryMenuByMonthUseCaseTests.kt b/...on/src/test/kotlin/team/comit/simtong/domain/menu/usecase/QueryMenuByMonthUseCaseTests.kt
@@ -80,7 +80,7 @@ class QueryMenuByMonthUseCaseTests {
         given(queryUserPort.queryUserById(currentUserId))
             .willReturn(userStub)
 
-        given(queryMenuPort.queryMenuByMonthAndSpotId(now, userStub.spotId))
+        given(queryMenuPort.queryMenusByMonthAndSpotId(now, userStub.spotId))
             .willReturn(
                 listOf(menuStub, menuStub2)
             )

diff --git a/...ion/src/test/kotlin/team/comit/simtong/domain/menu/usecase/QueryPublicMenuUseCaseTests.kt b/...ion/src/test/kotlin/team/comit/simtong/domain/menu/usecase/QueryPublicMenuUseCaseTests.kt
@@ -45,7 +45,7 @@ class QueryPublicMenuUseCaseTests {
     fun `메뉴 조회 성공`() {
         // given
         val now = LocalDate.now()
-        given(queryMenuPort.queryMenuByMonthAndSpotName(now, Spot.HEAD_SHOP))
+        given(queryMenuPort.queryMenusByMonthAndSpotName(now, Spot.HEAD_SHOP))
             .willReturn(
                 listOf(menuStub, menuStub2)
             )

diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt
@@ -15,8 +15,8 @@ import java.util.UUID
  **/
 interface QueryMenuPort {
 
-    fun queryMenuByMonthAndSpotId(date: LocalDate, spotId: UUID): List<Menu>
+    fun queryMenusByMonthAndSpotId(date: LocalDate, spotId: UUID): List<Menu>
 
-    fun queryMenuByMonthAndSpotName(date: LocalDate, spotName: String): List<Menu>
+    fun queryMenusByMonthAndSpotName(date: LocalDate, spotName: String): List<Menu>
 
 }
diff --git a/...rastructure/src/main/kotlin/team/comit/simtong/persistence/menu/MenuPersistenceAdapter.kt b/...rastructure/src/main/kotlin/team/comit/simtong/persistence/menu/MenuPersistenceAdapter.kt
@@ -27,32 +27,30 @@ class MenuPersistenceAdapter(
     private val queryFactory: JPAQueryFactory
 ) : MenuPort {
 
-    override fun queryMenuByMonthAndSpotId(date: LocalDate, spotId: UUID): List<Menu> {
+    override fun queryMenusByMonthAndSpotId(date: LocalDate, spotId: UUID): List<Menu> {
         return queryFactory
             .selectFrom(menuJpaEntity)
             .join(menuJpaEntity.spot, spotJpaEntity)
             .on(spotJpaEntity.id.eq(spotId))
             .where(
                 sameMonthMenuFilter(date)
             )
+            .orderBy(menuJpaEntity.id.date.asc())
             .fetch()
-            .map {
-                menuMapper.toDomain(it)!!
-            }
+            .map { menuMapper.toDomain(it)!! }
     }
 
-    override fun queryMenuByMonthAndSpotName(date: LocalDate, spotName: String): List<Menu> {
+    override fun queryMenusByMonthAndSpotName(date: LocalDate, spotName: String): List<Menu> {
         return queryFactory
             .selectFrom(menuJpaEntity)
             .join(menuJpaEntity.spot, spotJpaEntity)
             .on(spotJpaEntity.name.eq(spotName))
             .where(
                 sameMonthMenuFilter(date)
             )
+            .orderBy(menuJpaEntity.id.date.asc())
             .fetch()
-            .map {
-                menuMapper.toDomain(it)!!
-            }
+            .map { menuMapper.toDomain(it)!! }
     }
 
     private fun sameMonthMenuFilter(date: LocalDate) : BooleanExpression {