bagas/filekeeper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate run command from main function

Browse Source
This commit is contained in:
Bagas Aulia Rezki
2024-04-28 22:26:53 +07:00
parent 5ca6cdd129
commit e6344743d5
12 changed files with 74 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
handler/signup/signup.go
View File

@ -32,16 +32,12 @@ var mailServer *email.SmtpServer
var VerifyUser map[string]*UnverifiedUser
var VerifyEmail map[string]string
// TESTTING VAR
var database db.Database
func init() {
log = logger.Logger()
smtpPort, _ := strconv.Atoi(utils.Getenv("SMTP_PORT"))
mailServer = email.NewSmtpServer(utils.Getenv("SMTP_HOST"), smtpPort, utils.Getenv("SMTP_USER"), utils.Getenv("SMTP_PASSWORD"))
VerifyUser = make(map[string]*UnverifiedUser)
VerifyEmail = make(map[string]string)
database = db.NewPostgresDB(utils.Getenv("DB_USERNAME"), utils.Getenv("DB_PASSWORD"), utils.Getenv("DB_HOST"), utils.Getenv("DB_PORT"), utils.Getenv("DB_NAME"))
ticker := time.NewTicker(time.Minute)
go func() {
@ -112,7 +108,7 @@ func POST(w http.ResponseWriter, r *http.Request) {
Password: hashedPassword,
}
if registered := database.IsUserRegistered(userEmail, username); registered {
if registered := db.DB.IsUserRegistered(userEmail, username); registered {
component := signupView.Main("Sign up Page", types.Message{
Code: 0,
Message: "Email or Username has been registered",

8
handler/signup/verify/verify.go
View File

@ -1,7 +1,6 @@
package signupVerifyHandler
import (
"github.com/fossyy/filekeeper/utils"
"net/http"
"github.com/fossyy/filekeeper/db"
@ -13,13 +12,8 @@ import (
var log *logger.AggregatedLogger
// TESTTING VAR
var database db.Database
func init() {
log = logger.Logger()
database = db.NewPostgresDB(utils.Getenv("DB_USERNAME"), utils.Getenv("DB_PASSWORD"), utils.Getenv("DB_HOST"), utils.Getenv("DB_PORT"), utils.Getenv("DB_NAME"))
}
func GET(w http.ResponseWriter, r *http.Request) {
@ -31,7 +25,7 @@ func GET(w http.ResponseWriter, r *http.Request) {
return
}
err := database.CreateUser(data.User)
err := db.DB.CreateUser(data.User)
if err != nil {
component := signupView.Main("Sign up Page", types.Message{
Code: 0,