chore: save work

api/admin/repo.go

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

api/metrics.go

@@ -216,7 +216,7 @@ func recordGauges(c *gin.Context) {
 	// repo_count
 	if q.RepoCount {
 		// send API call to capture the total number of repos
-		r, err := database.FromContext(c).GetRepoCount()
+		r, err := database.FromContext(c).CountRepos()
 		if err != nil {
 			logrus.Errorf("unable to get count of all repos: %v", err)
 		}

api/repo.go

@@ -206,7 +206,7 @@ func CreateRepo(c *gin.Context) {
 	}
 
 	// send API call to capture the repo from the database
-	dbRepo, err := database.FromContext(c).GetRepo(r.GetOrg(), r.GetName())
+	dbRepo, err := database.FromContext(c).GetRepoForOrg(r.GetOrg(), r.GetName())
 	if err == nil && dbRepo.GetActive() {
 		retErr := fmt.Errorf("unable to activate repo: %s is already active", r.GetFullName())
 
@@ -262,7 +262,7 @@ func CreateRepo(c *gin.Context) {
 		}
 
 		// send API call to capture the updated repo
-		r, _ = database.FromContext(c).GetRepo(dbRepo.GetOrg(), dbRepo.GetName())
+		r, _ = database.FromContext(c).GetRepoForOrg(dbRepo.GetOrg(), dbRepo.GetName())
 	} else {
 		// send API call to create the repo
 		err = database.FromContext(c).CreateRepo(r)
@@ -275,7 +275,7 @@ func CreateRepo(c *gin.Context) {
 		}
 
 		// send API call to capture the created repo
-		r, _ = database.FromContext(c).GetRepo(r.GetOrg(), r.GetName())
+		r, _ = database.FromContext(c).GetRepoForOrg(r.GetOrg(), r.GetName())
 	}
 
 	c.JSON(http.StatusCreated, r)
@@ -361,18 +361,17 @@ func GetRepos(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 repos for the user
-	t, err := database.FromContext(c).GetUserRepoCount(u)
-	if err != nil {
-		retErr := fmt.Errorf("unable to get repo count for user %s: %w", u.GetName(), err)
-
-		util.HandleError(c, http.StatusInternalServerError, retErr)
-
-		return
+	// capture the query parameters if present:
+	//
+	// * active
+	// * sort_by
+	filters := map[string]interface{}{
+		"active":  util.QueryParameter(c, "active", "true"),
+		"sort_by": util.QueryParameter(c, "sort_by", "name"),
 	}
 
 	// send API call to capture the list of repos for the user
-	r, err := database.FromContext(c).GetUserRepoList(u, page, perPage)
+	r, t, err := database.FromContext(c).ListReposForUser(u, filters, page, perPage)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get repos for user %s: %w", u.GetName(), err)
 
@@ -493,35 +492,27 @@ func GetOrgRepos(c *gin.Context) {
 	// ensure per_page isn't above or below allowed values
 	perPage = util.MaxInt(1, util.MinInt(100, perPage))
 
-	// capture the sort_by query parameter if present
-	sortBy := util.QueryParameter(c, "sort_by", "name")
+	// capture the query parameters if present:
+	//
+	// * active
+	// * sort_by
+	filters := map[string]interface{}{
+		"active":  util.QueryParameter(c, "active", "true"),
+		"sort_by": util.QueryParameter(c, "sort_by", "name"),
+	}
 
 	// See if the user is an org admin to bypass individual permission checks
 	perm, err := scm.FromContext(c).OrgAccess(u, o)
 	if err != nil {
 		logrus.Errorf("unable to get user %s access level for org %s", u.GetName(), o)
 	}
-
-	filters := map[string]string{}
 	// Only show public repos to non-admins
 	if perm != "admin" {
-		filters["visibility"] = "public"
-	}
-
-	filters["active"] = util.QueryParameter(c, "active", "true")
-
-	// send API call to capture the total number of repos for the org
-	t, err := database.FromContext(c).GetOrgRepoCount(o, filters)
-	if err != nil {
-		retErr := fmt.Errorf("unable to get repo count for org %s: %w", o, err)
-
-		util.HandleError(c, http.StatusInternalServerError, retErr)
-
-		return
+		filters["visibility"] = constants.VisibilityPublic
 	}
 
 	// send API call to capture the list of repos for the org
-	r, err := database.FromContext(c).GetOrgRepoList(o, filters, page, perPage, sortBy)
+	r, t, err := database.FromContext(c).ListReposForOrg(o, filters, page, perPage)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get repos for org %s: %w", o, err)
 
@@ -806,7 +797,7 @@ func UpdateRepo(c *gin.Context) {
 	}
 
 	// send API call to capture the updated repo
-	r, _ = database.FromContext(c).GetRepo(r.GetOrg(), r.GetName())
+	r, _ = database.FromContext(c).GetRepoForOrg(r.GetOrg(), r.GetName())
 
 	c.JSON(http.StatusOK, r)
 }

api/scm.go

@@ -6,6 +6,7 @@ package api
 
 import (
 	"fmt"
+	"github.com/go-vela/types/constants"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -69,14 +70,19 @@ func SyncRepos(c *gin.Context) {
 		logger.Errorf("unable to get user %s access level for org %s", u.GetName(), o)
 	}
 
-	filters := map[string]string{}
+	// capture the query parameters if present:
+	//
+	// * sort_by
+	filters := map[string]interface{}{
+		"sort_by": util.QueryParameter(c, "sort_by", "name"),
+	}
 	// Only show public repos to non-admins
 	if perm != "admin" {
-		filters["visibility"] = "public"
+		filters["visibility"] = constants.VisibilityPublic
 	}
 
 	// send API call to capture the total number of repos for the org
-	t, err := database.FromContext(c).GetOrgRepoCount(o, filters)
+	t, err := database.FromContext(c).CountReposForOrg(o, filters)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get repo count for org %s: %w", o, err)
 
@@ -89,7 +95,7 @@ func SyncRepos(c *gin.Context) {
 	page := 0
 	// capture all repos belonging to a certain org in database
 	for orgRepos := int64(0); orgRepos < t; orgRepos += 100 {
-		r, err := database.FromContext(c).GetOrgRepoList(o, filters, page, 100, "name")
+		r, _, err := database.FromContext(c).ListReposForOrg(o, filters, page, 100)
 		if err != nil {
 			retErr := fmt.Errorf("unable to get repo count for org %s: %w", o, err)
 

api/user.go

@@ -432,11 +432,11 @@ func GetUserSourceRepos(c *gin.Context) {
 	for org := range output {
 		// capture source repos from the database backend, grouped by org
 		page := 1
-		filters := map[string]string{}
+		filters := map[string]interface{}{}
 
 		for page > 0 {
 			// send API call to capture the list of repos for the org
-			dbReposPart, err := database.FromContext(c).GetOrgRepoList(org, filters, page, 100, "name")
+			dbReposPart, _, err := database.FromContext(c).ListReposForOrg(org, filters, page, 100)
 			if err != nil {
 				retErr := fmt.Errorf("unable to get repos for org %s: %w", org, err)
 

api/webhook.go

@@ -172,7 +172,7 @@ func PostWebhook(c *gin.Context) {
 	}
 
 	// send API call to capture parsed repo from webhook
-	r, err = database.FromContext(c).GetRepo(r.GetOrg(), r.GetName())
+	r, err = database.FromContext(c).GetRepoForOrg(r.GetOrg(), r.GetName())
 	if err != nil {
 		retErr := fmt.Errorf("%s: failed to get repo %s: %w", baseErr, r.GetFullName(), err)
 		util.HandleError(c, http.StatusBadRequest, retErr)
@@ -414,7 +414,7 @@ func PostWebhook(c *gin.Context) {
 		}
 
 		// send API call to capture repo for the counter
-		r, err = database.FromContext(c).GetRepo(r.GetOrg(), r.GetName())
+		r, err = database.FromContext(c).GetRepoForOrg(r.GetOrg(), r.GetName())
 		if err != nil {
 			retErr := fmt.Errorf("%s: unable to get repo %s: %w", baseErr, r.GetFullName(), err)
 
@@ -729,7 +729,7 @@ func renameRepository(h *library.Hook, r *library.Repo, c *gin.Context, m *types
 	// get the old name of the repo
 	previousName := r.GetPreviousName()
 	// get the repo from the database that matches the old name
-	dbR, err := database.FromContext(c).GetRepo(r.GetOrg(), previousName)
+	dbR, err := database.FromContext(c).GetRepoForOrg(r.GetOrg(), previousName)
 	if err != nil {
 		retErr := fmt.Errorf("%s: failed to get repo %s/%s from database", baseErr, r.GetOrg(), previousName)
 		util.HandleError(c, http.StatusBadRequest, retErr)