Merge pull request #2062 from OpenBazaar/brian.fixmigration

Fix lastDisputeExpiryNotifiedAt error

Author: cpacia

core/profile.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/OpenBazaar/openbazaar-go/ipfs"
 	"github.com/OpenBazaar/openbazaar-go/repo"
 
@@ -361,7 +362,7 @@ func ValidateProfile(profile *pb.Profile) error {
 			}
 		}
 		if profile.ModeratorInfo.Fee != nil {
-			if profile.ModeratorInfo.Fee.FixedFee != nil &&
+			if profile.ModeratorInfo.Fee.FeeType != pb.Moderator_Fee_PERCENTAGE && profile.ModeratorInfo.Fee.FixedFee != nil &&
 				len(profile.ModeratorInfo.Fee.FixedFee.AmountCurrency.Code) > repo.WordMaxCharacters {
 				return fmt.Errorf("moderator fee currency code character length is greater than the max of %d", repo.WordMaxCharacters)
 			}

repo/buyer_order.go

@@ -1,9 +1,10 @@
 package repo
 
 import (
+	"math/big"
+
 	"github.com/OpenBazaar/openbazaar-go/pb"
 	"github.com/golang/protobuf/proto"
-	"math/big"
 )
 
 // ToV5Order scans through the order looking for any deprecated fields and turns them into their v5 counterpart.
@@ -35,6 +36,10 @@ func ToV5Order(order *pb.Order, lookupFunc func(currencyCode string) (CurrencyDe
 		newOrder.Payment.Amount = 0
 	}
 
+	if order.Payment.AmountCurrency == nil && order.Payment.Coin == "" {
+		order.Payment.Coin = "BTC"
+	}
+
 	if order.Payment.Coin != "" && order.Payment.AmountCurrency == nil {
 		def, err := lookupFunc(order.Payment.Coin)
 		if err != nil {
@@ -46,5 +51,6 @@ func ToV5Order(order *pb.Order, lookupFunc func(currencyCode string) (CurrencyDe
 		}
 		newOrder.Payment.Coin = ""
 	}
+
 	return newOrder, nil
 }

repo/buyer_order_test.go

@@ -1,9 +1,10 @@
 package repo
 
 import (
+	"testing"
+
 	"github.com/OpenBazaar/jsonpb"
 	"github.com/OpenBazaar/openbazaar-go/pb"
-	"testing"
 )
 
 func TestToV5Order(t *testing.T) {
@@ -22,7 +23,7 @@ func TestToV5Order(t *testing.T) {
 				RefundFee: 1000,
 				Payment:   &pb.Order_Payment{},
 			},
-			expected: `{"payment":{"method":"ADDRESS_REQUEST"},"bigRefundFee":"1000"}`,
+			expected: `{"payment":{"method":"ADDRESS_REQUEST","amountCurrency":{"code":"BTC","divisibility":8}},"bigRefundFee":"1000"}`,
 		},
 		{
 			name: "item quantity test",
@@ -34,7 +35,7 @@ func TestToV5Order(t *testing.T) {
 				},
 				Payment: &pb.Order_Payment{},
 			},
-			expected: `{"items":[{"bigQuantity":"19"}],"payment":{"method":"ADDRESS_REQUEST"}}`,
+			expected: `{"items":[{"bigQuantity":"19"}],"payment":{"method":"ADDRESS_REQUEST","amountCurrency":{"code":"BTC","divisibility":8}}}`,
 		},
 		{
 			name: "item quantity64 test",
@@ -46,7 +47,7 @@ func TestToV5Order(t *testing.T) {
 				},
 				Payment: &pb.Order_Payment{},
 			},
-			expected: `{"items":[{"bigQuantity":"19"}],"payment":{"method":"ADDRESS_REQUEST"}}`,
+			expected: `{"items":[{"bigQuantity":"19"}],"payment":{"method":"ADDRESS_REQUEST","amountCurrency":{"code":"BTC","divisibility":8}}}`,
 		},
 		{
 			name: "payment amount test",
@@ -55,7 +56,7 @@ func TestToV5Order(t *testing.T) {
 					Amount: 2000,
 				},
 			},
-			expected: `{"payment":{"method":"ADDRESS_REQUEST","bigAmount":"2000"}}`,
+			expected: `{"payment":{"method":"ADDRESS_REQUEST","bigAmount":"2000","amountCurrency":{"code":"BTC","divisibility":8}}}`,
 		},
 		{
 			name: "payment amount currency",
@@ -78,7 +79,6 @@ func TestToV5Order(t *testing.T) {
 		if err != nil {
 			t.Errorf("Test %s marshalling failed: %s", test.name, err)
 		}
-
 		if out != test.expected {
 			t.Errorf("Test %s incorrect output: Expected %s, got %s", test.name, test.expected, out)
 		}

repo/migrations/Migration029.go

@@ -17,6 +17,7 @@ var (
 	AM02_insert_sales      = "INSERT INTO sales SELECT orderID, contract, state, read, timestamp, total, thumbnail, buyerID, buyerHandle, title, shippingName, shippingAddress, paymentAddr, funded, transactions, lastDisputeTimeoutNotifiedAt, coinType, paymentCoin FROM temp_sales;"
 	AM02_drop_temp_sales   = "DROP TABLE temp_sales;"
 
+	AM02_up_update_purchases   = "update purchases set lastDisputeExpiryNotifiedAt = 0 where lastDisputeExpiryNotifiedAt is NULL;"
 	AM02_up_create_purchases   = "create table purchases (orderID text primary key not null, contract blob, state integer, read integer, timestamp integer, total text, thumbnail text, vendorID text, vendorHandle text, title text, shippingName text, shippingAddress text, paymentAddr text, funded integer, transactions blob, lastDisputeTimeoutNotifiedAt integer not null default 0, lastDisputeExpiryNotifiedAt integer not null default 0, disputedAt integer not null default 0, coinType not null default '', paymentCoin not null default '');"
 	AM02_down_create_purchases = "create table purchases (orderID text primary key not null, contract blob, state integer, read integer, timestamp integer, total integer, thumbnail text, vendorID text, vendorHandle text, title text, shippingName text, shippingAddress text, paymentAddr text, funded integer, transactions blob, lastDisputeTimeoutNotifiedAt integer not null default 0, lastDisputeExpiryNotifiedAt integer not null default 0, disputedAt integer not null default 0, coinType not null default '', paymentCoin not null default '');"
 	AM02_temp_purchases        = "ALTER TABLE purchases RENAME TO temp_purchases;"
@@ -56,6 +57,7 @@ func (AM02) Up(repoPath string, dbPassword string, testnet bool) error {
 	}
 
 	upSequence := strings.Join([]string{
+		AM02_up_update_purchases,
 		AM02_temp_sales,
 		AM02_up_create_sales,
 		AM02_insert_sales,

repo/migrations/Migration029_test.go

@@ -24,8 +24,8 @@ var stmt = `PRAGMA key = 'letmein';
 					vendorID text, vendorHandle text, title text,
 					shippingName text, shippingAddress text, paymentAddr text,
 					funded integer, transactions blob,
-					lastDisputeTimeoutNotifiedAt integer not null default 0,
-					lastDisputeExpiryNotifiedAt integer not null default 0,
+					lastDisputeTimeoutNotifiedAt integer default 0,
+					lastDisputeExpiryNotifiedAt integer default 0,
 					disputedAt integer not null default 0, coinType not null default '',
 					paymentCoin not null default '');
 				create table inventory (invID text primary key not null, slug text, variantIndex integer, count integer);`
@@ -52,7 +52,7 @@ func TestMigration029(t *testing.T) {
 	if _, err := db.Exec("INSERT INTO sales (orderID, total) values (?,?)", "asdf", 3); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := db.Exec("INSERT INTO purchases (orderID, total) values (?,?)", "asdf", 3); err != nil {
+	if _, err := db.Exec("INSERT INTO purchases (orderID, total, lastDisputeExpiryNotifiedAt) values (?,?, NULL)", "asdf", 3); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := db.Exec("INSERT INTO inventory (invID, count) values (?,?)", "asdf", "3"); err != nil {