Merge pull request #356 from urnetwork/create-network-thread-balance-code

Create network thread balance code

Author: stuartwk

api/handlers/subscription_handlers.go

@@ -53,7 +53,7 @@ func SubscriptionCheckBalanceCode(w http.ResponseWriter, r *http.Request) {
 }
 
 func SubscriptionRedeemBalanceCode(w http.ResponseWriter, r *http.Request) {
-	router.WrapWithInputRequireAuth(model.RedeemBalanceCode, w, r)
+	router.WrapWithInputRequireAuth(controller.RedeemBalanceCode, w, r)
 }
 
 func SubscriptionCreatePaymentId(w http.ResponseWriter, r *http.Request) {

connect/connect_proxy_test.go

@@ -6,11 +6,13 @@ import (
 	"context"
 	"net/http"
 	"net/url"
+
 	// "net"
 	"encoding/json"
 	"fmt"
 	"io"
 	"time"
+
 	// "strings"
 	"crypto/tls"
 	mathrand "math/rand"
@@ -192,9 +194,10 @@ func testConnectProxy(t *testing.T) {
 
 			result, err := model.RedeemBalanceCode(
 				&model.RedeemBalanceCodeArgs{
-					Secret: balanceCode.Secret,
+					Secret:    balanceCode.Secret,
+					NetworkId: session.ByJwt.NetworkId,
 				},
-				session,
+				session.Ctx,
 			)
 			assert.Equal(t, nil, err)
 			assert.Equal(t, nil, result.Error)
@@ -312,9 +315,10 @@ func testConnectProxy(t *testing.T) {
 
 			result, err := model.RedeemBalanceCode(
 				&model.RedeemBalanceCodeArgs{
-					Secret: balanceCode.Secret,
+					Secret:    balanceCode.Secret,
+					NetworkId: session.ByJwt.NetworkId,
 				},
-				session,
+				session.Ctx,
 			)
 			assert.Equal(t, nil, err)
 			assert.Equal(t, nil, result.Error)

connect/connect_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/urnetwork/server/jwt"
 	"github.com/urnetwork/server/model"
 	"github.com/urnetwork/server/router"
-	"github.com/urnetwork/server/session"
 )
 
 func TestConnectNoNack(t *testing.T) {
@@ -785,9 +784,10 @@ func testConnect(
 
 	result, err := model.RedeemBalanceCode(
 		&model.RedeemBalanceCodeArgs{
-			Secret: balanceCodeA.Secret,
+			Secret:    balanceCodeA.Secret,
+			NetworkId: networkIdA,
 		},
-		session.NewLocalClientSession(ctx, "0.0.0.0", byJwtA),
+		ctx,
 	)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, nil, result.Error)
@@ -805,9 +805,10 @@ func testConnect(
 
 	result, err = model.RedeemBalanceCode(
 		&model.RedeemBalanceCodeArgs{
-			Secret: balanceCodeB.Secret,
+			Secret:    balanceCodeB.Secret,
+			NetworkId: networkIdB,
 		},
-		session.NewLocalClientSession(ctx, "0.0.0.0", byJwtB),
+		ctx,
 	)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, nil, result.Error)

controller/account_payment_controller_test.go

@@ -72,8 +72,9 @@ func TestSubscriptionSendPayment(t *testing.T) {
 		)
 		assert.Equal(t, err, nil)
 		model.RedeemBalanceCode(&model.RedeemBalanceCodeArgs{
-			Secret: balanceCode.Secret,
-		}, sourceSession)
+			Secret:    balanceCode.Secret,
+			NetworkId: sourceSession.ByJwt.NetworkId,
+		}, ctx)
 
 		transferEscrow, err := model.CreateTransferEscrow(ctx, sourceNetworkId, sourceId, destinationNetworkId, destinationId, 1024*1024)
 		assert.Equal(t, err, nil)

controller/network_controller.go

@@ -22,9 +22,15 @@ func NetworkCreate(
 		return result, nil
 	}
 
-	// model.CreateNetworkReferralCode(session.Ctx, result.Network.NetworkId)
-
-	AddRefreshTransferBalance(session.Ctx, result.Network.NetworkId)
+	/**
+	 * we only add transfer balance if the user is not pro (no balance code redeemed)
+	 *
+	 * redeeming a balance code successfully automatically adds paid transfer balance for the network
+	 */
+	if !result.IsPro {
+		// add regular balance
+		AddRefreshTransferBalance(session.Ctx, result.Network.NetworkId)
+	}
 
 	if networkCreate.ReferralCode != nil {
 		model.CreateNetworkReferral(

controller/network_controller_test.go

@@ -180,3 +180,47 @@ func TestNetworkNameUpdate(t *testing.T) {
 		assert.Equal(t, networkResult.NetworkName, updatedNetworkName)
 	})
 }
+
+func TestNetworkCreateWithBalanceCodeSuccess(t *testing.T) {
+	server.DefaultTestEnv().Run(func() {
+
+		ctx := context.Background()
+		session := session.Testing_CreateClientSession(ctx, nil)
+
+		userAuth := "foo@ur.io"
+		password := "bar123456789Foo!"
+
+		netTransferByteCount := model.ByteCount(1024 * 1024)
+		netRevenue := model.UsdToNanoCents(10.00)
+		subscriptionYearDuration := 365 * 24 * time.Hour
+
+		balanceCode, err := model.CreateBalanceCode(
+			ctx,
+			netTransferByteCount,
+			subscriptionYearDuration,
+			netRevenue,
+			"",
+			"",
+			"",
+		)
+		assert.Equal(t, err, nil)
+
+		networkCreate := model.NetworkCreateArgs{
+			UserName:    "",
+			UserAuth:    &userAuth,
+			Password:    &password,
+			NetworkName: "foobar",
+			Terms:       true,
+			GuestMode:   false,
+			BalanceCode: &balanceCode.Secret,
+		}
+
+		result, err := NetworkCreate(networkCreate, session)
+		assert.Equal(t, err, nil)
+		assert.Equal(t, result.Error, nil)
+
+		isPro := model.IsPro(ctx, &result.Network.NetworkId)
+		assert.Equal(t, isPro, true)
+
+	})
+}

controller/subscription_controller.go

@@ -1054,6 +1054,24 @@ func CreateBalanceCode(
 	}
 }
 
+type RedeemBalanceCodeArgs struct {
+	Secret string `json:"secret"`
+}
+
+func RedeemBalanceCode(
+	redeemBalanceCode RedeemBalanceCodeArgs,
+	session *session.ClientSession,
+) (*model.RedeemBalanceCodeResult, error) {
+
+	return model.RedeemBalanceCode(
+		&model.RedeemBalanceCodeArgs{
+			Secret:    redeemBalanceCode.Secret,
+			NetworkId: session.ByJwt.NetworkId,
+		},
+		session.Ctx,
+	)
+}
+
 // https://developers.google.com/android-publisher/authorization
 func playAuth(ctx context.Context) (string, error) {
 	form := url.Values{}

go.mod

@@ -29,8 +29,8 @@ require (
 	github.com/stripe/stripe-go/v82 v82.5.1
 	github.com/things-go/go-socks5 v0.0.6
 	github.com/tyler-smith/go-bip39 v1.1.0
-	github.com/urnetwork/connect v0.0.0
-	github.com/urnetwork/glog v0.0.0
+	github.com/urnetwork/connect v0.2.0
+	github.com/urnetwork/glog v1.2.9
 	github.com/urnetwork/proxy v0.0.0
 	github.com/urnetwork/sdk v0.0.0
 	golang.org/x/crypto v0.46.0

model/account_payment_model_test.go

@@ -50,8 +50,9 @@ func TestCancelAccountPayment(t *testing.T) {
 
 		assert.Equal(t, err, nil)
 		RedeemBalanceCode(&RedeemBalanceCodeArgs{
-			Secret: balanceCode.Secret,
-		}, sourceSession)
+			Secret:    balanceCode.Secret,
+			NetworkId: sourceNetworkId,
+		}, sourceSession.Ctx)
 
 		transferEscrow, err := CreateTransferEscrow(ctx, sourceNetworkId, sourceId, destinationNetworkId, destinationId, 1024*1024)
 		assert.Equal(t, err, nil)
@@ -163,8 +164,9 @@ func TestGetNetworkProvideStats(t *testing.T) {
 		)
 		assert.Equal(t, err, nil)
 		RedeemBalanceCode(&RedeemBalanceCodeArgs{
-			Secret: balanceCode.Secret,
-		}, sourceSession)
+			Secret:    balanceCode.Secret,
+			NetworkId: sourceSession.ByJwt.NetworkId,
+		}, sourceSession.Ctx)
 
 		// create a wallet to receive the payout
 		args := &CreateAccountWalletExternalArgs{
@@ -298,8 +300,9 @@ func TestPaymentPlanSubsidy(t *testing.T) {
 		)
 		assert.Equal(t, err, nil)
 		RedeemBalanceCode(&RedeemBalanceCodeArgs{
-			Secret: balanceCode.Secret,
-		}, sourceSession)
+			Secret:    balanceCode.Secret,
+			NetworkId: sourceSession.ByJwt.NetworkId,
+		}, sourceSession.Ctx)
 
 		contractIds := GetOpenContractIds(ctx, sourceId, destinationId)
 		assert.Equal(t, len(contractIds), 0)

model/account_point_model_test.go

@@ -205,8 +205,9 @@ func TestAccountPointsPerPayout(t *testing.T) {
 
 		assert.Equal(t, err, nil)
 		RedeemBalanceCode(&RedeemBalanceCodeArgs{
-			Secret: balanceCode.Secret,
-		}, clientSessionC)
+			Secret:    balanceCode.Secret,
+			NetworkId: clientSessionC.ByJwt.NetworkId,
+		}, clientSessionC.Ctx)
 
 		usedTransferByteCount := ByteCount(1024 * 1024 * 1024)