latest

internal/database/database.go

@@ -2,27 +2,17 @@ package database
 
 import (
 	"context"
-	"os"
-
 	"database/sql"
+	"errors"
 
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"go.uber.org/fx"
-	"gorm.io/driver/sqlite"
+	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"sneak.berlin/go/directory/internal/config"
 	"sneak.berlin/go/directory/internal/globals"
 	"sneak.berlin/go/directory/internal/logger"
-	"sneak.berlin/go/util"
 
-	// spooky action at a distance!
-	// this populates the environment
-	// from a ./.env file automatically
-	// for development configuration.
-	// .env contents should be things like
-	// `DBURL=postgres://user:pass@.../`
-	// (without the backticks, of course)
 	_ "github.com/joho/godotenv/autoload"
 )
 
@@ -39,8 +29,6 @@ type Database struct {
 	params *DatabaseParams
 	DB     *gorm.DB
 	SQLDB  *sql.DB
-	dbdir  string
-	dbfn   string
 }
 
 func New(lc fx.Lifecycle, params DatabaseParams) (*Database, error) {
@@ -53,11 +41,21 @@ func New(lc fx.Lifecycle, params DatabaseParams) (*Database, error) {
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			s.log.Info().Msg("Database OnStart Hook")
-			// FIXME connect to db
+			err := s.Connect()
+			if err != nil {
+				return err
+			}
 			return nil
 		},
 		OnStop: func(ctx context.Context) error {
-			// FIXME disconnect from db
+			if s.SQLDB != nil {
+				err := s.SQLDB.Close()
+				if err != nil {
+					s.log.Error().Err(err).Msg("failed to close database connection")
+					return err
+				}
+			}
+			s.log.Info().Msg("Database connection closed")
 			return nil
 		},
 	})
@@ -80,36 +78,49 @@ func (d *Database) Get() (*gorm.DB, error) {
 }
 
 func (d *Database) Connect() error {
-	// FIXME make this get the data dir path from config
-	d.dbdir = os.Getenv("HOME")
-	err := util.Mkdirp(d.dbdir)
-	if err != nil {
-		d.log.Error().
-			Err(err).
-			Str("dbdir", d.dbdir).
-			Msg("unable to create directory")
+	dsn := d.params.Config.DatabaseDSN
+	if dsn == "" {
+		err := errors.New("database DSN is empty")
+		d.log.Error().Err(err).Msg("failed to get database DSN from config")
 		return err
 	}
-	d.dbfn = d.dbdir + "/" + d.params.Globals.Appname + ".db"
-	d.log.Info().
-		Str("file", d.dbfn).
-		Msg("opening store db")
 
-	// Open the database using the pure Go SQLite driver
-	sqlDB, err := sql.Open("sqlite", d.dbfn+"?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)")
+	d.log.Info().
+		Str("dsn", dsn).
+		Msg("connecting to database")
+
+	sqlDB, err := sql.Open("postgres", dsn)
 	if err != nil {
 		d.log.Error().Err(err).Msg("failed to open database")
 		return err
 	}
 	d.SQLDB = sqlDB
 
-	// Use the generic Gorm SQL driver to integrate it
-	db, err := gorm.Open(sqlite.Dialector{Conn: d.SQLDB}, &gorm.Config{})
+	// Ping the database to ensure the connection is valid
+	err = d.Ping()
 	if err != nil {
-		log.Error().Err(err).Msg("failed to connect database")
+		d.log.Error().Err(err).Msg("failed to ping database")
+		return err
+	}
+
+	db, err := gorm.Open(postgres.New(postgres.Config{
+		Conn: d.SQLDB,
+	}), &gorm.Config{})
+	if err != nil {
+		d.log.Error().Err(err).Msg("failed to connect database")
 		return err
 	}
 	d.DB = db
 
 	return nil
 }
+
+func (d *Database) Ping() error {
+	err := d.SQLDB.Ping()
+	if err != nil {
+		return err
+	}
+	d.log.Info().Msg("successfully pinged the database")
+	return nil
+}
+