Fix: Correct Error Code for expired invoice (#120)

* fix code * enable spv * fixed * standardised some error codes
libsv · Feb 21, 2022 · e7fce3d · e7fce3d
1 parent 7d1b237
commit e7fce3d
Show file tree

Hide file tree

Showing 38 changed files with 2,334 additions and 1,142 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -84,10 +84,10 @@ func main() {
 	c := client.New(client.WithMaxMessageSize(10000), client.WithPongTimeout(360*time.Second))
 	defer c.Close()
 
-	g := e.Group("/")
 	rDeps := internal.SetupRestDeps(cfg, log, db, c)
-	g.Use(middleware.AuthUser(log, rDeps.UserService))
+	e.Use(middleware.AuthUser(log, rDeps.UserService))
 
+	g := e.Group("/")
 	// setup transports
 	internal.SetupHTTPEndpoints(*cfg, rDeps, g)
 

diff --git a/data/sqlite/destinations.go b/data/sqlite/destinations.go
@@ -11,6 +11,7 @@ import (
 	lathos "github.com/theflyingcodr/lathos/errs"
 
 	"github.com/libsv/payd"
+	"github.com/libsv/payd/errcodes"
 	"github.com/libsv/payd/internal"
 )
 
@@ -61,7 +62,7 @@ func (s *sqliteStore) DestinationsCreate(ctx context.Context, args payd.Destinat
 	rows, err := tx.Query(query, sqlArgs...)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, lathos.NewErrNotFound("N0004", "destinations not found, did the create fail?")
+			return nil, lathos.NewErrNotFound(errcodes.ErrDestinationsFailedCreate, "destinations not found, did the create fail?")
 		}
 	}
 	defer func() {
@@ -133,12 +134,12 @@ func (s *sqliteStore) Destinations(ctx context.Context, args payd.DestinationsAr
 	var oo []dbOutput
 	if err := s.db.SelectContext(ctx, &oo, sqlDestinationsByInvoiceID, args.InvoiceID); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, lathos.NewErrNotFound("N0002", fmt.Sprintf("destinations with invoiceID %s not found", args.InvoiceID))
+			return nil, lathos.NewErrNotFound(errcodes.ErrDestinationsNotFound, fmt.Sprintf("destinations with invoiceID %s not found", args.InvoiceID))
 		}
 		return nil, errors.Wrapf(err, "failed to get destinations with invoiceID %s", args.InvoiceID)
 	}
 	if len(oo) == 0 {
-		return nil, lathos.NewErrNotFound("N0002", fmt.Sprintf("destinations with invoiceID %s not found", args.InvoiceID))
+		return nil, lathos.NewErrNotFound(errcodes.ErrDestinationsNotFound, fmt.Sprintf("destinations with invoiceID %s not found", args.InvoiceID))
 	}
 	outs := make([]payd.Output, len(oo))
 	for i := 0; i < len(oo); i++ {

diff --git a/data/sqlite/invoice.go b/data/sqlite/invoice.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/libsv/payd"
+	"github.com/libsv/payd/errcodes"
 	"github.com/pkg/errors"
 	lathos "github.com/theflyingcodr/lathos/errs"
 )
@@ -21,6 +22,7 @@ const (
 	SELECT invoice_id, satoshis, description, spv_required, payment_reference, payment_received_at, expires_at, state, refund_to, refunded_at, created_at, updated_at, deleted_at
 	FROM invoices
 	WHERE invoice_id = :invoice_id
+	AND state != 'deleted'
 	`
 
 	sqlInvoices = `
@@ -48,7 +50,7 @@ func (s *sqliteStore) Invoice(ctx context.Context, args payd.InvoiceArgs) (*payd
 	var resp payd.Invoice
 	if err := s.db.GetContext(ctx, &resp, sqlInvoiceByID, args.InvoiceID); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, lathos.NewErrNotFound("N0001", fmt.Sprintf("invoice with invoiceID %s not found", args.InvoiceID))
+			return nil, lathos.NewErrNotFound(errcodes.ErrInvoiceNotFound, fmt.Sprintf("invoice with invoiceID %s not found", args.InvoiceID))
 		}
 		return nil, errors.Wrapf(err, "failed to get invoice with invoiceID %s", args.InvoiceID)
 	}
@@ -60,7 +62,7 @@ func (s *sqliteStore) Invoices(ctx context.Context) ([]payd.Invoice, error) {
 	var resp []payd.Invoice
 	if err := s.db.SelectContext(ctx, &resp, sqlInvoices); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, lathos.NewErrNotFound("N0002", "no invoices found")
+			return nil, lathos.NewErrNotFound(errcodes.ErrInvoicesNotFound, "no invoices found")
 		}
 		return nil, errors.Wrapf(err, "failed to get invoices")
 	}
