Connecting to the datavase and adding the sql connection to our Repository
This commit is contained in:
		@ -4,6 +4,7 @@ import (
 | 
				
			|||||||
	"encoding/gob"
 | 
						"encoding/gob"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"go-udemy-web-1/internal/config"
 | 
						"go-udemy-web-1/internal/config"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/driver"
 | 
				
			||||||
	"go-udemy-web-1/internal/handlers"
 | 
						"go-udemy-web-1/internal/handlers"
 | 
				
			||||||
	"go-udemy-web-1/internal/helpers"
 | 
						"go-udemy-web-1/internal/helpers"
 | 
				
			||||||
	"go-udemy-web-1/internal/models"
 | 
						"go-udemy-web-1/internal/models"
 | 
				
			||||||
@ -27,10 +28,11 @@ var (
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// main is the main application function
 | 
					// main is the main application function
 | 
				
			||||||
func main() {
 | 
					func main() {
 | 
				
			||||||
	err := run()
 | 
						db, err := run()
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		log.Fatal(err)
 | 
							log.Fatal(err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
						defer db.SQL.Close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	fmt.Printf("Starting application on port %s\n", portNumber)
 | 
						fmt.Printf("Starting application on port %s\n", portNumber)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -43,7 +45,7 @@ func main() {
 | 
				
			|||||||
	log.Fatal(err)
 | 
						log.Fatal(err)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func run() error {
 | 
					func run() (*driver.DB, error) {
 | 
				
			||||||
	// what am I going to put in the session
 | 
						// what am I going to put in the session
 | 
				
			||||||
	gob.Register(models.Reservation{})
 | 
						gob.Register(models.Reservation{})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -58,9 +60,19 @@ func run() error {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	app.Session = session
 | 
						app.Session = session
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// connect to database
 | 
				
			||||||
 | 
						log.Println("Connecting to database...")
 | 
				
			||||||
 | 
						dsn := fmt.Sprintf("host=localhost port=5432 dbname=test_connect user=%s password=%s", os.Getenv("PGUSER"), os.Getenv("PGPWD"))
 | 
				
			||||||
 | 
						db, err := driver.ConnectSQL(dsn)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							log.Fatal("Cannot connect to database! Dying...")
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						log.Println("Connected to database")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	tc, err := render.CreateTemplateCache()
 | 
						tc, err := render.CreateTemplateCache()
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		log.Fatalf("cannot create template cache: %s", err)
 | 
							log.Fatalf("cannot create template cache: %s", err)
 | 
				
			||||||
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	app.TemplateCahce = tc
 | 
						app.TemplateCahce = tc
 | 
				
			||||||
	app.UseCache = false
 | 
						app.UseCache = false
 | 
				
			||||||
@ -71,10 +83,10 @@ func run() error {
 | 
				
			|||||||
	errorLog = log.New(os.Stdout, "ERROR\t", log.Ldate|log.Ltime|log.Lshortfile)
 | 
						errorLog = log.New(os.Stdout, "ERROR\t", log.Ldate|log.Ltime|log.Lshortfile)
 | 
				
			||||||
	app.ErrorLog = errorLog
 | 
						app.ErrorLog = errorLog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	repo := handlers.NewRepo(&app)
 | 
						repo := handlers.NewRepo(&app, db)
 | 
				
			||||||
	handlers.NewHandlers(repo)
 | 
						handlers.NewHandlers(repo)
 | 
				
			||||||
	helpers.NewHelpers(&app)
 | 
						helpers.NewHelpers(&app)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	render.NewTemplates(&app)
 | 
						render.NewTemplates(&app)
 | 
				
			||||||
	return nil
 | 
						return db, nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -4,10 +4,13 @@ import (
 | 
				
			|||||||
	"encoding/json"
 | 
						"encoding/json"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"go-udemy-web-1/internal/config"
 | 
						"go-udemy-web-1/internal/config"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/driver"
 | 
				
			||||||
	"go-udemy-web-1/internal/forms"
 | 
						"go-udemy-web-1/internal/forms"
 | 
				
			||||||
	"go-udemy-web-1/internal/helpers"
 | 
						"go-udemy-web-1/internal/helpers"
 | 
				
			||||||
	"go-udemy-web-1/internal/models"
 | 
						"go-udemy-web-1/internal/models"
 | 
				
			||||||
	"go-udemy-web-1/internal/render"
 | 
						"go-udemy-web-1/internal/render"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/repository"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/repository/dbrepo"
 | 
				
			||||||
	"net/http"
 | 
						"net/http"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -17,12 +20,14 @@ var Repo *Repository
 | 
				
			|||||||
// Repository is the repository type
 | 
					// Repository is the repository type
 | 
				
			||||||
type Repository struct {
 | 
					type Repository struct {
 | 
				
			||||||
	App *config.AppConfig
 | 
						App *config.AppConfig
 | 
				
			||||||
 | 
						DB  repository.DatabaseRepo
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// NewRepo creates a new repository
 | 
					// NewRepo creates a new repository
 | 
				
			||||||
func NewRepo(a *config.AppConfig) *Repository {
 | 
					func NewRepo(a *config.AppConfig, db *driver.DB) *Repository {
 | 
				
			||||||
	return &Repository{
 | 
						return &Repository{
 | 
				
			||||||
		App: a,
 | 
							App: a,
 | 
				
			||||||
 | 
							DB:  dbrepo.NewPostgresRepo(db.SQL, a),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										19
									
								
								internal/repository/dbrepo/dbrepo.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								internal/repository/dbrepo/dbrepo.go
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,19 @@
 | 
				
			|||||||
 | 
					package dbrepo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"database/sql"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/config"
 | 
				
			||||||
 | 
						"go-udemy-web-1/internal/repository"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					type postgresDBRepo struct {
 | 
				
			||||||
 | 
						App *config.AppConfig
 | 
				
			||||||
 | 
						DB  *sql.DB
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func NewPostgresRepo(conn *sql.DB, a *config.AppConfig) repository.DatabaseRepo {
 | 
				
			||||||
 | 
						return &postgresDBRepo{
 | 
				
			||||||
 | 
							App: a,
 | 
				
			||||||
 | 
							DB:  conn,
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										5
									
								
								internal/repository/dbrepo/postgres.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								internal/repository/dbrepo/postgres.go
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					package dbrepo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func (m *postgresDBRepo) AllUsers() bool {
 | 
				
			||||||
 | 
						return true
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										5
									
								
								internal/repository/repository.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								internal/repository/repository.go
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					package repository
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					type DatabaseRepo interface {
 | 
				
			||||||
 | 
						AllUsers() bool
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user