From ca33812cb5b83dba0babc244fdf101c78abc046a Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Wed, 20 Jan 2016 08:07:52 -0600
Subject: PLT-7 adding loc db calls for system table

---
 store/sql_store.go             | 8 ++++----
 store/sql_system_store.go      | 7 ++++---
 store/sql_system_store_test.go | 9 +++++----
 store/store.go                 | 6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'store')

diff --git a/store/sql_store.go b/store/sql_store.go
index 92776cd23..40d9c7f5a 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -151,12 +151,12 @@ func NewSqlStore() Store {
 	sqlStore.preference.(*SqlPreferenceStore).DeleteUnusedFeatures(utils.T)
 
 	if model.IsPreviousVersion(schemaVersion) || isSchemaVersion07 || isSchemaVersion10 {
-		sqlStore.system.Update(&model.System{Name: "Version", Value: model.CurrentVersion})
+		sqlStore.system.Update(utils.T, &model.System{Name: "Version", Value: model.CurrentVersion})
 		l4g.Warn("The database schema has been upgraded to version " + model.CurrentVersion)
 	}
 
 	if schemaVersion == "" {
-		sqlStore.system.Save(&model.System{Name: "Version", Value: model.CurrentVersion})
+		sqlStore.system.Save(utils.T, &model.System{Name: "Version", Value: model.CurrentVersion})
 		l4g.Info("The database schema has been set to version " + model.CurrentVersion)
 	}
 
@@ -210,12 +210,12 @@ func (ss SqlStore) GetCurrentSchemaVersion() string {
 }
 
 func (ss SqlStore) MarkSystemRanUnitTests() {
-	if result := <-ss.System().Get(); result.Err == nil {
+	if result := <-ss.System().Get(utils.T); result.Err == nil {
 		props := result.Data.(model.StringMap)
 		unitTests := props[model.SYSTEM_RAN_UNIT_TESTS]
 		if len(unitTests) == 0 {
 			systemTests := &model.System{Name: model.SYSTEM_RAN_UNIT_TESTS, Value: "1"}
-			<-ss.System().Save(systemTests)
+			<-ss.System().Save(utils.T, systemTests)
 		}
 	}
 }
diff --git a/store/sql_system_store.go b/store/sql_system_store.go
index 1fbdfb333..184e8569f 100644
--- a/store/sql_system_store.go
+++ b/store/sql_system_store.go
@@ -5,6 +5,7 @@ package store
 
 import (
 	"github.com/mattermost/platform/model"
+	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
 type SqlSystemStore struct {
@@ -29,7 +30,7 @@ func (s SqlSystemStore) UpgradeSchemaIfNeeded() {
 func (s SqlSystemStore) CreateIndexesIfNotExists() {
 }
 
-func (s SqlSystemStore) Save(system *model.System) StoreChannel {
+func (s SqlSystemStore) Save(T goi18n.TranslateFunc, system *model.System) StoreChannel {
 
 	storeChannel := make(StoreChannel)
 
@@ -47,7 +48,7 @@ func (s SqlSystemStore) Save(system *model.System) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlSystemStore) Update(system *model.System) StoreChannel {
+func (s SqlSystemStore) Update(T goi18n.TranslateFunc, system *model.System) StoreChannel {
 
 	storeChannel := make(StoreChannel)
 
@@ -65,7 +66,7 @@ func (s SqlSystemStore) Update(system *model.System) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlSystemStore) Get() StoreChannel {
+func (s SqlSystemStore) Get(T goi18n.TranslateFunc) StoreChannel {
 
 	storeChannel := make(StoreChannel)
 
diff --git a/store/sql_system_store_test.go b/store/sql_system_store_test.go
index 8ff5445cc..5817f9735 100644
--- a/store/sql_system_store_test.go
+++ b/store/sql_system_store_test.go
@@ -5,6 +5,7 @@ package store
 
 import (
 	"github.com/mattermost/platform/model"
+	"github.com/mattermost/platform/utils"
 	"testing"
 )
 
@@ -12,9 +13,9 @@ func TestSqlSystemStore(t *testing.T) {
 	Setup()
 
 	system := &model.System{Name: model.NewId(), Value: "value"}
-	Must(store.System().Save(system))
+	Must(store.System().Save(utils.T, system))
 
-	result := <-store.System().Get()
+	result := <-store.System().Get(utils.T)
 	systems := result.Data.(model.StringMap)
 
 	if systems[system.Name] != system.Value {
@@ -22,9 +23,9 @@ func TestSqlSystemStore(t *testing.T) {
 	}
 
 	system.Value = "value2"
-	Must(store.System().Update(system))
+	Must(store.System().Update(utils.T, system))
 
-	result2 := <-store.System().Get()
+	result2 := <-store.System().Get(utils.T)
 	systems2 := result2.Data.(model.StringMap)
 
 	if systems2[system.Name] != system.Value {
diff --git a/store/store.go b/store/store.go
index be35c6d59..8f9897857 100644
--- a/store/store.go
+++ b/store/store.go
@@ -162,9 +162,9 @@ type OAuthStore interface {
 }
 
 type SystemStore interface {
-	Save(system *model.System) StoreChannel
-	Update(system *model.System) StoreChannel
-	Get() StoreChannel
+	Save(T goi18n.TranslateFunc, system *model.System) StoreChannel
+	Update(T goi18n.TranslateFunc, system *model.System) StoreChannel
+	Get(T goi18n.TranslateFunc) StoreChannel
 }
 
 type WebhookStore interface {
-- 
cgit v1.2.3-1-g7c22