From 8808bc69f38a58ac9502c845a87a1a5e0e9a3122 Mon Sep 17 00:00:00 2001
From: Chakib Benziane <chakib.benz@gmail.com>
Date: Sun, 24 Mar 2019 02:00:27 +0100
Subject: [PATCH] use json marshalling

---
 docker-compose.yml      | 4 ++--
 encoding/json.go        | 5 +++++
 storage/upload_model.go | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 encoding/json.go

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a475f4..d3ca3d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.4"
 volumes:
     redis:
     file-storage:
-    sqlite:
+    #sqlite:
     gocache:
 
 services:
@@ -12,7 +12,7 @@ services:
         build: ./docker
         environment:
             - GO111MODULE=on
-            - BIT4SAT_DB_PATH=/sqlite
+            #- BIT4SAT_DB_PATH=/sqlite
             - BIT4SAT_STORAGE_PATH=/storage
             - GOPATH=/go
 
diff --git a/encoding/json.go b/encoding/json.go
new file mode 100644
index 0000000..2818885
--- /dev/null
+++ b/encoding/json.go
@@ -0,0 +1,5 @@
+package encoding
+
+func ToJson(v interface) ([]byte, error) {
+	enc := json.NewEncoder()
+}
diff --git a/storage/upload_model.go b/storage/upload_model.go
index aa43ca2..0d21a95 100644
--- a/storage/upload_model.go
+++ b/storage/upload_model.go
@@ -1,10 +1,10 @@
 package storage
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"git.sp4ke.com/sp4ke/bit4sat/db"
-	"git.sp4ke.com/sp4ke/bit4sat/encoding"
 	"github.com/mediocregopher/radix/v3"
 )
 
@@ -70,7 +70,7 @@ func GetByID(id string) (*Upload, error) {
 	}
 
 	var up Upload
-	err = encoding.FromBytes(buf, &up)
+	err = json.Unmarshal(buf, &up)
 
 	return &up, err
 }
@@ -79,10 +79,10 @@ func (u *Upload) Write() error {
 	// Create a new upload hash upload:id --> [Files]
 	key := fmt.Sprintf("upload:%s", u.ID)
 
-	raw, err := encoding.ToBytes(u)
+	enc, err := json.Marshal(u)
 	if err != nil {
 		return err
 	}
 
-	return DB.Do(radix.FlatCmd(nil, "SET", key, raw))
+	return DB.Do(radix.FlatCmd(nil, "SET", key, enc))
 }