cashless2ecash

commit 580fa83b5a22af7188b8ea01e7578a73e86222c2
parent 6dabf9df382fce7fb3253b1ec575d2ca32291a5b
Author: Joel-Haeberli <haebu@rubigen.ch>
Date:   Wed,  8 May 2024 19:16:39 +0200

fix: status api

Diffstat:
M
c2ec/api-bank-integration.go
 | 
6
+++++-
M
c2ec/api-wire-gateway.go
 | 
2
+-
M
c2ec/db.go
 | 
2
+-

3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/c2ec/api-bank-integration.go b/c2ec/api-bank-integration.go
@@ -321,7 +321,11 @@ func getWithdrawalOrError(wopid []byte) ([]byte, int) {
 
 func formatWithdrawalOrErrorStatus(w *Withdrawal) ([]byte, int) {
 
-	operator, err := DB.GetProviderByTerminal(int(*w.TerminalId))
+	if w == nil {
+		return nil, HTTP_INTERNAL_SERVER_ERROR
+	}
+
+	operator, err := DB.GetProviderByTerminal(w.TerminalId)
 	if err != nil {
 		LogError("bank-integration-api", err)
 		return nil, HTTP_INTERNAL_SERVER_ERROR
diff --git a/c2ec/api-wire-gateway.go b/c2ec/api-wire-gateway.go
@@ -79,7 +79,7 @@ func NewIncomingReserveTransaction(w *Withdrawal) *IncomingReserveTransaction {
 		return nil
 	}
 
-	provider, err := DB.GetProviderByTerminal(int(*w.TerminalId))
+	provider, err := DB.GetProviderByTerminal(w.TerminalId)
 	if err != nil {
 		LogError("wire-gateway", err)
 		return nil
diff --git a/c2ec/db.go b/c2ec/db.go
@@ -71,7 +71,7 @@ type Withdrawal struct {
 	SuggestedAmount       *TalerAmountCurrency      `db:"suggested_amount" scan:"follow"`
 	TerminalFees          *TalerAmountCurrency      `db:"terminal_fees" scan:"follow"`
 	WithdrawalStatus      WithdrawalOperationStatus `db:"withdrawal_status"`
-	TerminalId            *int64                    `db:"terminal_id"`
+	TerminalId            int                       `db:"terminal_id"`
 	ProviderTransactionId *string                   `db:"provider_transaction_id"`
 	LastRetryTs           *int64                    `db:"last_retry_ts"`
 	RetryCounter          int32                     `db:"retry_counter"`