searching and pagination organization (#206)

Co-authored-by: Lei Da <[email protected]>
OpenCSGs · Jan 8, 2025 · 54a7714 · 54a7714
1 parent 87c11be
commit 54a7714
Show file tree

Hide file tree

Showing 11 changed files with 346 additions and 103 deletions.
diff --git a/_mocks/opencsg.com/csghub-server/builder/store/database/mock_OrgStore.go b/_mocks/opencsg.com/csghub-server/builder/store/database/mock_OrgStore.go
diff --git a/_mocks/opencsg.com/csghub-server/user/component/mock_OrganizationComponent.go b/_mocks/opencsg.com/csghub-server/user/component/mock_OrganizationComponent.go
diff --git a/builder/store/database/organization.go b/builder/store/database/organization.go
@@ -2,6 +2,8 @@ package database
 
 import (
 	"context"
+	"fmt"
+	"strings"
 
 	"github.com/uptrace/bun"
 )
@@ -12,12 +14,13 @@ type orgStoreImpl struct {
 
 type OrgStore interface {
 	Create(ctx context.Context, org *Organization, namepace *Namespace) (err error)
-	GetUserOwnOrgs(ctx context.Context, username string) (orgs []Organization, err error)
+	GetUserOwnOrgs(ctx context.Context, username string) (orgs []Organization, total int, err error)
 	Update(ctx context.Context, org *Organization) (err error)
 	Delete(ctx context.Context, path string) (err error)
 	FindByPath(ctx context.Context, path string) (org Organization, err error)
 	Exists(ctx context.Context, path string) (exists bool, err error)
 	GetUserBelongOrgs(ctx context.Context, userID int64) (orgs []Organization, err error)
+	Search(ctx context.Context, search string, per, page int) (orgs []Organization, total int, err error)
 }
 
 func NewOrgStore() OrgStore {
@@ -64,7 +67,7 @@ func (s *orgStoreImpl) Create(ctx context.Context, org *Organization, namepace *
 	return
 }
 
-func (s *orgStoreImpl) GetUserOwnOrgs(ctx context.Context, username string) (orgs []Organization, err error) {
+func (s *orgStoreImpl) GetUserOwnOrgs(ctx context.Context, username string) (orgs []Organization, total int, err error) {
 	query := s.db.Operator.Core.
 		NewSelect().
 		Model(&orgs).
@@ -76,6 +79,7 @@ func (s *orgStoreImpl) GetUserOwnOrgs(ctx context.Context, username string) (org
 	}
 
 	err = query.Scan(ctx, &orgs)
+	total = len(orgs)
 	return
 }
 
@@ -141,3 +145,22 @@ func (s *orgStoreImpl) GetUserBelongOrgs(ctx context.Context, userID int64) (org
 		Scan(ctx, &orgs)
 	return
 }
+
+func (s *orgStoreImpl) Search(ctx context.Context, search string, per int, page int) (orgs []Organization, total int, err error) {
+	search = strings.ToLower(search)
+	query := s.db.Operator.Core.NewSelect().
+		Model(&orgs)
+	if search != "" {
+		query.Where("LOWER(name) like ? OR LOWER(path) like ?", fmt.Sprintf("%%%s%%", search), fmt.Sprintf("%%%s%%", search))
+	}
+	total, err = query.Count(ctx)
+	if err != nil {
+		return
+	}
+	query.Order("id asc").Limit(per).Offset((page - 1) * per)
+	err = query.Scan(ctx, &orgs)
+	if err != nil {
+		return
+	}
+	return
+}
diff --git a/builder/store/database/organization_test.go b/builder/store/database/organization_test.go
@@ -16,10 +16,27 @@ func TestOrganizationStore_CRUD(t *testing.T) {
 
 	store := database.NewOrgStoreWithDB(db)
 	err := store.Create(ctx, &database.Organization{
-		Name: "o1",
+		Name:     "o1",
+		Nickname: "o1_nickname",
 	}, &database.Namespace{Path: "o1"})
 	require.Nil(t, err)
 
+	//search with name
+	orgs, total, err := store.Search(ctx, "o1", 10, 1)
+	require.Nil(t, err)
+	require.Equal(t, 1, total)
+	require.Equal(t, "o1", orgs[0].Name)
+	//search with nickname
+	orgs, total, err = store.Search(ctx, "nickname", 10, 1)
+	require.Nil(t, err)
+	require.Equal(t, 1, total)
+	require.Equal(t, "o1_nickname", orgs[0].Nickname)
+	//empty search second page
+	orgs, total, err = store.Search(ctx, "nickname", 10, 2)
+	require.Nil(t, err)
+	require.Equal(t, 1, total)
+	require.Empty(t, orgs)
+
 	org := &database.Organization{}
 	err = db.Core.NewSelect().Model(org).Where("path=?", "o1").Scan(ctx)
 	require.Nil(t, err)
@@ -63,9 +80,10 @@ func TestOrganizationStore_CRUD(t *testing.T) {
 	err = store.Update(ctx, org)
 	require.Nil(t, err)
 
-	orgs, err := store.GetUserOwnOrgs(ctx, "u1")
+	orgs, total, err = store.GetUserOwnOrgs(ctx, "u1")
 	require.Nil(t, err)
 	require.Equal(t, 1, len(orgs))
+	require.Equal(t, 1, total)
 
 	orgs, err = store.GetUserBelongOrgs(ctx, 321)
 	require.Nil(t, err)

diff --git a/cmd/csghub-server/cmd/trigger/fix_org_data.go b/cmd/csghub-server/cmd/trigger/fix_org_data.go
@@ -36,7 +36,7 @@ var fixOrgDataCmd = &cobra.Command{
 		orgComponent, _ := component.NewOrganizationComponent(cfg)
 
 		// get all organizations
-		orgs, err = os.GetUserOwnOrgs(ctx, "")
+		orgs, _, err = os.GetUserOwnOrgs(ctx, "")
 		for _, org := range orgs {
 			req := new(types.CreateOrgReq)
 			req.Name = org.Name