Merge branch 'stagingbranch' into 'master'

Stagingbranch

See merge request !6

.gitignore

@@ -3,7 +3,7 @@
 *.a
 *.so
 
-InstallLogs.txt
+*.txt
 
 # Folders
 _obj
@@ -23,4 +23,6 @@ _testmain.go
 
 *.exe
 *.test
-*.bench
+*.bench
\ No newline at end of file
+
+vendor
\ No newline at end of file

GoGetScript.sh

@@ -5,25 +5,25 @@ NOW=$(date +"%d-%b-%Y %H:%M:%S")
 echo $NOW " : Installed \"github.com/allegro/bigcache\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/spf13/viper\""
-# go get "github.com/spf13/viper"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/spf13/viper\"" >> InstallLogs.txt
+echo "Installing : \"github.com/spf13/viper\""
+go get "github.com/spf13/viper"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/spf13/viper\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/gocraft/dbr\""
-# go get "github.com/gocraft/dbr"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/gocraft/dbr\"" >> InstallLogs.txt
+echo "Installing : \"github.com/gocraft/dbr\""
+go get "github.com/gocraft/dbr"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/gocraft/dbr\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"gopkg.in/mgo.v2\""
-# go get "gopkg.in/mgo.v2"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"gopkg.in/mgo.v2\"" >> InstallLogs.txt
+echo "Installing : \"gopkg.in/mgo.v2\""
+go get "gopkg.in/mgo.v2"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"gopkg.in/mgo.v2\"" >> InstallLogs.txt
 
 
 echo "Installing : \"github.com/garyburd/redigo/redis\""
@@ -33,25 +33,25 @@ NOW=$(date +"%d-%b-%Y %H:%M:%S")
 echo $NOW " : Installed \"github.com/garyburd/redigo/redis\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/stretchr/testify/assert\""
-# go get "github.com/stretchr/testify/assert"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/stretchr/testify/assert\"" >> InstallLogs.txt
+echo "Installing : \"github.com/stretchr/testify/assert\""
+go get "github.com/stretchr/testify/assert"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/stretchr/testify/assert\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/labstack/echo\""
-# go get "github.com/labstack/echo"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/labstack/echo\"" >> InstallLogs.txt
+echo "Installing : \"github.com/labstack/echo\""
+go get "github.com/labstack/echo"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/labstack/echo\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"gopkg.in/mgo.v2/bson\""
-# go get "gopkg.in/mgo.v2/bson"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"gopkg.in/mgo.v2/bson\"" >> InstallLogs.txt
+echo "Installing : \"gopkg.in/mgo.v2/bson\""
+go get "gopkg.in/mgo.v2/bson"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"gopkg.in/mgo.v2/bson\"" >> InstallLogs.txt
 
 
 echo "Installing : \"github.com/dgrijalva/jwt-go\""
@@ -61,32 +61,32 @@ NOW=$(date +"%d-%b-%Y %H:%M:%S")
 echo $NOW " : Installed \"github.com/dgrijalva/jwt-go\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/labstack/echo/middleware\""
-# go get "github.com/labstack/echo/middleware"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/labstack/echo/middleware\"" >> InstallLogs.txt
+echo "Installing : \"github.com/labstack/echo/middleware\""
+go get "github.com/labstack/echo/middleware"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/labstack/echo/middleware\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/sirupsen/logrus\""
-# go get "github.com/sirupsen/logrus"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/sirupsen/logrus\"" >> InstallLogs.txt
+echo "Installing : \"github.com/sirupsen/logrus\""
+go get "github.com/sirupsen/logrus"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/sirupsen/logrus\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"github.com/go-playground/locales/en\""
-# go get "github.com/go-playground/locales/en"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"github.com/go-playground/locales/en\"" >> InstallLogs.txt
+echo "Installing : \"github.com/go-playground/locales/en\""
+go get "github.com/go-playground/locales/en"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"github.com/go-playground/locales/en\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"gopkg.in/go-playground/validator.v9\""
-# go get "gopkg.in/go-playground/validator.v9"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"gopkg.in/go-playground/validator.v9\"" >> InstallLogs.txt
+echo "Installing : \"gopkg.in/go-playground/validator.v9\""
+go get "gopkg.in/go-playground/validator.v9"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"gopkg.in/go-playground/validator.v9\"" >> InstallLogs.txt
 
 
 echo "Installing : \"github.com/go-playground/universal-translator\""
