From a7b4e31bece51808dbf327469db3ea9202502fe0 Mon Sep 17 00:00:00 2001
From: Andreas Mieke <andreas@1750studios.com>
Date: Sat, 11 Apr 2020 04:56:21 +0200
Subject: [PATCH] Move DB Init to main module

---
 cmd/db640bot/main.go          |  2 ++
 internal/bot/bot.go           |  6 ------
 internal/database/database.go | 11 +++++++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cmd/db640bot/main.go b/cmd/db640bot/main.go
index ab38ad9..8f43bee 100644
--- a/cmd/db640bot/main.go
+++ b/cmd/db640bot/main.go
@@ -8,6 +8,7 @@ import (
 
 	"git.1750studios.com/ToddShepard/DB640/internal/bot"
 	"git.1750studios.com/ToddShepard/DB640/internal/config"
+	"git.1750studios.com/ToddShepard/DB640/internal/database"
 	"git.1750studios.com/ToddShepard/DB640/internal/web"
 )
 
@@ -19,6 +20,7 @@ func main() {
 	}
 
 	config.LoadConfig(*cfg)
+	database.Init()
 	bot.Init()
 	web.Init()
 
diff --git a/internal/bot/bot.go b/internal/bot/bot.go
index fd6d7cc..6b4c1ab 100644
--- a/internal/bot/bot.go
+++ b/internal/bot/bot.go
@@ -19,12 +19,6 @@ var updates telegram.UpdateChan
 func Init() {
 	var err error
 
-	err = database.Open(config.C.Database.Dialect, config.C.Database.Connection)
-	if err != nil {
-		log.Fatalf("Could not establish database connection: %+v", err)
-	}
-	log.Printf("[DATABASE] Connection established\n")
-
 	twitter.Init()
 	stream, err = twitter.GetStreamForTag(config.C.Twitter.MagicHashtag)
 	if err != nil {
diff --git a/internal/database/database.go b/internal/database/database.go
index 0978bbe..fe0b0fb 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -1,8 +1,10 @@
 package database
 
 import (
+	"log"
 	"time"
 
+	"git.1750studios.com/ToddShepard/DB640/internal/config"
 	"github.com/jinzhu/gorm"
 
 	// SQLite dialect for gorm
@@ -48,6 +50,15 @@ type TGChat struct {
 // Db is the GORM database handle
 var Db *gorm.DB
 
+// Init initzialises the database
+func Init() {
+	err := Open(config.C.Database.Dialect, config.C.Database.Connection)
+	if err != nil {
+		log.Fatalf("Could not establish database connection: %+v", err)
+	}
+	log.Printf("[DATABASE] Connection established\n")
+}
+
 // Open opens the database connection with given dialect and connection string
 func Open(dialect string, connection string) (err error) {
 	Db, err = gorm.Open(dialect, connection)