From 14242676283fff008f4f5400f6630630ad15483c Mon Sep 17 00:00:00 2001 From: Chemaclass Date: Sun, 5 Mar 2023 23:56:11 +0100 Subject: [PATCH] Rename UserZaps.forProfileFeed() --- .../amethyst/service/model/zaps/UserZaps.kt | 2 +- .../ui/dal/UserProfileZapsFeedFilter.kt | 2 +- .../amethyst/service/zaps/UserZapsTest.kt | 27 ++----------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt index fe5c65304..97747776c 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt @@ -4,7 +4,7 @@ import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.service.model.LnZapEventInterface object UserZaps { - fun groupByUser(zaps: Map?): List> { + fun forProfileFeed(zaps: Map?): List> { if (zaps == null) return emptyList() return (zaps diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt index 0cb2532de..25f0bf42b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt @@ -13,6 +13,6 @@ object UserProfileZapsFeedFilter: FeedFilter>() { } override fun feed(): List> { - return UserZaps.groupByUser(user?.zaps) + return UserZaps.forProfileFeed(user?.zaps) } } diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt b/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt index 001804e7b..1b03f748d 100644 --- a/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt +++ b/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt @@ -18,7 +18,7 @@ class UserZapsTest { @Test fun user_without_zaps() { - val actual = UserZaps.groupByUser(zaps = null) + val actual = UserZaps.forProfileFeed(zaps = null) Assert.assertEquals(emptyList>(), actual) } @@ -32,7 +32,7 @@ class UserZapsTest { zapRequest to mockZapNoteWith("user-1", amount = 200), ) - val actual = UserZaps.groupByUser(zaps) + val actual = UserZaps.forProfileFeed(zaps) Assert.assertEquals(1, actual.count()) Assert.assertEquals(zapRequest, actual.first().first) @@ -42,29 +42,6 @@ class UserZapsTest { ) } - @Test - fun aggregate_zap_amount_group_by_user() { - val zaps: Map = mapOf( - mockk() to mockZapNoteWith("user-1", amount = 100), - mockk() to mockZapNoteWith("user-1", amount = 200), - mockk() to mockZapNoteWith("user-2", amount = 400), - ) - - val actual = UserZaps.groupByUser(zaps) - - Assert.assertEquals(2, actual.count()) - - Assert.assertEquals( - BigDecimal(300), - (actual[0].second.event as LnZapEventInterface).amount() - ) - - Assert.assertEquals( - BigDecimal(400), - (actual[1].second.event as LnZapEventInterface).amount() - ) - } - private fun mockZapNoteWith(pubkey: HexKey, amount: Int): Note { val lnZapEvent = mockk()