Improved api and db calls

Author: snematoda

models/repo/repo_list.go

@@ -746,21 +746,24 @@ func GetUserRepositories(opts *SearchRepoOptions) (RepositoryList, int64, error)
 	return repos, count, db.SetSessionPagination(sess, opts).Find(&repos)
 }
 
-func GetPrimaryRepoLanguageList(ctx context.Context, repos RepositoryList) (LanguageStatList, error) {
+func GetPrimaryRepoLanguageList(ctx context.Context, ownerID int64, private bool) (LanguageStatList, error) {
 	languageList := make(LanguageStatList, 0)
 
 	q := db.GetEngine(ctx).
 		Table("language_stat").
 		Cols("language").
 		Where(builder.Eq{"is_primary": true})
 
-	if repos != nil {
-		repoIDs := make([]int64, len(repos))
-		for i := range repos {
-			repoIDs[i] = repos[i].ID
+	if ownerID > 0 {
+		ids, err := SearchRepositoryIDsByCondition(ctx, builder.NewCond().And(
+			builder.Eq{"owner_id": ownerID},
+			builder.Eq{"is_private": private},
+		))
+		if err != nil {
+			return nil, err
 		}
 
-		q = q.In("repo_id", repoIDs)
+		q = q.In("repo_id", ids)
 	}
 
 	err := q.Distinct("language").

modules/context/base.go

@@ -198,20 +198,6 @@ func (b *Base) FormInt64(key string) int64 {
 	return v
 }
 
-// FormInt64s returns a int64 slice for the provided key from the form
-func (b *Base) FormInt64s(key string) (v []int64) {
-	str := b.FormStrings(key)
-	if str == nil {
-		return nil
-	}
-
-	for _, s := range str {
-		i, _ := strconv.ParseInt(s, 10, 64)
-		v = append(v, i)
-	}
-	return v
-}
-
 // FormBool returns true if the value for the provided key in the form is "1", "true" or "on"
 func (b *Base) FormBool(key string) bool {
 	s := b.Req.FormValue(key)

modules/structs/miscellaneous.go

@@ -94,6 +94,12 @@ type LicenseTemplateInfo struct {
 	Body           string `json:"body"`
 }
 
+// LanguagesInfo contains information about a Language
+type LanguageInfo struct {
+	Name  string `json:"name"`
+	Color string `json:"color"`
+}
+
 // APIError is an api error with a message
 type APIError struct {
 	Message string `json:"message"`

routers/api/v1/api.go

@@ -795,6 +795,7 @@ func Routes() *web.Route {
 					m.Get("/heatmap", user.GetUserHeatmapData)
 				}
 
+				m.Get("/languages", repo.GetUserPrimaryLanguageList)
 				m.Get("/repos", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqExploreSignIn(), user.ListUserRepos)
 				m.Group("/tokens", func() {
 					m.Combo("").Get(user.ListAccessTokens).
@@ -919,7 +920,7 @@ func Routes() *web.Route {
 		// Repos (requires repo scope)
 		m.Group("/repos", func() {
 			m.Get("/search", repo.Search)
-			m.Get("/languages", repo.GetPrimaryLanguageList)
+			m.Get("/languages", repo.ListPrimaryLanguages)
 
 			// (repo scope)
 			m.Post("/migrate", reqToken(), bind(api.MigrateRepoOptions{}), repo.Migrate)
@@ -1299,6 +1300,7 @@ func Routes() *web.Route {
 				m.Combo("/{username}").Get(reqToken(), org.IsMember).
 					Delete(reqToken(), reqOrgOwnership(), org.DeleteMember)
 			})
+			m.Get("/languages", repo.GetOrgPrimaryLanguageList)
 			m.Group("/actions/secrets", func() {
 				m.Get("", reqToken(), reqOrgOwnership(), org.ListActionsSecrets)
 				m.Post("", reqToken(), reqOrgOwnership(), bind(api.CreateSecretOption{}), org.CreateOrgSecret)

routers/api/v1/repo/languages.go

@@ -6,79 +6,83 @@ package repo
 import (
 	"net/http"
 
-	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/context"
+	api "code.gitea.io/gitea/modules/structs"
 )
 
-// GetPrimaryLanguageList returns a list of primary languages along with their color
-func GetPrimaryLanguageList(ctx *context.APIContext) {
-	// swagger:operation GET /repos/languages repository repoGetPrimaryLanguages
+func SendPrimaryLanguageList(ctx *context.APIContext, ownerID int64) {
+	langs, err := repo_model.GetPrimaryRepoLanguageList(ctx, ownerID, ctx.IsSigned)
+	if err != nil {
+		ctx.InternalServerError(err)
+	}
+
+	list := []api.LanguageInfo{}
+
+	for _, i := range langs {
+		list = append(list, api.LanguageInfo{
+			Name:  i.Language,
+			Color: i.Color,
+		})
+	}
+
+	ctx.JSON(http.StatusOK, list)
+}
+
+// List all primary languages
+func ListPrimaryLanguages(ctx *context.APIContext) {
+	// swagger:operation GET /repos/languages repository repoListPrimaryLanguages
 	// ---
 	// summary: Get primary languages and their color
 	// produces:
 	//   - application/json
-	// parameters:
-	// - name: ids
-	//   in: query
-	//   description: Filter by Repo IDs (empty for all repos)
-	//   type: array
-	//   collectionFormat: multi
-	//   items:
-	//     type: integer
-	// - name: ownerId
-	//   in: query
-	//   description: Filter by the the recent languages used by a user/org (ignored if filtered by Repo IDs)
-	//   type: integer
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/PrimaryLanguageList"
 
-	ids := ctx.FormInt64s("ids")
-	var repos repo_model.RepositoryList
-
-	ownerID := ctx.FormInt64("ownerId")
-
-	if ownerID > 0 && len(ids) == 0 {
-		userRepos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
-			Actor: &user_model.User{
-				ID: ownerID,
-			},
-			Private: ctx.IsSigned,
-			ListOptions: db.ListOptions{
-				Page:     0,
-				PageSize: 20,
-			},
-		})
-		if err != nil {
-			ctx.InternalServerError(err)
-		}
-
-		repos = userRepos
-	}
-
-	if len(repos) == 0 {
-		if len(ids) > 0 {
-			repos = make([]*repo_model.Repository, len(ids))
-			for i, id := range ids {
-				repos[i] = &repo_model.Repository{ID: id}
-			}
-		} else {
-			repos = nil
-		}
-	}
+	SendPrimaryLanguageList(ctx, 0)
+}
 
-	langs, err := repo_model.GetPrimaryRepoLanguageList(ctx, repos)
-	if err != nil {
-		ctx.InternalServerError(err)
-	}
+// List user primary languages
+func GetUserPrimaryLanguageList(ctx *context.APIContext) {
+	// swagger:operation GET /users/{username}/languages user userListPrimaryLanguages
+	// ---
+	// summary: Get primary languages and their color
+	// produces:
+	//   - application/json
+	// parameters:
+	// - name: username
+	//   in: path
+	//   description: username of user to get
+	//   type: string
+	//   required: true
+	// responses:
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	//   "200":
+	//     "$ref": "#/responses/PrimaryLanguageList"
 
-	list := map[string]string{}
+	SendPrimaryLanguageList(ctx, ctx.ContextUser.ID)
+}
 
-	for _, i := range langs {
-		list[i.Language] = i.Color
-	}
+// List org primary languages
+func GetOrgPrimaryLanguageList(ctx *context.APIContext) {
+	// swagger:operation GET /orgs/{org}/languages organization orgListPrimaryLanguages
+	// ---
+	// summary: Get primary languages and their color
+	// produces:
+	//   - application/json
+	// parameters:
+	// - name: org
+	//   in: path
+	//   description: name of the organization to get
+	//   type: string
+	//   required: true
+	// responses:
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	//   "200":
+	//     "$ref": "#/responses/PrimaryLanguageList"
 
-	ctx.JSON(http.StatusOK, list)
+	SendPrimaryLanguageList(ctx, ctx.Org.Organization.ID)
 }

routers/api/v1/swagger/repo.go

@@ -349,7 +349,7 @@ type swaggerLanguageStatistics struct {
 // swagger:response PrimaryLanguageList
 type swaggerPrimaryLanguageList struct {
 	// in: body
-	Body map[string]string `json:"body"`
+	Body []api.LanguageInfo `json:"body"`
 }
 
 // CombinedStatus

routers/web/explore/repo.go

@@ -137,7 +137,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		return
 	}
 
-	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, nil)
+	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, opts.OwnerID, opts.Private)
 	if err != nil {
 		ctx.ServerError("GetPrimaryRepoLanguageList", err)
 		return

routers/web/org/home.go

@@ -134,7 +134,7 @@ func Home(ctx *context.Context) {
 		isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID)
 	}
 
-	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, repos)
+	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, org.ID, ctx.IsSigned)
 	if err != nil {
 		ctx.ServerError("GetPrimaryRepoLanguageList", err)
 		return

routers/web/user/profile.go

@@ -266,7 +266,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi
 
 		total = int(count)
 
-		programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, repos)
+		programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, ctx.ContextUser.ID, ctx.IsSigned)
 		if err != nil {
 			ctx.ServerError("GetPrimaryRepoLanguageList", err)
 			return