chore: updates for database user engine

api/admin/user.go

@@ -45,7 +45,7 @@ func AllUsers(c *gin.Context) {
 	logrus.Info("Admin: reading all users")
 
 	// send API call to capture all users
-	u, err := database.FromContext(c).GetUserList()
+	u, err := database.FromContext(c).ListUsers()
 	if err != nil {
 		retErr := fmt.Errorf("unable to capture all users: %w", err)
 

api/authenticate.go

@@ -99,7 +99,7 @@ func Authenticate(c *gin.Context) {
 	}
 
 	// send API call to capture the user logging in
-	u, err := database.FromContext(c).GetUserName(newUser.GetName())
+	u, err := database.FromContext(c).GetUserForName(newUser.GetName())
 	// create a new user account
 	if len(u.GetName()) == 0 || err != nil {
 		// create unique id for the user
@@ -314,7 +314,7 @@ func AuthenticateToken(c *gin.Context) {
 	}
 
 	// check if the user exists
-	u, err = database.FromContext(c).GetUserName(u.GetName())
+	u, err = database.FromContext(c).GetUserForName(u.GetName())
 	if err != nil {
 		retErr := fmt.Errorf("user %s not found", u.GetName())
 

api/metrics.go

@@ -74,7 +74,7 @@ func CustomMetrics(c *gin.Context) {
 // helper function to get the totals of resource types.
 func recordGauges(c *gin.Context) {
 	// send API call to capture the total number of users
-	u, err := database.FromContext(c).GetUserCount()
+	u, err := database.FromContext(c).CountUsers()
 	if err != nil {
 		logrus.Errorf("unable to get count of all users: %v", err)
 	}

api/user.go

@@ -87,7 +87,7 @@ func CreateUser(c *gin.Context) {
 	}
 
 	// send API call to capture the created user
-	user, _ := database.FromContext(c).GetUserName(input.GetName())
+	user, _ := database.FromContext(c).GetUserForName(input.GetName())
 
 	c.JSON(http.StatusCreated, user)
 }
@@ -172,18 +172,8 @@ func GetUsers(c *gin.Context) {
 	// ensure per_page isn't above or below allowed values
 	perPage = util.MaxInt(1, util.MinInt(100, perPage))
 
-	// send API call to capture the total number of users
-	t, err := database.FromContext(c).GetUserCount()
-	if err != nil {
-		retErr := fmt.Errorf("unable to get users count: %w", err)
-
-		util.HandleError(c, http.StatusInternalServerError, retErr)
-
-		return
-	}
-
 	// send API call to capture the list of users
-	users, err := database.FromContext(c).GetUserLiteList(page, perPage)
+	users, t, err := database.FromContext(c).ListLiteUsers(page, perPage)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get users: %w", err)
 
@@ -311,7 +301,7 @@ func UpdateCurrentUser(c *gin.Context) {
 	}
 
 	// send API call to capture the updated user
-	u, err = database.FromContext(c).GetUserName(u.GetName())
+	u, err = database.FromContext(c).GetUserForName(u.GetName())
 	if err != nil {
 		retErr := fmt.Errorf("unable to get updated user %s: %w", u.GetName(), err)
 
@@ -363,7 +353,7 @@ func GetUser(c *gin.Context) {
 	}).Infof("reading user %s", user)
 
 	// send API call to capture the user
-	u, err := database.FromContext(c).GetUserName(user)
+	u, err := database.FromContext(c).GetUserForName(user)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get user %s: %w", user, err)
 
@@ -548,7 +538,7 @@ func UpdateUser(c *gin.Context) {
 	}
 
 	// send API call to capture the user
-	u, err = database.FromContext(c).GetUserName(user)
+	u, err = database.FromContext(c).GetUserForName(user)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get user %s: %w", user, err)
 
@@ -584,7 +574,7 @@ func UpdateUser(c *gin.Context) {
 	}
 
 	// send API call to capture the updated user
-	u, _ = database.FromContext(c).GetUserName(user)
+	u, _ = database.FromContext(c).GetUserForName(user)
 
 	c.JSON(http.StatusOK, u)
 }
@@ -633,7 +623,7 @@ func DeleteUser(c *gin.Context) {
 	}).Infof("deleting user %s", user)
 
 	// send API call to capture the user
-	u, err := database.FromContext(c).GetUserName(user)
+	u, err := database.FromContext(c).GetUserForName(user)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get user %s: %w", user, err)
 
@@ -643,7 +633,7 @@ func DeleteUser(c *gin.Context) {
 	}
 
 	// send API call to remove the user
-	err = database.FromContext(c).DeleteUser(u.GetID())
+	err = database.FromContext(c).DeleteUser(u)
 	if err != nil {
 		retErr := fmt.Errorf("unable to delete user %s: %w", u.GetName(), err)
 

router/middleware/token/token.go

@@ -113,7 +113,7 @@ func Parse(t string, db database.Service) (*library.User, error) {
 
 		// lookup the user in the database
 		logrus.WithField("user", name).Debugf("reading user %s", name)
-		u, err = db.GetUserName(name)
+		u, err = db.GetUserForName(name)
 		return []byte(u.GetHash()), err
 	})