chore: add tests for self payments

getAlby · Jul 19, 2024 · 3f749bf · 3f749bf
1 parent 22fe5aa
commit 3f749bf
Show file tree

Hide file tree

Showing 9 changed files with 492 additions and 14 deletions.
diff --git a/api/transactions.go b/api/transactions.go
@@ -26,7 +26,7 @@ func (api *api) LookupInvoice(ctx context.Context, paymentHash string) (*LookupI
 	if api.svc.GetLNClient() == nil {
 		return nil, errors.New("LNClient not started")
 	}
-	transaction, err := api.svc.GetTransactionsService().LookupTransaction(ctx, paymentHash, api.svc.GetLNClient(), nil)
+	transaction, err := api.svc.GetTransactionsService().LookupTransaction(ctx, paymentHash, nil, api.svc.GetLNClient(), nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/db/migrations/202407012100_transactions.go b/db/migrations/202407012100_transactions.go
@@ -36,7 +36,8 @@ CREATE TABLE transactions(
 	updated_at datetime,
 	expires_at datetime,
 	settled_at datetime,
-	metadata text
+	metadata text,
+	self_payment boolean
 );
 
 DROP TABLE payments;

diff --git a/db/models.go b/db/models.go
@@ -76,6 +76,7 @@ type Transaction struct {
 	UpdatedAt       time.Time
 	SettledAt       *time.Time
 	Metadata        string
+	SelfPayment     bool
 }
 
 type DBService interface {

diff --git a/nip47/controllers/lookup_invoice_controller.go b/nip47/controllers/lookup_invoice_controller.go
@@ -58,7 +58,7 @@ func (controller *nip47Controller) HandleLookupInvoiceEvent(ctx context.Context,
 		paymentHash = paymentRequest.PaymentHash
 	}
 
-	dbTransaction, err := controller.transactionsService.LookupTransaction(ctx, paymentHash, controller.lnClient, &appId)
+	dbTransaction, err := controller.transactionsService.LookupTransaction(ctx, paymentHash, nil, controller.lnClient, &appId)
 	if err != nil {
 		logger.Logger.WithFields(logrus.Fields{
 			"request_event_id": requestEventId,

diff --git a/nip47/notifications/nip47_notifier.go b/nip47/notifications/nip47_notifier.go
@@ -55,7 +55,8 @@ func (notifier *Nip47Notifier) ConsumeEvent(ctx context.Context, event *events.E
 			return
 		}
 
-		transaction, err := notifier.transactionsService.LookupTransaction(ctx, lnClientTransaction.PaymentHash, notifier.lnClient, nil)
+		transactionType := constants.TRANSACTION_TYPE_INCOMING
+		transaction, err := notifier.transactionsService.LookupTransaction(ctx, lnClientTransaction.PaymentHash, &transactionType, notifier.lnClient, nil)
 		if err != nil {
 			logger.Logger.
 				WithField("paymentHash", lnClientTransaction.PaymentHash).
@@ -79,7 +80,8 @@ func (notifier *Nip47Notifier) ConsumeEvent(ctx context.Context, event *events.E
 			return
 		}
 
-		transaction, err := notifier.transactionsService.LookupTransaction(ctx, paymentSentEventProperties.PaymentHash, notifier.lnClient, nil)
+		transactionType := constants.TRANSACTION_TYPE_OUTGOING
+		transaction, err := notifier.transactionsService.LookupTransaction(ctx, paymentSentEventProperties.PaymentHash, &transactionType, notifier.lnClient, nil)
 		if err != nil {
 			logger.Logger.
 				WithField("paymentHash", paymentSentEventProperties.PaymentHash).

diff --git a/tests/mock_ln_client.go b/tests/mock_ln_client.go
@@ -59,6 +59,7 @@ var MockLNClientTransaction = &MockLNClientTransactions[0]
 type MockLn struct {
 	PayInvoiceResponses []*lnclient.PayInvoiceResponse
 	PayInvoiceErrors    []error
+	Pubkey              string
 }
 
 func NewMockLn() (*MockLn, error) {
@@ -178,5 +179,9 @@ func (mln *MockLn) GetSupportedNIP47NotificationTypes() []string {
 	return []string{"payment_received", "payment_sent"}
 }
 func (mln *MockLn) GetPubkey() string {
+	if mln.Pubkey != "" {
+		return mln.Pubkey
+	}
+
 	return "123pubkey"
 }