From c98c593307ee0b73e85a4c3bc7c8d95cb010b814 Mon Sep 17 00:00:00 2001
From: konrad <k@knt.li>
Date: Thu, 16 Nov 2017 12:57:08 +0100
Subject: [PATCH] Moved database connection to configfile

---
 main.go          |  8 ++++----
 models/config.go | 16 ----------------
 models/models.go | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/main.go b/main.go
index 5bbe346..e23e06e 100644
--- a/main.go
+++ b/main.go
@@ -15,14 +15,14 @@ type UserLogin struct {
 
 func main() {
 
-	// Set Engine
-	err := models.SetEngine()
+	// Init Config
+	err := models.SetConfig()
 	if err != nil {
 		fmt.Println(err)
 	}
 
-	// Init Config
-	err = models.SetConfig()
+	// Set Engine
+	err = models.SetEngine()
 	if err != nil {
 		fmt.Println(err)
 	}
diff --git a/models/config.go b/models/config.go
index 4f0b5c4..40f2daa 100644
--- a/models/config.go
+++ b/models/config.go
@@ -1,7 +1,6 @@
 package models
 
 import (
-	"fmt"
 	"github.com/go-ini/ini"
 	"os"
 )
@@ -41,21 +40,6 @@ func SetConfig() error {
 		return err
 	}
 
-	// Check if the first user already exists, aka a user with the ID = 1. If not, insert it
-	_, exists, err := GetUserByID(1)
-	if err != nil {
-		return err
-	}
-
-	// If it doesn't exist, create it
-	if !exists {
-		_, err = CreateUser(Config.FirstUser)
-		if err != nil {
-			return err
-		}
-		fmt.Println("Created new user " + Config.FirstUser.Username)
-	}
-
 	// JWT secret
 	Config.JWTLoginSecret = []byte(cfg.Section("General").Key("JWTSecret").String())
 
diff --git a/models/models.go b/models/models.go
index d6b9b2c..ae3c94f 100644
--- a/models/models.go
+++ b/models/models.go
@@ -11,7 +11,7 @@ var x *xorm.Engine
 
 func getEngine() (*xorm.Engine, error) {
 	connStr := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8&parseTime=true",
-		"root", "jup2000", "127.0.0.1", "library2")
+		Config.Database.User, Config.Database.Password, Config.Database.Host, Config.Database.Database)
 	return xorm.NewEngine("mysql", connStr)
 }
 
@@ -34,5 +34,21 @@ func SetEngine() (err error) {
 	x.Sync(&Quantity{})
 
 	x.ShowSQL(true)
+
+	// Check if the first user already exists, aka a user with the ID = 1. If not, insert it
+	_, exists, err := GetUserByID(1)
+	if err != nil {
+		return err
+	}
+
+	// If it doesn't exist, create it
+	if !exists {
+		_, err = CreateUser(Config.FirstUser)
+		if err != nil {
+			return err
+		}
+		fmt.Println("Created new user " + Config.FirstUser.Username)
+	}
+
 	return nil
 }