@@ -96,17 +96,17 @@ NOW=$(date +"%d-%b-%Y %H:%M:%S")
 echo $NOW " : Installed \"github.com/go-playground/universal-translator\"" >> InstallLogs.txt
 
 
-# echo "Installing : \"gopkg.in/go-playground/validator.v9/translations/en\""
-# go get "gopkg.in/go-playground/validator.v9/translations/en"
-# echo "Done"
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo $NOW " : Installed \"gopkg.in/go-playground/validator.v9/translations/en\"" >> InstallLogs.txt
+echo "Installing : \"gopkg.in/go-playground/validator.v9/translations/en\""
+go get "gopkg.in/go-playground/validator.v9/translations/en"
+echo "Done"
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo $NOW " : Installed \"gopkg.in/go-playground/validator.v9/translations/en\"" >> InstallLogs.txt
 
-# echo "******************************************"
-# echo "Installation complete"
-# echo "******************************************"
+echo "******************************************"
+echo "Installation complete"
+echo "******************************************"
 
-# NOW=$(date +"%d-%b-%Y %H:%M:%S")
-# echo "******************************************" >> InstallLogs.txt
-# echo $NOW "Installation complete" >> InstallLogs.txt
-# echo "******************************************" >> InstallLogs.txt
+NOW=$(date +"%d-%b-%Y %H:%M:%S")
+echo "******************************************" >> InstallLogs.txt
+echo $NOW "Installation complete" >> InstallLogs.txt
+echo "******************************************" >> InstallLogs.txt
\ No newline at end of file

InstallLogs.txt

@@ -10,3 +10,7 @@
 20-Jun-2017 12:37:47  : Installed "github.com/labstack/echo/middleware"
 20-Jun-2017 12:39:04  : Installed "github.com/sirupsen/logrus"
 20-Jun-2017 12:53:39  : Installed "github.com/allegro/bigcache"
+22-Jun-2017 13:45:25  : Installed "github.com/allegro/bigcache"
+22-Jun-2017 13:45:26  : Installed "github.com/garyburd/redigo/redis"
+22-Jun-2017 13:45:26  : Installed "github.com/dgrijalva/jwt-go"
+22-Jun-2017 13:45:53  : Installed "github.com/go-playground/universal-translator"

cacheHelper.go

