From d51cd98e127720bb4dfb109b66e4e3bf81188be4 Mon Sep 17 00:00:00 2001 From: hongming Date: Fri, 21 Feb 2020 14:38:54 +0800 Subject: [PATCH] fix: use constants Signed-off-by: hongming --- pkg/apiserver/openpitrix/apps.go | 2 +- pkg/apiserver/openpitrix/categories.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apiserver/openpitrix/apps.go b/pkg/apiserver/openpitrix/apps.go index c5a2953be..cc573351c 100644 --- a/pkg/apiserver/openpitrix/apps.go +++ b/pkg/apiserver/openpitrix/apps.go @@ -230,7 +230,7 @@ func ListAppVersions(req *restful.Request, resp *restful.Response) { if statistics { for _, item := range result.Items { if version, ok := item.(*openpitrix.AppVersion); ok { - statisticsResult, err := openpitrix.ListApplications(¶ms.Conditions{Match: map[string]string{"app_id": version.AppId, "version_id": version.VersionId}}, 0, 0, "", false) + statisticsResult, err := openpitrix.ListApplications(¶ms.Conditions{Match: map[string]string{openpitrix.AppId: version.AppId, openpitrix.VersionId: version.VersionId}}, 0, 0, "", false) if err != nil { klog.Errorln(err) resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err)) diff --git a/pkg/apiserver/openpitrix/categories.go b/pkg/apiserver/openpitrix/categories.go index c1b05162b..b8940110a 100644 --- a/pkg/apiserver/openpitrix/categories.go +++ b/pkg/apiserver/openpitrix/categories.go @@ -151,7 +151,7 @@ func ListCategories(req *restful.Request, resp *restful.Response) { if statistics { for _, item := range result.Items { if category, ok := item.(*openpitrix.Category); ok { - statisticsResult, err := openpitrix.ListApps(¶ms.Conditions{Match: map[string]string{"category_id": category.CategoryID, "status": openpitrix.StatusActive, "repo": openpitrix.BuiltinRepoId}}, "", false, 0, 0) + statisticsResult, err := openpitrix.ListApps(¶ms.Conditions{Match: map[string]string{openpitrix.CategoryId: category.CategoryID, openpitrix.Status: openpitrix.StatusActive, openpitrix.RepoId: openpitrix.BuiltinRepoId}}, "", false, 0, 0) if err != nil { klog.Errorln(err) resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))