refactor: some refactoring

Author: MonstraG

infrastructure/setup/app.go

@@ -68,14 +68,14 @@ func (app *App) MapRoutes() {
 
 	var authRequired = createJwtAuthRequiredMiddleware(&jwtService)
 
-	app.handleFunc("GET /", notFound.GetHandler)
-	app.handleFunc("POST /", notFound.GetHandler)
+	app.handleFunc("GET /", notFound.Show404)
+	app.handleFunc("POST /", notFound.Show404)
 
 	var forgotPasswordController = forgotPassword.NewController(app.Db)
 
-	app.handleFunc("GET /forgot-password", forgotPasswordController.GetHandler)
-	app.handleFunc("POST /forgot-password", forgotPasswordController.PostHandler)
-	app.handleFunc("POST /set-password", forgotPasswordController.PostSetPasswordHandler)
+	app.handleFunc("GET /forgot-password", forgotPasswordController.GetForgotPasswordForm)
+	app.handleFunc("POST /forgot-password", forgotPasswordController.SubmitForgotPasswordForm)
+	app.handleFunc("POST /set-password", forgotPasswordController.SetPassword)
 
 	var indexController = index.NewController(app.Config)
 	app.handleFunc("GET /{$}", authRequired(indexController.GetHandler))

pages/forgotPassword/controller.go

@@ -0,0 +1,11 @@
+package forgotPassword
+
+import "gorm.io/gorm"
+
+type Controller struct {
+	db *gorm.DB
+}
+
+func NewController(db *gorm.DB) *Controller {
+	return &Controller{db: db}
+}

pages/forgotPassword/forgotPassword.go

@@ -7,9 +7,10 @@ import (
 	"go-api/infrastructure/myLog"
 	"go-api/infrastructure/reqRes"
 	"go-api/pages"
-	"gorm.io/gorm"
 	"html/template"
 	"net/http"
+
+	"gorm.io/gorm"
 )
 
 var forgotPasswordTemplate = template.Must(
@@ -33,15 +34,7 @@ type ResetPasswordPageData struct {
 	MinLength    int
 }
 
-type Controller struct {
-	db *gorm.DB
-}
-
-func NewController(db *gorm.DB) *Controller {
-	return &Controller{db: db}
-}
-
-func (controller *Controller) GetHandler(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+func (controller *Controller) GetForgotPasswordForm(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
 	renderForgotPasswordPage(w, r, "")
 }
 
@@ -58,7 +51,7 @@ func renderForgotPasswordPage(w reqRes.MyResponseWriter, r *reqRes.MyRequest, er
 	w.RenderTemplate(forgotPasswordTemplate, pageData)
 }
 
-func (controller *Controller) PostHandler(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+func (controller *Controller) SubmitForgotPasswordForm(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
 	ok := r.ParseFormRequired(w)
 	if !ok {
 		return
@@ -106,7 +99,7 @@ func renderResetPasswordForm(w reqRes.MyResponseWriter, r *reqRes.MyRequest, use
 	w.RenderTemplate(resetPasswordFormTemplate, pageData)
 }
 
-func (controller *Controller) PostSetPasswordHandler(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+func (controller *Controller) SetPassword(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
 	ok := r.ParseFormRequired(w)
 	if !ok {
 		return

pages/login/loginController.go

@@ -9,10 +9,11 @@ import (
 	"go-api/infrastructure/myLog"
 	"go-api/infrastructure/reqRes"
 	"go-api/pages"
-	"gorm.io/gorm"
 	"html/template"
 	"net/http"
 	"strings"
+
+	"gorm.io/gorm"
 )
 
 var loginTemplate = template.Must(template.ParseFiles("pages/base.gohtml", "pages/login/login.gohtml"))

pages/notFound/notFoundController.go

@@ -8,7 +8,7 @@ import (
 
 var notFoundTemplate = template.Must(template.ParseFiles("pages/base.gohtml", "pages/notFound/notFound.gohtml"))
 
-func GetHandler(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
+func Show404(w reqRes.MyResponseWriter, r *reqRes.MyRequest) {
 	pageData := pages.NewPageData(r, "404: page not found")
 
 	w.RenderTemplate(notFoundTemplate, pageData)