-package coreos
-
-import (
-	"GolangFullStack/server/api/server/config"
-	"fmt"
-	"time"
-
-	"github.com/allegro/bigcache"
-)
-
-var bigcacheConfig = bigcache.Config{
-	// number of shards (must be a power of 2)
-	// Shards: 4096,
-	Shards: config.BIGCACHEShards,
-	// time after which entry can be evicted
-	LifeWindow: config.BIGCACHELifeWindow * time.Hour,
-	// rps * lifeWindow, used only in initial memory allocation
-	MaxEntriesInWindow: 1000 * 10 * 60,
-	// MaxEntriesInWindow: 10,
-	// max entry size in bytes, used only in initial memory allocation
-	MaxEntrySize: config.BIGCACHEMaxEntrySize,
-	// prints information about additional memory allocation
-	Verbose: config.BIGCACHEVerbose,
-	// cache will not allocate more memory than this limit, value in MB
-	// if value is reached then the oldest entries can be overridden for the new ones
-	// 0 value means no size limit
-	HardMaxCacheSize: config.BIGCACHEHardMaxCacheSize,
-	// callback fired when the oldest entry is removed because of its
-	// expiration time or no space left for the new entry. Default value is nil which
-	// means no callback and it prevents from unwrapping the oldest entry.
-	OnRemove: nil,
-}
-
-var cache, initErr = bigcache.NewBigCache(bigcacheConfig)
-
-//GetValue GetValue
-func GetValue(key string) ([]byte, error) {
-	return cache.Get(key)
-}
-
-//SetValue SetValue
-func SetValue(key string, value []byte) {
-	cache.Set(key, value)
-}
-
-//GetLength GetLength
-func GetLength() int {
-	return cache.Len()
-}
-
-//Callback function executed when cache element is removed.
-//Executed only when onRemove of cache config poting to this function
-func onRemove(key string, entry []byte) {
-	fmt.Println(key + " removed at " + time.Now().String())
-}
+package coreos
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/allegro/bigcache"
+)
+
+
+const (
+	BIGCACHEShards=8
+	BIGCACHEMaxEntrySize=1024
+	BIGCACHEVerbose=true
+	BIGCACHEHardMaxCacheSize=0
+	BIGCACHEMaxEntriesInWindow=1000  10  60
+	BIGCACHELifeWindow=2
+)
+var bigcacheConfig = bigcache.Config{
+	// number of shards (must be a power of 2)
+	// Shards: 4096,
+	Shards: BIGCACHEShards,
+	// time after which entry can be evicted
+	LifeWindow: BIGCACHELifeWindow * time.Hour,
+	// rps * lifeWindow, used only in initial memory allocation
+	MaxEntriesInWindow: 1000 * 10 * 60,
+	// MaxEntriesInWindow: 10,
+	// max entry size in bytes, used only in initial memory allocation
+	MaxEntrySize: BIGCACHEMaxEntrySize,
+	// prints information about additional memory allocation
+	Verbose: BIGCACHEVerbose,
+	// cache will not allocate more memory than this limit, value in MB
+	// if value is reached then the oldest entries can be overridden for the new ones
+	// 0 value means no size limit
+	HardMaxCacheSize: BIGCACHEHardMaxCacheSize,
+	// callback fired when the oldest entry is removed because of its
+	// expiration time or no space left for the new entry. Default value is nil which
+	// means no callback and it prevents from unwrapping the oldest entry.
+	OnRemove: nil,
+}
+
+var cache, initErr = bigcache.NewBigCache(bigcacheConfig)
+
+//GetValue GetValue
+func GetValue(key string) ([]byte, error) {
+	return cache.Get(key)
+}
+
+//SetValue SetValue
+func SetValue(key string, value []byte) {
+	cache.Set(key, value)
+}
+
+//GetLength GetLength
+func GetLength() int {
+	return cache.Len()
+}
+
+//Callback function executed when cache element is removed.
+//Executed only when onRemove of cache config poting to this function
+func onRemove(key string, entry []byte) {
+	fmt.Println(key + " removed at " + time.Now().String())
+}
\ No newline at end of file

configHelper.go

 package coreos
 
-import (
-	"fmt"
-
-	"github.com/spf13/viper"
-)
-
 //InitViper function to initialize viper
 func InitViper() {
-	viper.SetConfigName("config") // name of config file (without extension)
-	viper.AddConfigPath(".")      // optionally look for config in the working directory
-	err := viper.ReadInConfig()
-	// Find and read the config file
-	if err != nil { // Handle errors reading the config file
-		panic(fmt.Errorf("Fatal error config file %s ", err))
-	}
+	// viper.SetConfigName("config") // name of config file (without extension)
+	// viper.AddConfigPath(".")      // optionally look for config in the working directory
+	// err := viper.ReadInConfig()
+	// // Find and read the config file
+	// if err != nil { // Handle errors reading the config file
+	// 	panic(fmt.Errorf("Fatal error config file %s ", err))
+	// }
 }
 
 //GetConfig method to get configs from config file
 func GetConfig(keyName string) string {
 
-	keyValue := viper.GetString(keyName)
-
-	return keyValue
+	// keyValue := viper.GetString(keyName)
 
+	// return keyValue
+	return ""
 }

DALMySQL.go → dalMySQL.go

@@ -3,8 +3,6 @@ package coreos
 import (
 	"sync"
 
-	"GolangFullStack/server/api/server/config"
-
 	"github.com/gocraft/dbr"
 )
 
