diff --git a/selfpayments/src/integrationTest/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepositoryIT.java b/selfpayments/src/integrationTest/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepositoryIT.java index 439c474d..286c5434 100644 --- a/selfpayments/src/integrationTest/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepositoryIT.java +++ b/selfpayments/src/integrationTest/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepositoryIT.java @@ -50,12 +50,6 @@ class SelfPaymentsRepositoryIT { invoicesRepository.save(SettledInvoiceJpaDto.createFromModel(SETTLED_INVOICE_4)); } - @Test - void getSelfPayments() { - assertThat(repository.getAllSelfPayments()).map(SelfPaymentJpaDto::toModel) - .containsExactlyInAnyOrder(SELF_PAYMENT, SELF_PAYMENT_2, SELF_PAYMENT_3, SELF_PAYMENT_4); - } - @Test void getSelfPaymentsToChannel() { assertThat(repository.getSelfPaymentsToChannel(CHANNEL_ID_2.getShortChannelId(), 0)) diff --git a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/SelfPaymentsDao.java b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/SelfPaymentsDao.java index 90b7a3d9..6f1c1a5e 100644 --- a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/SelfPaymentsDao.java +++ b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/SelfPaymentsDao.java @@ -7,8 +7,6 @@ import java.time.Duration; import java.util.List; public interface SelfPaymentsDao { - List getAllSelfPayments(); - List getSelfPaymentsToChannel(ChannelId channelId, Duration maxAge); List getSelfPaymentsFromChannel(ChannelId channelId, Duration maxAge); diff --git a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImpl.java b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImpl.java index 9e6beb3f..cd7b76b2 100644 --- a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImpl.java +++ b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImpl.java @@ -20,11 +20,6 @@ public class SelfPaymentsDaoImpl implements SelfPaymentsDao { this.repository = repository; } - @Override - public List getAllSelfPayments() { - return toModel(repository.getAllSelfPayments()); - } - @Override public List getSelfPaymentsToChannel(ChannelId channelId, Duration maxAge) { long minimumEpochSecond = getMinimumEpochSecond(maxAge); diff --git a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepository.java b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepository.java index be6c8f87..3351bb3e 100644 --- a/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepository.java +++ b/selfpayments/src/main/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsRepository.java @@ -9,12 +9,6 @@ import javax.persistence.Table; import java.util.List; public interface SelfPaymentsRepository extends JpaRepository { - @Query("SELECT NEW de.cotto.lndmanagej.selfpayments.persistence.SelfPaymentJpaDto(i, p) " + - "FROM PaymentJpaDto p " + - "JOIN SettledInvoiceJpaDto i ON p.hash = i.hash " + - "ORDER BY i.settleDate ASC") - List getAllSelfPayments(); - @Query("SELECT NEW de.cotto.lndmanagej.selfpayments.persistence.SelfPaymentJpaDto(i, p) " + "FROM PaymentJpaDto p " + "JOIN SettledInvoiceJpaDto i ON p.hash = i.hash " + diff --git a/selfpayments/src/test/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImplTest.java b/selfpayments/src/test/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImplTest.java index e3103105..2890e53b 100644 --- a/selfpayments/src/test/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImplTest.java +++ b/selfpayments/src/test/java/de/cotto/lndmanagej/selfpayments/persistence/SelfPaymentsDaoImplTest.java @@ -1,8 +1,6 @@ package de.cotto.lndmanagej.selfpayments.persistence; import de.cotto.lndmanagej.invoices.persistence.SettledInvoiceJpaDto; -import de.cotto.lndmanagej.model.Payment; -import de.cotto.lndmanagej.model.SettledInvoice; import de.cotto.lndmanagej.payments.persistence.PaymentJpaDto; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,12 +16,7 @@ import java.time.ZonedDateTime; import java.util.List; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; -import static de.cotto.lndmanagej.model.PaymentFixtures.PAYMENT; -import static de.cotto.lndmanagej.model.PaymentFixtures.PAYMENT_2; import static de.cotto.lndmanagej.model.SelfPaymentFixtures.SELF_PAYMENT; -import static de.cotto.lndmanagej.model.SelfPaymentFixtures.SELF_PAYMENT_2; -import static de.cotto.lndmanagej.model.SettledInvoiceFixtures.SETTLED_INVOICE; -import static de.cotto.lndmanagej.model.SettledInvoiceFixtures.SETTLED_INVOICE_2; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; @@ -46,21 +39,9 @@ class SelfPaymentsDaoImplTest { now = ZonedDateTime.now(ZoneOffset.UTC); } - @Test - void getAllSelfPayments_empty() { - assertThat(selfPaymentsDaoImpl.getAllSelfPayments()).isEmpty(); - } - - @Test - void getAllSelfPayments() { - when(repository.getAllSelfPayments()) - .thenReturn(List.of(getDto(PAYMENT, SETTLED_INVOICE), getDto(PAYMENT_2, SETTLED_INVOICE_2))); - assertThat(selfPaymentsDaoImpl.getAllSelfPayments()).containsExactlyInAnyOrder(SELF_PAYMENT, SELF_PAYMENT_2); - } - @Test void getSelfPaymentsToChannel() { - SelfPaymentJpaDto dto = getDto(PAYMENT, SETTLED_INVOICE); + SelfPaymentJpaDto dto = getDto(); when(repository.getSelfPaymentsToChannel(anyLong(), anyLong())).thenReturn(List.of(dto, dto)); assertThat(selfPaymentsDaoImpl.getSelfPaymentsToChannel(CHANNEL_ID, MAX_AGE)).hasSize(1); } @@ -71,7 +52,7 @@ class SelfPaymentsDaoImplTest { when(repository.getSelfPaymentsToChannel( eq(CHANNEL_ID.getShortChannelId()), longThat(isWithinAFewSeconds(epochSeconds)) - )).thenReturn(List.of(getDto(PAYMENT, SETTLED_INVOICE))); + )).thenReturn(List.of(getDto())); assertThat(selfPaymentsDaoImpl.getSelfPaymentsToChannel(CHANNEL_ID, MAX_AGE)) .containsExactlyInAnyOrder(SELF_PAYMENT); } @@ -82,7 +63,7 @@ class SelfPaymentsDaoImplTest { when(repository.getSelfPaymentsFromChannel( eq(CHANNEL_ID.getShortChannelId()), longThat(isWithinAFewSeconds(epochSeconds)) - )).thenReturn(List.of(getDto(PAYMENT, SETTLED_INVOICE))); + )).thenReturn(List.of(getDto())); assertThat(selfPaymentsDaoImpl.getSelfPaymentsFromChannel(CHANNEL_ID, MAX_AGE)) .containsExactlyInAnyOrder(SELF_PAYMENT); } @@ -92,10 +73,10 @@ class SelfPaymentsDaoImplTest { return value -> Math.abs(value - epochSeconds) < 10_000; } - private SelfPaymentJpaDto getDto(Payment payment, SettledInvoice settledInvoice) { + private SelfPaymentJpaDto getDto() { return new SelfPaymentJpaDto( - SettledInvoiceJpaDto.createFromModel(settledInvoice), - PaymentJpaDto.createFromModel(payment) + SettledInvoiceJpaDto.createFromModel(de.cotto.lndmanagej.model.SettledInvoiceFixtures.SETTLED_INVOICE), + PaymentJpaDto.createFromModel(de.cotto.lndmanagej.model.PaymentFixtures.PAYMENT) ); } }