Wire cmd command; fix currency ticker for internal payments

oxygenpay · Dec 17, 2023 · c9ed558 · c9ed558
1 parent 2d004fe
commit c9ed558
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/cmd/topup_balance.go b/cmd/topup_balance.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/oxygenpay/oxygen/internal/app"
 	"github.com/oxygenpay/oxygen/internal/money"
+	"github.com/oxygenpay/oxygen/internal/service/processing"
 	"github.com/oxygenpay/oxygen/internal/service/wallet"
 	"github.com/oxygenpay/oxygen/internal/util"
 	"github.com/samber/lo"
@@ -43,6 +44,7 @@ func topupBalance(_ *cobra.Command, _ []string) {
 		blockchainService = service.Locator().BlockchainService()
 		merchantService   = service.Locator().MerchantService()
 		walletService     = service.Locator().WalletService()
+		processingService = service.Locator().ProcessingService()
 		logger            = service.Logger()
 		exit              = func(err error, message string) { logger.Fatal().Err(err).Msg(message) }
 	)
@@ -67,6 +69,9 @@ func topupBalance(_ *cobra.Command, _ []string) {
 		exit(nil, "comment should not be empty")
 	}
 
+	isTest := *topupBalanceArgs.IsTest
+	comment := *topupBalanceArgs.Comment
+
 	// 2. Locate system balance
 	balances, err := walletService.ListAllBalances(ctx, wallet.ListAllBalancesOpts{WithSystemBalances: true})
 	if err != nil {
@@ -75,7 +80,7 @@ func topupBalance(_ *cobra.Command, _ []string) {
 
 	systemBalance, found := lo.Find(balances[wallet.EntityTypeSystem], func(b *wallet.Balance) bool {
 		tickerMatches := b.Currency == currency.Ticker
-		networkMatches := b.NetworkID == currency.ChooseNetwork(*topupBalanceArgs.IsTest)
+		networkMatches := b.NetworkID == currency.ChooseNetwork(isTest)
 
 		return tickerMatches && networkMatches
 	})
@@ -102,7 +107,25 @@ func topupBalance(_ *cobra.Command, _ []string) {
 	// 4. Perform topup
 	logger.Info().Msg("Sending...")
 
-	// todo
+	input := processing.TopupInput{
+		Currency: currency,
+		Amount:   amount,
+		Comment:  comment,
+		IsTest:   isTest,
+	}
+
+	out, err := processingService.TopupMerchantFromSystem(ctx, merchant.ID, input)
+	if err != nil {
+		exit(err, "unable to topup the balance")
+	}
+
+	logger.
+		Info().
+		Int64("payment.id", out.Payment.ID).
+		Int64("tx.id", out.Transaction.ID).
+		Str("tx.usd_amount", out.Transaction.USDAmount.String()).
+		Str("merchant.balance", out.MerchantBalance.Amount.String()).
+		Msg("Done")
 }
 
 func topupBalanceSetup(cmd *cobra.Command) {

diff --git a/internal/service/processing/service_topup.go b/internal/service/processing/service_topup.go
@@ -53,7 +53,7 @@ func (s *Service) TopupMerchantFromSystem(ctx context.Context, merchantID int64,
 	paymentProps := payment.CreateInternalPaymentProps{
 		MerchantOrderUUID: uuid.New(),
 		Money:             in.Amount,
-		Description:       fmt.Sprintf("Internal topup of %s %s (%s)", in.Amount.String(), in.Currency.Ticker, in.Comment),
+		Description:       fmt.Sprintf("*internal* topup of %s %s (%s)", in.Amount.String(), in.Currency.Ticker, in.Comment),
 		IsTest:            in.IsTest,
 	}
 

diff --git a/ui-dashboard/src/components/payment-desc-card/payment-desc-card.tsx b/ui-dashboard/src/components/payment-desc-card/payment-desc-card.tsx
@@ -32,6 +32,15 @@ const emptyState: Payment = {
 
 const b = bevis("payment-desc-card");
 
+const displayPrice = (record: Payment) => {
+    let ticker = record.currency + " ";
+    if (record.currency in CURRENCY_SYMBOL && CURRENCY_SYMBOL[record.currency] !== "") {
+        ticker = CURRENCY_SYMBOL[record.currency];
+    }
+
+    return ticker + record.price;
+};
+
 const PaymentDescCard: React.FC<Props> = ({data, openNotificationFunc}) => {
     React.useEffect(() => {
         if (!data) {
@@ -59,7 +68,7 @@ const PaymentDescCard: React.FC<Props> = ({data, openNotificationFunc}) => {
                             {data.orderId ?? "Not provided"}
                         </Descriptions.Item>
                         <Descriptions.Item span={3} label={<span className={b("item-title")}>Price</span>}>
-                            {`${CURRENCY_SYMBOL[data.currency]}${data.price}`}
+                            {displayPrice(data)}
                         </Descriptions.Item>
                         <Descriptions.Item span={3} label={<span className={b("item-title")}>Description</span>}>
                             {data.description ?? "Not provided"}

diff --git a/ui-dashboard/src/pages/payments-page/payments-page.tsx b/ui-dashboard/src/pages/payments-page/payments-page.tsx
@@ -19,6 +19,15 @@ import PaymentStatusLabel from "src/components/payment-status/payment-status";
 import TimeLabel from "src/components/time-label/time-label";
 import {sleep} from "src/utils";
 
+const displayPrice = (record: Payment) => {
+    let ticker = record.currency + " ";
+    if (record.currency in CURRENCY_SYMBOL && CURRENCY_SYMBOL[record.currency] !== "") {
+        ticker = CURRENCY_SYMBOL[record.currency];
+    }
+
+    return ticker + record.price;
+};
+
 const columns: ColumnsType<Payment> = [
     {
         title: "Created At",
@@ -37,11 +46,7 @@ const columns: ColumnsType<Payment> = [
         dataIndex: "price",
         key: "price",
         width: "min-content",
-        render: (_, record) => (
-            <span style={{whiteSpace: "nowrap"}}>
-                {`${record.currency in CURRENCY_SYMBOL ? CURRENCY_SYMBOL[record.currency] : ""}${record.price}`}
-            </span>
-        )
+        render: (_, record) => <span style={{whiteSpace: "nowrap"}}>{displayPrice(record)}</span>
     },
     {
         title: "Order ID",