@@ -16,7 +14,7 @@ var sqlOnce sync.Once
 func GetSQLConnection() (*dbr.Connection, error) {
 	sqlOnce.Do(func() {
 		// create a connection db(e.g. "postgres", "mysql", or "sqlite3")
-		connection, _ := dbr.Open("mysql", config.MysqlDSN, nil)
+		connection, _ := dbr.Open("mysql", GetConfig("MysqlDSN"), nil)
 
 		//	connection.SetMaxIdleConns(10)
 		//	connection.SetMaxOpenConns(5)

DALNoSQL.go → dalNoSQL.go

 package coreos
 
 import (
-	"GolangFullStack/server/api/server/config"
 	"fmt"
 	"sync"
 
@@ -15,12 +14,12 @@ var once sync.Once
 func GetMongoConnection() *mgo.Session {
 	once.Do(func() {
 		Host := []string{
-			config.MONGODSN,
+			GetConfig("MONGODSN"),
 		}
 		const (
 			Username = ""
 			Password = ""
-			Database = config.DBNAME
+			Database = GetConfig("DBNAME")
 		)
 
 		session, err := mgo.DialWithInfo(&mgo.DialInfo{

DALRedis.go → dalRedis.go

 package coreos
 
 import (
-	"GolangFullStack/server/api/server/config"
-
 	"github.com/garyburd/redigo/redis"
 )
 
@@ -13,7 +11,7 @@ func GetWorkPool() *redis.Pool {
 		MaxIdle:   5,
 		Wait:      true,
 		Dial: func() (redis.Conn, error) {
-			return redis.Dial("tcp", config.REDISDSN, redis.DialDatabase(3))
+			return redis.Dial("tcp", GetConfig("REDISDSN"), redis.DialDatabase(3))
 		},
 	}
 	return redisPool

glide.yaml

 package: coreospackage
 import:
+- package: GolangFullStack/server/api/server/config
 - package: github.com/allegro/bigcache
 - package: github.com/dgrijalva/jwt-go
   version: ^3.0.0
@@ -16,7 +17,7 @@ import:
 - package: github.com/gocraft/dbr
   version: ^2.1.0
 - package: github.com/labstack/echo
-  version: ^3.2.0
+  version: ^3.2.1
   subpackages:
   - middleware
 - package: github.com/sirupsen/logrus

loggingHelper.go

@@ -42,7 +42,7 @@ func Error(message string) {
 	logger.Error(message)
 }
 
-//Panic Panic 
+//Panic Panic
 func Panic(message string) {
 	logger.Panic(message)
 }

smsHelper.go

 package coreos
 
 import (
-	"GolangFullStack/server/api/server/config"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -21,7 +20,7 @@ type SMS struct {
 // SendSMS : send SMS Service
 func SendSMS(smsObject SMS) error {
 	var postURL string
-	postURL = config.SMSAPIURL + "?UserName=" + smsObject.UserName + "&password=" + smsObject.Password + "&MobileNo=" + smsObject.MobileNumber + "&SenderID=" + smsObject.SenderID + "&CDMAHeader=" + smsObject.CDMAHeader + "&Message=" + url.QueryEscape(smsObject.Message)
+	postURL = GetConfig("SMSAPIURL") + "?UserName=" + smsObject.UserName + "&password=" + smsObject.Password + "&MobileNo=" + smsObject.MobileNumber + "&SenderID=" + smsObject.SenderID + "&CDMAHeader=" + smsObject.CDMAHeader + "&Message=" + url.QueryEscape(smsObject.Message)
 	// fmt.Println(postURL)
 	resp, err := http.Get(postURL)
 	if err != nil {

validationHelper.go

@@ -2,7 +2,6 @@ package coreos
 
 import (
 	"github.com/go-playground/locales/en"
-	"gopkg.in/go-playground/validator.v9"
 
 	ut "github.com/go-playground/universal-translator"
 	en_translations "gopkg.in/go-playground/validator.v9/translations/en"
@@ -46,7 +45,7 @@ func Validate(s interface{}) map[string]string {
 		for _, e := range errs {
 			// can translate each error one at a time.
 			customErrs[e.Namespace()] = e.Translate(trans)
-			
+
 		}
 
 		return customErrs