@@ -130,7 +132,7 @@ func (s *sqliteStore) InvoiceDelete(ctx context.Context, args payd.InvoiceArgs)
 	}
 	if err := handleNamedExec(tx, sqlInvoiceDelete, delInv); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return lathos.NewErrNotFound("N0003", fmt.Sprintf("invoice with ID %s not found", args.InvoiceID))
+			return lathos.NewErrNotFound(errcodes.ErrInvoiceNotFound, fmt.Sprintf("invoice with ID %s not found", args.InvoiceID))
 		}
 		return errors.Wrapf(err, "failed to delete invoice for invoiceID %s", args.InvoiceID)
 	}

diff --git a/data/sqlite/transaction.go b/data/sqlite/transaction.go
@@ -9,6 +9,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/libsv/go-bt/v2"
 	"github.com/libsv/payd"
+	"github.com/libsv/payd/errcodes"
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 	lathos "github.com/theflyingcodr/lathos/errs"
@@ -102,7 +103,7 @@ func (s *sqliteStore) TransactionCreate(ctx context.Context, req payd.Transactio
 
 	if err = handleNamedExec(tx, sqlInvoiceSetPaid, invUpdate); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return lathos.NewErrNotFound("N0007", fmt.Sprintf("invoiceID '%s' not found when updating payment received info", req.InvoiceID))
+			return lathos.NewErrNotFound(errcodes.ErrInvoiceNotFound, fmt.Sprintf("invoiceID '%s' not found when updating payment received info", req.InvoiceID))
 		}
 	}
 
@@ -171,7 +172,7 @@ func (s *sqliteStore) Tx(ctx context.Context, txID string) (*bt.Tx, error) {
 	}
 	if err := s.db.GetContext(ctx, &txhex, sqlTransactionGet, txID); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			return nil, lathos.NewErrNotFound("T001", fmt.Sprintf("tx '%s' not in store", txID))
+			return nil, lathos.NewErrNotFound(errcodes.ErrTxNotFound, fmt.Sprintf("tx '%s' not in store", txID))
 		}
 		return nil, errors.Wrapf(err, "failed to retrieve transaction for id %s", txID)
 	}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       P4_HOST: "ws://p4:8445/ws"
       MAPI_CALLBACK_HOST: "http://p4:8445"
       PEERCHANNELS_HOST: "peerchannels:25009"
+      WALLET_SPVREQUIRED: 'true'
     healthcheck:
       test: [ "CMD", "curl", "-f", "localhost:8443/api/v1/health" ]
       interval: 30s
@@ -34,6 +35,7 @@ services:
       P4_HOST: "ws://p4-merchant:28445/ws"
       MAPI_CALLBACK_HOST: "http://p4-merchant:28445"
       PEERCHANNELS_HOST: "peerchannels:25009"
+      WALLET_SPVREQUIRED: 'true'
     healthcheck:
       test: [ "CMD", "curl", "-f", "localhost:28443/api/v1/health" ]
       interval: 30s

diff --git a/errcodes/errcodes.go b/errcodes/errcodes.go
@@ -4,4 +4,10 @@ package errcodes
 const (
 	ErrDuplicatePayment = "D1"
 	ErrExpiredPayment   = "E1"
+
+	ErrInvoiceNotFound          = "N0001"
+	ErrInvoicesNotFound         = "N0002"
+	ErrDestinationsNotFound     = "N0003"
+	ErrDestinationsFailedCreate = "N0004"
+	ErrTxNotFound               = "N0005"
 )
diff --git a/go.mod b/go.mod
@@ -65,10 +65,10 @@ require (
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_golang v1.12.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect