calculate the category for the app

Signed-off-by: LiHui <andrewli@kubesphere.io>

pkg/models/openpitrix/categories.go

@@ -17,6 +17,8 @@ import (
 	"context"
 	"sort"
 
+	"kubesphere.io/kubesphere/pkg/utils/reposcache"
+
 	"kubesphere.io/kubesphere/pkg/apiserver/query"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -48,12 +50,14 @@ type CategoryInterface interface {
 type categoryOperator struct {
 	ctgClient typed_v1alpha1.ApplicationV1alpha1Interface
 	ctgLister listers_v1alpha1.HelmCategoryLister
+	repoCache reposcache.ReposCache
 }
 
-func newCategoryOperator(ksFactory externalversions.SharedInformerFactory, ksClient versioned.Interface) CategoryInterface {
+func newCategoryOperator(repoCache reposcache.ReposCache, ksFactory externalversions.SharedInformerFactory, ksClient versioned.Interface) CategoryInterface {
 	c := &categoryOperator{
 		ctgClient: ksClient.ApplicationV1alpha1(),
 		ctgLister: ksFactory.Application().V1alpha1().HelmCategories().Lister(),
+		repoCache: repoCache,
 	}
 
 	return c
@@ -190,8 +194,15 @@ func (c *categoryOperator) ListCategories(conditions *params.Conditions, orderBy
 	start, end := (&query.Pagination{Limit: limit, Offset: offset}).GetValidPagination(totalCount)
 	ctgs = ctgs[start:end]
 	items := make([]interface{}, 0, len(ctgs))
+
+	ctgCountsOfBuiltinRepo := c.repoCache.CopyCategoryCount()
 	for i := range ctgs {
-		items = append(items, convertCategory(ctgs[i]))
+		convertedCtg := convertCategory(ctgs[i])
+		// The statistic of category for app in etcd is stored in the crd.
+		// The statistic of category for the app in the built-in repo is stored in the memory.
+		// So we should calculate these two value then return.
+		*convertedCtg.AppTotal += ctgCountsOfBuiltinRepo[convertedCtg.CategoryID]
+		items = append(items, convertedCtg)
 	}
 
 	return &models.PageableResponse{Items: items, TotalCount: totalCount}, nil

pkg/models/openpitrix/category_test.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"testing"
 
+	"kubesphere.io/kubesphere/pkg/utils/reposcache"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakek8s "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/klog"
@@ -82,5 +84,5 @@ func prepareCategoryOperator() CategoryInterface {
 	k8sClient = fakek8s.NewSimpleClientset()
 	fakeInformerFactory = informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil)
 
-	return newCategoryOperator(fakeInformerFactory.KubeSphereSharedInformerFactory(), ksClient)
+	return newCategoryOperator(reposcache.NewReposCache(), fakeInformerFactory.KubeSphereSharedInformerFactory(), ksClient)
 }

pkg/models/openpitrix/interface.go

@@ -56,7 +56,6 @@ func init() {
 }
 
 func NewOpenpitrixOperator(ksInformers ks_informers.InformerFactory, ksClient versioned.Interface, s3Client s3.Interface) Interface {
-
 	once.Do(func() {
 		klog.Infof("start helm repo informer")
 		helmReposInformer = ksInformers.KubeSphereSharedInformerFactory().Application().V1alpha1().HelmRepos().Informer()
@@ -75,6 +74,19 @@ func NewOpenpitrixOperator(ksInformers ks_informers.InformerFactory, ksClient ve
 				cachedReposData.DeleteRepo(r)
 			},
 		})
+
+		ctgInformer := ksInformers.KubeSphereSharedInformerFactory().Application().V1alpha1().HelmCategories().Informer()
+		ctgInformer.AddIndexers(map[string]cache.IndexFunc{
+			reposcache.CategoryIndexer: func(obj interface{}) ([]string, error) {
+				ctg, _ := obj.(*v1alpha1.HelmCategory)
+				return []string{ctg.Spec.Name}, nil
+			},
+		})
+		indexer := ctgInformer.GetIndexer()
+
+		cachedReposData.SetCategoryIndexer(indexer)
+
+		go ctgInformer.Run(wait.NeverStop)
 		go helmReposInformer.Run(wait.NeverStop)
 	})
 
@@ -83,6 +95,6 @@ func NewOpenpitrixOperator(ksInformers ks_informers.InformerFactory, ksClient ve
 		ApplicationInterface: newApplicationOperator(cachedReposData, ksInformers.KubeSphereSharedInformerFactory(), ksClient, s3Client),
 		RepoInterface:        newRepoOperator(cachedReposData, ksInformers.KubeSphereSharedInformerFactory(), ksClient),
 		ReleaseInterface:     newReleaseOperator(cachedReposData, ksInformers.KubernetesSharedInformerFactory(), ksInformers.KubeSphereSharedInformerFactory(), ksClient),
-		CategoryInterface:    newCategoryOperator(ksInformers.KubeSphereSharedInformerFactory(), ksClient),
+		CategoryInterface:    newCategoryOperator(cachedReposData, ksInformers.KubeSphereSharedInformerFactory(), ksClient),
 	}
 }