Fix migration27 JSON serialization bugs

Author: cpacia

repo/migrations/Migration027.go

@@ -2,6 +2,7 @@ package migrations
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/OpenBazaar/jsonpb"
 	"github.com/OpenBazaar/openbazaar-go/ipfs"
 	"github.com/OpenBazaar/openbazaar-go/pb"
@@ -85,6 +86,41 @@ type (
 	}
 )
 
+func (c *Migration027V5CurrencyValue) MarshalJSON() ([]byte, error) {
+	var value = struct {
+		Amount   string                           `json:"amount"`
+		Currency Migration027V5CurrencyDefinition `json:"currency"`
+	}{
+		Amount:   "0",
+		Currency: c.Currency,
+	}
+	if c.Amount != nil {
+		value.Amount = c.Amount.String()
+	}
+
+	return json.Marshal(value)
+
+}
+
+func (c *Migration027V5CurrencyValue) UnmarshalJSON(b []byte) error {
+	var value struct {
+		Amount   string                           `json:"amount"`
+		Currency Migration027V5CurrencyDefinition `json:"currency"`
+	}
+	err := json.Unmarshal(b, &value)
+	if err != nil {
+		return err
+	}
+	amt, ok := new(big.Int).SetString(value.Amount, 10)
+	if !ok {
+		return fmt.Errorf("invalid amount (%s)", value.Amount)
+	}
+
+	c.Amount = amt
+	c.Currency = value.Currency
+	return err
+}
+
 var divisibilityMap = map[string]uint{
 	"BTC": 8,
 	"BCH": 8,
@@ -93,6 +129,22 @@ var divisibilityMap = map[string]uint{
 }
 
 func parseV5intoV4(v5 Migration027V5ListingIndexData) Migration027V4ListingIndexData {
+	if v5.ModeratorIDs == nil {
+		v5.ModeratorIDs = []string{}
+	}
+	if v5.ShipsTo == nil {
+		v5.ShipsTo = []string{}
+	}
+	if v5.FreeShipping == nil {
+		v5.FreeShipping = []string{}
+	}
+	if v5.Categories == nil {
+		v5.Categories = []string{}
+	}
+	if v5.AcceptedCurrencies == nil {
+		v5.AcceptedCurrencies = []string{}
+	}
+
 	return Migration027V4ListingIndexData{
 		Hash:         v5.Hash,
 		Slug:         v5.Slug,
@@ -132,6 +184,22 @@ func parseV4intoV5(v4 Migration027V4ListingIndexData) Migration027V5ListingIndex
 			Divisibility: divisibility,
 		},
 	}
+	if v4.ModeratorIDs == nil {
+		v4.ModeratorIDs = []string{}
+	}
+	if v4.ShipsTo == nil {
+		v4.ShipsTo = []string{}
+	}
+	if v4.FreeShipping == nil {
+		v4.FreeShipping = []string{}
+	}
+	if v4.Categories == nil {
+		v4.Categories = []string{}
+	}
+	if v4.AcceptedCurrencies == nil {
+		v4.AcceptedCurrencies = []string{}
+	}
+
 	return Migration027V5ListingIndexData{
 		Hash:               v4.Hash,
 		Slug:               v4.Slug,
@@ -222,6 +290,7 @@ func (Migration027) Up(repoPath, databasePassword string, testnetEnabled bool) e
 				continue
 			}
 			metadata := metadataJSON.(map[string]interface{})
+			metadata["version"] = 5
 			itemJSON, itemExists := listing["item"]
 			if !itemExists {
 				continue
@@ -482,6 +551,7 @@ func (Migration027) Down(repoPath, databasePassword string, testnetEnabled bool)
 				continue
 			}
 			metadata := metadataJSON.(map[string]interface{})
+			metadata["version"] = 4
 			itemJSON, itemExists := listing["item"]
 			if !itemExists {
 				continue

repo/migrations/Migration027_test.go

@@ -27,6 +27,7 @@ var (
     "listing": {
         "slug": "Migration027_test_listing",
         "metadata": {
+            "version": 4,
             "contractType": "PHYSICAL_GOOD",
             "format": "FIXED_PRICE",
             "pricingCurrency": "BTC",
@@ -58,13 +59,14 @@ var (
             }
         ]
     },
-    "signature": "2+M/+M866ZaPyqHpBdsqJ9gCgLPNOQoKKtaOrruZmDu6YXhc3RiKQtoZs1BTfC02k8TwfIU5LeFPhxagwC6UAg=="
+    "signature": "HmJCQ+XGPOYgs6GWiBYWAyEi+J8t3yLcuzJlf396hI0isnLdQlffNxPnU/uxw6kqFIFyINYUYkXd/O4QPFpxDg=="
 }`
 
 	preMigration027CryptoListingJSON = `{
     "listing": {
         "slug": "Migration027_test_crypto_listing",
         "metadata": {
+            "version": 4,
             "contractType": "CRYPTOCURRENCY",
             "format": "MARKET_PRICE",
             "coinType": "BAT",
@@ -79,13 +81,14 @@ var (
             ]
         }
     },
-    "signature": "7vmvT69nQQyCmp3Yng7ROWXOiJx0VKGbNRYN8wgGJSqsnRYXC9BEd81t8dd5Mm1wHWK6egGk2rEpct+qWaWdBA=="
+    "signature": "h00CONM6qpY5yC5SRrpWgj/UGKUizLM6FNKLFMP5+feg/BytfmP0On9iZbLr/qoAYWetXfc1WiEuAWXv1vHrAg=="
 }`
 
 	postMigration027ListingJSON = `{
     "listing": {
         "slug": "Migration027_test_listing",
         "metadata": {
+            "version": 5,
             "contractType": "PHYSICAL_GOOD",
             "format": "FIXED_PRICE"
         },
@@ -120,13 +123,14 @@ var (
             }
         ]
     },
-    "signature": "r7j6YM3ePiTRyIKmd9ILMvjvhv5jaAB5m1gMlPJ9ug05KZIfAPXXa+EtuF+ExGvtEOpdyK3BEFpU2rm65CyvDw=="
+    "signature": "TrlzcAflSbJWLJ+efqTIREIeSTFwfCDAWbEMaa6iTSSgvROxgKyGt1fGMfrWleLsjObhIVXJKga5jZVZcIkPDw=="
 }`
 
 	postMigration027CryptoListingJSON = `{
     "listing": {
         "slug": "Migration027_test_crypto_listing",
         "metadata": {
+            "version": 5,
             "contractType": "CRYPTOCURRENCY",
             "format": "MARKET_PRICE",
             "coinType": "BAT",
@@ -141,7 +145,7 @@ var (
             "priceModifier": 50
         }
     },
-    "signature": "37KoDxNC4lYTd8hZQHzgpvJ4GJsXVTUp89D1LhDMapgFUhGmFSsiPAjkgdez7Y9wJ7lfH4ouZRrUcw/81kcCAQ=="
+    "signature": "s0GBGyIYcClzUJ3SgWtRM3l3yi7FE/P52OTf0nTh0M21FKiWJQ8lIDdyUiDDdW8T8l8PLjE/QaToV45ZwlziDQ=="
 }`
 )
 
@@ -305,6 +309,24 @@ func TestMigration027(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	for _, l := range listingIndex {
+		if l.ModeratorIDs == nil {
+			t.Errorf("ModeratorIDs is null")
+		}
+		if l.ShipsTo == nil {
+			t.Errorf("ShipsTo is null")
+		}
+		if l.FreeShipping == nil {
+			t.Errorf("FreeShipping is null")
+		}
+		if l.Categories == nil {
+			t.Errorf("Categories is null")
+		}
+		if l.AcceptedCurrencies == nil {
+			t.Errorf("AcceptedCurrencies is null")
+		}
+	}
+
 	if listingIndex[0].Price.Amount.String() != strconv.Itoa(int(index[0].Price.Amount)) {
 		t.Errorf("Incorrect price set")
 	}
@@ -410,6 +432,24 @@ func TestMigration027(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	for _, l := range listingIndex2 {
+		if l.ModeratorIDs == nil {
+			t.Errorf("ModeratorIDs is null")
+		}
+		if l.ShipsTo == nil {
+			t.Errorf("ShipsTo is null")
+		}
+		if l.FreeShipping == nil {
+			t.Errorf("FreeShipping is null")
+		}
+		if l.Categories == nil {
+			t.Errorf("Categories is null")
+		}
+		if l.AcceptedCurrencies == nil {
+			t.Errorf("AcceptedCurrencies is null")
+		}
+	}
+
 	if listingIndex[0].Price.Amount.String() != strconv.Itoa(int(listingIndex2[0].Price.Amount)) {
 		t.Errorf("Incorrect price set")
 	}