From e596e5227f6e264b550188c90d36cb2b16f7ac64 Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Thu, 22 Nov 2018 11:30:54 +0100
Subject: [PATCH] fix(crm): unmarshal chart, fix page tests

---
 crm/repository/chart.go     | 7 ++++++-
 crm/repository/page_test.go | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/crm/repository/chart.go b/crm/repository/chart.go
index 10e27e1a0..13434f868 100644
--- a/crm/repository/chart.go
+++ b/crm/repository/chart.go
@@ -1,6 +1,8 @@
 package repository
 
 import (
+	"encoding/json"
+
 	"github.com/pkg/errors"
 	"github.com/titpetric/statik/fs"
 
@@ -34,5 +36,8 @@ func (m *module) Chart(r *request.ModuleChart) (interface{}, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "Error when reading "+filename)
 	}
-	return body, err
+
+	var response interface{}
+	err = json.Unmarshal(body, &response)
+	return response, err
 }
diff --git a/crm/repository/page_test.go b/crm/repository/page_test.go
index 941a50ece..726392e43 100644
--- a/crm/repository/page_test.go
+++ b/crm/repository/page_test.go
@@ -78,7 +78,7 @@ func TestPage(t *testing.T) {
 
 		// fetch all pages
 		{
-			ms, err := repository.Find(0)
+			ms, err := repository.FindBySelfID(0)
 			assert(t, err == nil, "Error when retrieving pages: %+v", err)
 			assert(t, len(ms) >= 1, "Expected at least one page, got %d", len(ms))
 			prevPageCount = len(ms)
@@ -86,7 +86,7 @@ func TestPage(t *testing.T) {
 
 		// fetch all pages
 		{
-			ms, err := repository.Find(m.ID)
+			ms, err := repository.FindBySelfID(m.ID)
 			assert(t, err == nil, "Error when retrieving pages: %+v", err)
 			assert(t, len(ms) == 2, "Expected two pages with selfID=%d, got %v", m.ID, spew.Sdump(ms))
 			prevPageCount = len(ms)
@@ -98,7 +98,7 @@ func TestPage(t *testing.T) {
 				err := repository.Reorder(parent, ids)
 				assert(t, err == nil, "Error when reordering pages: %+v", err)
 
-				ms, err = repository.Find(m.ID)
+				ms, err = repository.FindBySelfID(m.ID)
 				assert(t, err == nil, "Error when retrieving pages: %+v", err)
 				assert(t, len(ms) == 2, "Expected two pages with selfID=%d, got %v", m.ID, spew.Sdump(ms))
 				assert(t, ms[0].Weight < ms[1].Weight, "Expected ascending order, %+v", errors.Errorf("%d < %d", ms[0].Weight, ms[1].Weight))
@@ -113,7 +113,7 @@ func TestPage(t *testing.T) {
 
 		// fetch all pages
 		{
-			ms, err := repository.Find(0)
+			ms, err := repository.FindBySelfID(0)
 			assert(t, err == nil, "Error when retrieving pages: %+v", err)
 			assert(t, len(ms) < prevPageCount, "Expected pages count to decrease after deletion, %d < %d", len(ms), prevPageCount)
 		}