From c48f6bb9f4ada76b469dbad648c1ec8363d062ae Mon Sep 17 00:00:00 2001
From: mikestefanello <mike.stefanello@gmail.com>
Date: Sun, 12 Dec 2021 21:28:53 -0500
Subject: [PATCH] Code cleanup.

---
 container/container.go | 20 ++++++++++----------
 controllers/login.go   | 19 +++++++++----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/container/container.go b/container/container.go
index 7d37077..f942d4c 100644
--- a/container/container.go
+++ b/container/container.go
@@ -25,6 +25,16 @@ type Container struct {
 	ORM      *ent.Client
 }
 
+func NewContainer() *Container {
+	c := new(Container)
+	c.initWeb()
+	c.initConfig()
+	c.initCache()
+	c.initDatabase()
+	c.initORM()
+	return c
+}
+
 func (c *Container) initWeb() {
 	c.Web = echo.New()
 }
@@ -71,13 +81,3 @@ func (c *Container) initORM() {
 		c.Web.Logger.Fatalf("failed to create database schema: %v", err)
 	}
 }
-
-func NewContainer() *Container {
-	c := new(Container)
-	c.initWeb()
-	c.initConfig()
-	c.initCache()
-	c.initDatabase()
-	c.initORM()
-	return c
-}
diff --git a/controllers/login.go b/controllers/login.go
index ed50ffa..8e5710a 100644
--- a/controllers/login.go
+++ b/controllers/login.go
@@ -33,13 +33,17 @@ func (l *Login) Get(c echo.Context) error {
 }
 
 func (l *Login) Post(c echo.Context) error {
-	// Parse the form values
-	if err := c.Bind(&l.form); err != nil {
-		c.Logger().Errorf("unable to parse login form: %v", err)
+	fail := func(message string, err error) error {
+		c.Logger().Errorf("%s: %v", message, err)
 		msg.Danger(c, "An error occurred. Please try again.")
 		return l.Get(c)
 	}
 
+	// Parse the form values
+	if err := c.Bind(&l.form); err != nil {
+		return fail("unable to parse login form", err)
+	}
+
 	// Validate the form
 	if err := c.Validate(l.form); err != nil {
 		msg.Danger(c, "All fields are required.")
@@ -58,11 +62,8 @@ func (l *Login) Post(c echo.Context) error {
 			msg.Danger(c, "Invalid credentials. Please try again.")
 			return l.Get(c)
 		default:
-			c.Logger().Errorf("error querying user during login: %v", err)
-			msg.Danger(c, "An error occurred. Please try again.")
-			return l.Get(c)
+			return fail("error querying user during login", err)
 		}
-
 	}
 
 	// Check if the password is correct
@@ -75,9 +76,7 @@ func (l *Login) Post(c echo.Context) error {
 	// Log the user in
 	err = auth.Login(c, u.ID)
 	if err != nil {
-		c.Logger().Errorf("unable to log in user %d: %v", u.ID, err)
-		msg.Danger(c, "An error occurred. Please try again.")
-		return l.Get(c)
+		return fail("unable to log in user", err)
 	}
 
 	msg.Success(c, fmt.Sprintf("Welcome back, %s. You are now logged in.", u.Username))