JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/payments: add cents values to transaction info (#3614)

Browse Source
This commit is contained in:
Yaroslav Vorobiov 2019-11-21 15:23:16 +02:00 committed by GitHub
parent 2030d67650
commit c72c443564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
satellite/console/billinghistoryitem.go
View File

@ -9,16 +9,15 @@ import (
// BillingHistoryItem holds all public information about billing history line.
type BillingHistoryItem struct {
ID string `json:"id"`
Description string `json:"description"`
Amount int64 `json:"amount"`
TokenAmount string `json:"tokenAmount"`
TokenReceived string `json:"tokenReceived"`
Status string `json:"status"`
Link string `json:"link"`
Start time.Time `json:"start"`
End time.Time `json:"end"`
Type BillingHistoryItemType `json:"type"`
ID string `json:"id"`
Description string `json:"description"`
Amount int64 `json:"amount"`
Received int64 `json:"received"`
Status string `json:"status"`
Link string `json:"link"`
Start time.Time `json:"start"`
End time.Time `json:"end"`
Type BillingHistoryItemType `json:"type"`
}
// BillingHistoryItemType indicates type of billing history item.

20
satellite/console/service.go
View File

@ -231,18 +231,18 @@ func (payments PaymentsService) BillingHistory(ctx context.Context) (billingHist
return nil, err
}
for _, tx := range txsInfos {
for _, info := range txsInfos {
billingHistory = append(billingHistory,
&BillingHistoryItem{
ID: tx.ID.String(),
Description: "STORJ Token Deposit",
TokenAmount: tx.Amount.String(),
TokenReceived: tx.Received.String(),
Status: tx.Status.String(),
Link: tx.Link,
Start: tx.CreatedAt,
End: tx.ExpiresAt,
Type: Transaction,
ID: info.ID.String(),
Description: "STORJ Token Deposit",
Amount: info.AmountCents,
Received: info.ReceivedCents,
Status: info.Status.String(),
Link: info.Link,
Start: info.CreatedAt,
End: info.ExpiresAt,
Type: Transaction,
},
)
}

15
satellite/payments/stripecoinpayments/conversion.go Normal file
View File

@ -0,0 +1,15 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
package stripecoinpayments
import (
"math"
"math/big"
)
// convertToCents convert amount to cents with with given rate.
func convertToCents(rate, amount *big.Float) int64 {
f, _ := new(big.Float).Mul(amount, rate).Float64()
return int64(math.Floor(f * 100))
}

6
satellite/payments/stripecoinpayments/service.go
View File

@ -6,7 +6,6 @@ package stripecoinpayments
import (
"context"
"fmt"
"math"
"math/big"
"sync"
"time"
@ -237,10 +236,7 @@ func (service *Service) applyTransactionBalance(ctx context.Context, tx Transact
return err
}
amount := new(big.Float).Mul(rate, &tx.Amount)
f, _ := amount.Float64()
cents := int64(math.Floor(f * 100))
cents := convertToCents(rate, &tx.Received)
params := &stripe.CustomerBalanceTransactionParams{
Amount: stripe.Int64(-cents),

23
satellite/payments/stripecoinpayments/tokens.go
View File

@ -116,16 +116,23 @@ func (tokens *storjTokens) ListTransactionInfos(ctx context.Context, userID uuid
status = payments.TransactionStatus(tx.Status.String())
}
rate, err := tokens.service.db.Transactions().GetLockedRate(ctx, tx.ID)
if err != nil {
return nil, err
}
infos = append(infos,
payments.TransactionInfo{
ID: []byte(tx.ID),
Amount: *payments.TokenAmountFromBigFloat(&tx.Amount),
Received: *payments.TokenAmountFromBigFloat(&tx.Received),
Address: tx.Address,
Status: status,
Link: link,
ExpiresAt: tx.CreatedAt.Add(tx.Timeout),
CreatedAt: tx.CreatedAt,
ID: []byte(tx.ID),
Amount: *payments.TokenAmountFromBigFloat(&tx.Amount),
Received: *payments.TokenAmountFromBigFloat(&tx.Received),
AmountCents: convertToCents(rate, &tx.Amount),
ReceivedCents: convertToCents(rate, &tx.Received),
Address: tx.Address,
Status: status,
Link: link,
ExpiresAt: tx.CreatedAt.Add(tx.Timeout),
CreatedAt: tx.CreatedAt,
},
)
}

18
satellite/payments/tokens.go
View File

@ -61,14 +61,16 @@ type Transaction struct {
// TransactionInfo holds transaction data with additional information
// such as links and expiration time.
type TransactionInfo struct {
ID TransactionID
Amount TokenAmount
Received TokenAmount
Address string
Status TransactionStatus
Link string
ExpiresAt time.Time
CreatedAt time.Time
ID TransactionID
Amount TokenAmount
Received TokenAmount
AmountCents int64
ReceivedCents int64
Address string
Status TransactionStatus
Link string
ExpiresAt time.Time
CreatedAt time.Time
}
// TokenAmount is a wrapper type for STORJ token amount.