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

Separate database initialization into NewMYSQLdb function

Browse Source
This commit is contained in:
Bagas Aulia Rezki
2024-04-28 20:49:41 +07:00
parent 1a7ac48330
commit b4f303463d
10 changed files with 242 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
handler/signup/signup.go
View File

@ -3,7 +3,6 @@ package signupHandler
import (
"bytes"
"context"
"errors"
"fmt"
"net/http"
"strconv"
@ -19,7 +18,6 @@ import (
emailView "github.com/fossyy/filekeeper/view/email"
signupView "github.com/fossyy/filekeeper/view/signup"
"github.com/google/uuid"
"gorm.io/gorm"
)
type UnverifiedUser struct {
@ -34,12 +32,16 @@ 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.NewMYSQLdb(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() {
@ -110,34 +112,28 @@ func POST(w http.ResponseWriter, r *http.Request) {
Password: hashedPassword,
}
var data models.User
err = db.DB.Table("users").Where("email = ? OR username = ?", userEmail, username).First(&data).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
err = verifyEmail(&newUser)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error(err.Error())
return
}
component := signupView.EmailSend("Sign up Page")
err = component.Render(r.Context(), w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error(err.Error())
return
}
if registered := database.IsUserRegistered(userEmail, username); registered {
component := signupView.Main("Sign up Page", types.Message{
Code: 0,
Message: "Email or Username has been registered",
})
err = component.Render(r.Context(), w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error(err.Error())
return
}
return
}
err = verifyEmail(&newUser)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
log.Error(err.Error())
return
}
component := signupView.Main("Sign up Page", types.Message{
Code: 0,
Message: "Email or Username has been registered",
})
component := signupView.EmailSend("Sign up Page")
err = component.Render(r.Context(), w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)

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

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