From 71a47fa135063e298971c25988629323bf1a5d1f Mon Sep 17 00:00:00 2001
From: Aleksandr Trushkin <a-trushkin@yandex-team.ru>
Date: Sun, 4 Feb 2024 21:57:25 +0300
Subject: [PATCH] fix parameter unmarshal

---
 internal/encoding/fbs/helpers.go     | 9 ++++++---
 internal/storage/badger/goodsitem.go | 9 +++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/internal/encoding/fbs/helpers.go b/internal/encoding/fbs/helpers.go
index 4ecbea8..c4d40a7 100644
--- a/internal/encoding/fbs/helpers.go
+++ b/internal/encoding/fbs/helpers.go
@@ -126,9 +126,12 @@ func ParseGoodsItem(data []byte) (item entity.GoodsItem, err error) {
 	item.Cart = itemFBS.Cart()
 	item.Stock = int(itemFBS.Stock())
 	item.Parameters = map[string]string{}
-	err = json.Unmarshal(itemFBS.Parameters(), &item.Parameters)
-	if err != nil {
-		return item, fmt.Errorf("unmarshalling data: %w", err)
+	parameters := itemFBS.Parameters()
+	if len(parameters) > 0 {
+		err = json.Unmarshal(itemFBS.Parameters(), &item.Parameters)
+		if err != nil {
+			return item, fmt.Errorf("unmarshalling data: %w", err)
+		}
 	}
 
 	return item, nil
diff --git a/internal/storage/badger/goodsitem.go b/internal/storage/badger/goodsitem.go
index 8f31a4a..39bf24c 100644
--- a/internal/storage/badger/goodsitem.go
+++ b/internal/storage/badger/goodsitem.go
@@ -31,7 +31,7 @@ func newGoodsItemClient(db *badger.DB, serializeAsJSON bool) *goodsItemClient {
 		s = goodsItemJSONSerializer{}
 	} else {
 		s = goodsItemFlatbufSerializer{}
-	}
+
 	return &goodsItemClient{
 		db: db,
 		s:  s,
@@ -313,7 +313,12 @@ type itemSerializer[T any] interface {
 type goodsItemJSONSerializer struct{}
 
 func (goodsItemJSONSerializer) Serialize(in entity.GoodsItem) ([]byte, error) {
-	return json.Marshal(in)
+	data, err :=  json.Marshal(in)
+	if err != nil {
+	return nil, fmt.Errorf("marshalling data: %w", err)
+	}
+
+	return data, nil
 }
 
 func (goodsItemJSONSerializer) Deserialize(data []byte) (in entity.GoodsItem, err error) {