From 505a3243a7ddf5ecc3d42a7e18a556ef08ed30e3 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Thu, 10 May 2018 01:38:05 -0500
Subject: [PATCH] all store access via service only

---
 app/migrator/migrator.go      | 2 +-
 app/migrator/migrator_test.go | 7 ++++---
 app/migrator/remark.go        | 2 +-
 app/migrator/remark_test.go   | 2 +-
 app/rest/api/import_test.go   | 4 ++--
 app/rest/api/rest_test.go     | 5 +++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/migrator/migrator.go b/app/migrator/migrator.go
index 863f82d2..ef6e6514 100644
--- a/app/migrator/migrator.go
+++ b/app/migrator/migrator.go
@@ -25,7 +25,7 @@ type Exporter interface {
 
 // ImportParams defines everything needed to run import
 type ImportParams struct {
-	DataStore store.Interface
+	DataStore *store.Service
 	InputFile string
 	Provider  string
 	SiteID    string
diff --git a/app/migrator/migrator_test.go b/app/migrator/migrator_test.go
index fbec563b..bc849fba 100644
--- a/app/migrator/migrator_test.go
+++ b/app/migrator/migrator_test.go
@@ -21,9 +21,9 @@ func TestMigrator_ImportDisqus(t *testing.T) {
 	err := ioutil.WriteFile("/tmp/disqus-test.xml", []byte(xmlTest), 0600)
 	require.Nil(t, err)
 
-	dataStore, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: "/tmp/remark-test.db", SiteID: "test"})
+	b, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: "/tmp/remark-test.db", SiteID: "test"})
 	require.Nil(t, err, "create store")
-
+	dataStore := &store.Service{Interface: b}
 	size, err := ImportComments(ImportParams{
 		DataStore: dataStore,
 		InputFile: "/tmp/disqus-test.xml",
@@ -50,8 +50,9 @@ func TestMigrator_ImportRemark(t *testing.T) {
 	err := ioutil.WriteFile("/tmp/disqus-test.r42", []byte(data), 0600)
 	require.Nil(t, err)
 
-	dataStore, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: "/tmp/remark-test.db", SiteID: "radio-t"})
+	b, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: "/tmp/remark-test.db", SiteID: "radio-t"})
 	require.Nil(t, err, "create store")
+	dataStore := &store.Service{Interface: b}
 
 	size, err := ImportComments(ImportParams{
 		DataStore: dataStore,
diff --git a/app/migrator/remark.go b/app/migrator/remark.go
index f7d98b8d..ed7a1a48 100644
--- a/app/migrator/remark.go
+++ b/app/migrator/remark.go
@@ -14,7 +14,7 @@ import (
 
 // Remark implements exporter and importer for internal store format
 type Remark struct {
-	DataStore store.Interface
+	DataStore *store.Service
 }
 
 // Export all comments to writer as json strings. Each comment is one string, separated by "\n"
diff --git a/app/migrator/remark_test.go b/app/migrator/remark_test.go
index f46b2f01..ff20f224 100644
--- a/app/migrator/remark_test.go
+++ b/app/migrator/remark_test.go
@@ -43,7 +43,7 @@ func TestRemark_Import(t *testing.T) {
 	os.Remove(testDb)
 	b, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{SiteID: "radio-t", FileName: testDb})
 	assert.Nil(t, err)
-	r := Remark{DataStore: b}
+	r := Remark{DataStore: &store.Service{Interface: b}}
 	size, err := r.Import(buf, "radio-t")
 	assert.Nil(t, err)
 	assert.Equal(t, 2, size)
diff --git a/app/rest/api/import_test.go b/app/rest/api/import_test.go
index d5045eb9..e0544c5e 100644
--- a/app/rest/api/import_test.go
+++ b/app/rest/api/import_test.go
@@ -33,9 +33,9 @@ func TestImport(t *testing.T) {
 }
 
 func prepImportSrv(t *testing.T) (srv *Import, port int) {
-	dataStore, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: testDb, SiteID: "radio-t"})
+	b, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: testDb, SiteID: "radio-t"})
 	require.Nil(t, err)
-
+	dataStore := &store.Service{Interface: b}
 	srv = &Import{
 		DisqusImporter: &migrator.Disqus{DataStore: dataStore},
 		NativeImporter: &migrator.Remark{DataStore: dataStore},
diff --git a/app/rest/api/rest_test.go b/app/rest/api/rest_test.go
index 44017b2a..493a3d73 100644
--- a/app/rest/api/rest_test.go
+++ b/app/rest/api/rest_test.go
@@ -143,7 +143,7 @@ func TestServer_CreateAndGet(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, "<p><strong>test</strong> <em>123</em> http://radio-t.com</p>\n", comment.Text)
 	assert.Equal(t, store.User{Name: "developer one", ID: "dev",
-		Picture: "/api/v1/avatar/remark.image", Admin: true, Blocked: false, IP: "ae12fe3b5f129b5cc4cdd2b136b7b7947c4d2741"},
+		Picture: "/api/v1/avatar/remark.image", Admin: true, Blocked: false, IP: "ea64bfc178468d943ca5b836e2e700c335404973"},
 		comment.User)
 	t.Logf("%+v", comment)
 }
@@ -456,8 +456,9 @@ func TestServer_FileServer(t *testing.T) {
 }
 
 func prep(t *testing.T) (srv *Rest, port int) {
-	dataStore, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: testDb, SiteID: "radio-t"})
+	b, err := store.NewBoltDB(bolt.Options{}, store.BoltSite{FileName: testDb, SiteID: "radio-t"})
 	require.Nil(t, err)
+	dataStore := &store.Service{Interface: b}
 	srv = &Rest{
 		DataService: store.Service{Interface: dataStore, EditDuration: 5 * time.Minute, MaxCommentSize: 4000},
 		Authenticator: auth.Authenticator{