From 5b6084986fa6a59003337416b20ad5968841e428 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Fri, 19 Jan 2024 12:43:16 -0500
Subject: [PATCH] refactor: init doesn't need portal passed

---
 cmd/portal/init.go     | 4 +---
 db/db.go               | 4 ++--
 interfaces/database.go | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd/portal/init.go b/cmd/portal/init.go
index e1ffd16..62adf02 100644
--- a/cmd/portal/init.go
+++ b/cmd/portal/init.go
@@ -80,9 +80,7 @@ func initProtocols(p interfaces.Portal) error {
 }
 
 func initStorage(p interfaces.Portal) error {
-	p.Storage().Init()
-
-	return nil
+	return p.Storage().Init()
 }
 
 func initAPI(p interfaces.Portal) error {
diff --git a/db/db.go b/db/db.go
index 2775cb6..a98a5c4 100644
--- a/db/db.go
+++ b/db/db.go
@@ -26,7 +26,7 @@ func NewDatabase(p interfaces.Portal) interfaces.Database {
 }
 
 // Init initializes the database connection
-func (d *DatabaseImpl) Init(p interfaces.Portal) error {
+func (d *DatabaseImpl) Init() error {
 	// Retrieve DB config from Viper
 	username := viper.GetString("core.db.username")
 	password := viper.GetString("core.db.password")
@@ -41,7 +41,7 @@ func (d *DatabaseImpl) Init(p interfaces.Portal) error {
 	// Open DB connection
 	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
-		p.Logger().Error("Failed to connect to database", zap.Error(err))
+		d.portal.Logger().Error("Failed to connect to database", zap.Error(err))
 	}
 	d.db = db
 
diff --git a/interfaces/database.go b/interfaces/database.go
index b652b14..19fd89c 100644
--- a/interfaces/database.go
+++ b/interfaces/database.go
@@ -3,7 +3,7 @@ package interfaces
 import "gorm.io/gorm"
 
 type Database interface {
-	Init(p Portal) error
+	Init() error
 	Start() error
 	Get() *gorm.DB
 }