diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenter.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenter.kt index a20aacfc..0fb9a689 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenter.kt @@ -70,8 +70,7 @@ object GiftInboxPresenter { if (cards.any { it.direction == GiftInboxDirection.SENT }) add(GiftInboxRow.Notice(false)) val hasReceived = cards.any { it.direction == GiftInboxDirection.RECEIVED } if (hasReceived) add(GiftInboxRow.Notice(true)) - cards.firstOrNull { it.addressRequired }?.let { add(GiftInboxRow.Address(it)) } - addAll(cards.map(GiftInboxRow::Card)) + addAll(cards.map { if (it.addressRequired) GiftInboxRow.Address(it) else GiftInboxRow.Card(it) }) if (hasReceived) add(GiftInboxRow.Inquiry) } } diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenterTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenterTest.kt index 37acfc25..83f4d454 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenterTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftInboxPresenterTest.kt @@ -110,14 +110,14 @@ class GiftInboxPresenterTest { } @Test - fun `혼합 목록은 배너 뒤 서버 카드 순서와 문의를 유지하고 섹션 제목을 만들지 않는다`() { + fun `혼합 목록은 안내 뒤 서버 아이템 순서와 문의를 유지하고 섹션 제목을 만들지 않는다`() { val items = listOf(inboxItem("z"), inboxItem("a", "RECEIVED", "TRACKING_REGISTERED")) val rows = GiftInboxPresenter.toUiModels(items, GiftInboxViewMode.ALL, false) assertEquals( - listOf("NOTICE", "NOTICE", "ADDRESS", "SENT", "RECEIVED", "INQUIRY"), + listOf("NOTICE", "NOTICE", "SENT", "ADDRESS", "INQUIRY"), rows.map { it.type.name } ) - assertEquals(listOf("z", "a"), rows.filterIsInstance().map { it.card.applicationNo }) + assertEquals(listOf("z"), rows.filterIsInstance().map { it.card.applicationNo }) assertEquals("a", rows.filterIsInstance().single().card.applicationNo) } @@ -134,16 +134,52 @@ class GiftInboxPresenterTest { } @Test - fun `배송지 배너는 첫 배송지 입력 필요 선물만 가리킨다`() { + fun `배송지 입력 필요 선물 한 건은 일반 카드 없이 address 아이템으로 표시한다`() { + val rows = GiftInboxPresenter.toUiModels( + listOf(inboxItem("one", "RECEIVED", "TRACKING_REGISTERED")), + GiftInboxViewMode.RECEIVED, + true + ) + + assertEquals( + listOf(GiftInboxRowType.NOTICE, GiftInboxRowType.ADDRESS, GiftInboxRowType.INQUIRY), + rows.map { it.type } + ) + assertEquals("one", rows.filterIsInstance().single().card.applicationNo) + assertTrue(rows.filterIsInstance().isEmpty()) + } + + @Test + fun `배송지 입력 필요 선물 여러 건은 각각 address 아이템으로 표시한다`() { val rows = GiftInboxPresenter.toUiModels( listOf(inboxItem("one", "RECEIVED", "TRACKING_REGISTERED"), inboxItem("two", "RECEIVED", "TRACKING_REGISTERED")), GiftInboxViewMode.ALL, true ) - val banner = rows.filterIsInstance().single() - assertEquals("one", banner.card.applicationNo) - assertEquals(R.string.gift_inbox_address_required, banner.card.status.resId) - assertTrue(banner.card.addressRequired) + + val addresses = rows.filterIsInstance() + assertEquals(listOf("one", "two"), addresses.map { it.card.applicationNo }) + assertTrue(addresses.all { it.card.addressRequired }) + assertTrue(rows.filterIsInstance().isEmpty()) + } + + @Test + fun `배송지 입력 필요와 완료 선물은 서버 순서대로 서로 다른 아이템으로 표시한다`() { + val rows = GiftInboxPresenter.toUiModels( + listOf( + inboxItem("pending", "RECEIVED", "TRACKING_REGISTERED"), + inboxItem("completed", "RECEIVED", "ARRIVED_AT_MAILBOX") + ), + GiftInboxViewMode.RECEIVED, + true + ) + + assertEquals( + listOf(GiftInboxRowType.NOTICE, GiftInboxRowType.ADDRESS, GiftInboxRowType.RECEIVED, GiftInboxRowType.INQUIRY), + rows.map { it.type } + ) + assertEquals("pending", (rows[1] as GiftInboxRow.Address).card.applicationNo) + assertEquals("completed", (rows[2] as GiftInboxRow.Card).card.applicationNo) } private fun rows(mode: GiftInboxViewMode, creator: Boolean) =