fix: prioritize org namespace matches in search

Author: Dev Agent

builder/store/database/organization.go

@@ -58,7 +58,7 @@ type Organization struct {
 	OrgType      string             `bun:"" json:"org_type"`
 	User         *User              `bun:"rel:belongs-to,join:user_id=id" json:"user"`
 	NamespaceID  int64              `bun:",notnull" json:"namespace_id"`
-	Namespace    *Namespace         `bun:"rel:has-one,join:namespace_id=id" json:"namespace"`
+	Namespace    *Namespace         `bun:"rel:has-one,join:path=path" json:"namespace"`
 	VerifyStatus types.VerifyStatus `bun:",notnull,default:'none'" json:"verify_status"` // none, pending, approved, rejected
 	UUID         uuid.UUID          `bun:"type:uuid,notnull,unique" json:"uuid"`
 	times
@@ -78,6 +78,11 @@ func (s *orgStoreImpl) Create(ctx context.Context, org *Organization, namepace *
 		if err != nil {
 			return err
 		}
+		// update org's namespace id
+		org.NamespaceID = namepace.ID
+		if err = assertAffectedOneRow(tx.NewUpdate().Model(org).WherePK().Exec(ctx)); err != nil {
+			return err
+		}
 		return nil
 	})
 	err = errorx.HandleDBError(err, nil)
@@ -88,6 +93,7 @@ func (s *orgStoreImpl) GetUserOwnOrgs(ctx context.Context, username string) (org
 	query := s.db.Operator.Core.
 		NewSelect().
 		Model(&orgs).
+		Relation("Namespace").
 		Relation("User")
 	if username != "" {
 		query = query.
@@ -138,8 +144,8 @@ func (s *orgStoreImpl) FindByPath(ctx context.Context, path string) (org Organiz
 	org.Nickname = path
 	err = s.db.Operator.Core.
 		NewSelect().
-		Model(&org).
-		Where("path =?", path).
+		Model(&org).Relation("Namespace").
+		Where("organization.path =?", path).
 		Scan(ctx)
 	return org, errorx.HandleDBError(err, nil)
 }
@@ -161,6 +167,7 @@ func (s *orgStoreImpl) GetUserBelongOrgs(ctx context.Context, userID int64) (org
 	err = s.db.Operator.Core.
 		NewSelect().
 		Model(&orgs).
+		Relation("Namespace").
 		Join("join members on members.organization_id = organization.id").
 		Where("members.user_id = ? and members.deleted_at is null", userID).
 		Scan(ctx, &orgs)
@@ -170,9 +177,18 @@ func (s *orgStoreImpl) GetUserBelongOrgs(ctx context.Context, userID int64) (org
 func (s *orgStoreImpl) Search(ctx context.Context, search string, per int, page int, orgType, verifyStatus string) (orgs []Organization, total int, err error) {
 	search = strings.ToLower(search)
 	query := s.db.Operator.Core.NewSelect().
-		Model(&orgs)
+		Model(&orgs).Relation("Namespace")
 	if search != "" {
-		query.Where("LOWER(name) like ? OR LOWER(path) like ?", fmt.Sprintf("%%%s%%", search), fmt.Sprintf("%%%s%%", search))
+		query.Where("LOWER(organization.name) like ? OR LOWER(organization.path) like ?", fmt.Sprintf("%%%s%%", search), fmt.Sprintf("%%%s%%", search))
+		query.OrderExpr(`
+			CASE
+				WHEN LOWER(organization.path) = ? THEN 0
+				WHEN LOWER(organization.path) LIKE ? THEN 1
+				WHEN LOWER(organization.name) = ? THEN 2
+				WHEN LOWER(organization.name) LIKE ? THEN 3
+				ELSE 4
+			END
+		`, search, fmt.Sprintf("%s%%", search), search, fmt.Sprintf("%s%%", search))
 	}
 	if orgType != "" {
 		query.Where("org_type = ?", orgType)
@@ -227,8 +243,8 @@ func (s *orgStoreImpl) GetSharedOrgIDs(ctx context.Context, userIDs []int64) ([]
 func (s *orgStoreImpl) FindByUUID(ctx context.Context, uuid string) (*Organization, error) {
 	var org Organization
 	err := s.db.Operator.Core.NewSelect().
-		Model(&org).
-		Where("uuid = ?", uuid).
+		Model(&org).Relation("Namespace").
+		Where("organization.uuid = ?", uuid).
 		Scan(ctx)
 	if err == nil {
 		return &org, nil

builder/store/database/organization_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"slices"
 	"testing"
 	"time"
 
@@ -259,3 +260,85 @@ func TestOrganizationStore_FindByUUID(t *testing.T) {
 	require.NotNil(t, err)
 	require.Nil(t, org)
 }
+
+func TestOrganizationStore_SearchOrder(t *testing.T) {
+	db := tests.InitTestDB()
+	defer db.Close()
+	ctx := context.TODO()
+
+	store := database.NewOrgStoreWithDB(db)
+	orgsToCreate := []database.Organization{
+		{
+			Name:     "sss",
+			Nickname: "zzz org",
+			UUID:     uuid.New(),
+		},
+		{
+			Name:     "sss-team",
+			Nickname: "alpha org",
+			UUID:     uuid.New(),
+		},
+		{
+			Name:     "team-01",
+			Nickname: "sss",
+			UUID:     uuid.New(),
+		},
+		{
+			Name:     "team-02",
+			Nickname: "sss group",
+			UUID:     uuid.New(),
+		},
+		{
+			Name:     "team-03",
+			Nickname: "group sss",
+			UUID:     uuid.New(),
+		},
+	}
+
+	for _, org := range orgsToCreate {
+		err := store.Create(ctx, &org, &database.Namespace{Path: org.Name})
+		require.Nil(t, err)
+	}
+
+	orgs, total, err := store.Search(ctx, "sss", 10, 1, "", "")
+	require.Nil(t, err)
+	require.Equal(t, 5, total)
+
+	gotNames := make([]string, 0, len(orgs))
+	for _, org := range orgs {
+		gotNames = append(gotNames, org.Name)
+	}
+
+	require.Equal(t, []string{"sss", "sss-team", "team-01", "team-02", "team-03"}, gotNames)
+}
+
+func TestOrganizationStore_SearchOrderCaseInsensitive(t *testing.T) {
+	db := tests.InitTestDB()
+	defer db.Close()
+	ctx := context.TODO()
+
+	store := database.NewOrgStoreWithDB(db)
+	err := store.Create(ctx, &database.Organization{
+		Name:     "SSS-Exact",
+		Nickname: "display",
+		UUID:     uuid.New(),
+	}, &database.Namespace{Path: "SSS-Exact"})
+	require.Nil(t, err)
+	err = store.Create(ctx, &database.Organization{
+		Name:     "other",
+		Nickname: "sss",
+		UUID:     uuid.New(),
+	}, &database.Namespace{Path: "other"})
+	require.Nil(t, err)
+
+	orgs, total, err := store.Search(ctx, "sss-exact", 10, 1, "", "")
+	require.Nil(t, err)
+	require.Equal(t, 1, total)
+	require.Len(t, orgs, 1)
+	require.Equal(t, "SSS-Exact", orgs[0].Name)
+
+	orgs, total, err = store.Search(ctx, "SSS", 10, 1, "", "")
+	require.Nil(t, err)
+	require.Equal(t, 2, total)
+	require.True(t, slices.Equal([]string{"SSS-Exact", "other"}, []string{orgs[0].Name, orgs[1].Name}))
+}

user/component/organization.go

@@ -21,6 +21,7 @@ type OrganizationComponent interface {
 	Create(ctx context.Context, req *types.CreateOrgReq) (*types.Organization, error)
 	Index(ctx context.Context, username, search string, per, page int, orgType, verifyStatus string) ([]types.Organization, int, error)
 	Get(ctx context.Context, orgName string) (*types.Organization, error)
+	GetByUUID(ctx context.Context, uuid string) (*types.Organization, error)
 	Delete(ctx context.Context, req *types.DeleteOrgReq) error
 	Update(ctx context.Context, req *types.EditOrgReq) (*database.Organization, error)
 }
@@ -98,15 +99,24 @@ func (c *organizationComponentImpl) Create(ctx context.Context, req *types.Creat
 	dbOrg.Logo = req.Logo
 	dbOrg.OrgType = req.OrgType
 	dbOrg.Verified = req.Verified
+	dbOrg.UUID = uuid.New()
+
+	exist, err := c.nsStore.ExistsByUUID(ctx, dbOrg.UUID.String())
+	if err != nil {
+		return nil, err
+	}
+
+	// use the org uuid as the namespace uuid by default
+	newNSUUID := dbOrg.UUID.String()
+	if exist {
+		// generate a new uuid if the uuid already exists
+		newNSUUID = uuid.New().String()
+	}
+
 	namespace := &database.Namespace{
 		Path:   dbOrg.Name,
 		UserID: user.ID,
-	}
-	dbOrg.UUID = uuid.New()
-
-	chkUser, err := c.userStore.FindByUUID(ctx, dbOrg.UUID.String())
-	if err == nil && chkUser != nil && chkUser.UUID == dbOrg.UUID.String() {
-		return nil, errorx.UUIDConflict(dbOrg.UUID.String())
+		UUID:   newNSUUID,
 	}
 	err = c.orgStore.Create(ctx, dbOrg, namespace)
 	if err != nil {
@@ -131,6 +141,11 @@ func (c *organizationComponentImpl) Create(ctx context.Context, req *types.Creat
 		OrgType:  dbOrg.OrgType,
 		Verified: dbOrg.Verified,
 		UUID:     dbOrg.UUID,
+		Namespace: &types.Namespace{
+			Path: dbOrg.Name,
+			Type: string(namespace.NamespaceType),
+			UUID: namespace.UUID,
+		},
 	}
 	return org, err
 }
@@ -169,6 +184,13 @@ func (c *organizationComponentImpl) Index(ctx context.Context, username, search
 			VerifyStatus: string(dborg.VerifyStatus),
 			UUID:         dborg.UUID,
 		}
+		if dborg.Namespace != nil {
+			org.Namespace = &types.Namespace{
+				Path: dborg.Namespace.Path,
+				Type: string(dborg.Namespace.NamespaceType),
+				UUID: dborg.Namespace.UUID,
+			}
+		}
 		orgs = append(orgs, org)
 	}
 	return orgs, total, nil
@@ -188,6 +210,37 @@ func (c *organizationComponentImpl) Get(ctx context.Context, orgName string) (*t
 		Verified: dborg.Verified,
 		UUID:     dborg.UUID,
 	}
+	if dborg.Namespace != nil {
+		org.Namespace = &types.Namespace{
+			Path: dborg.Nickname,
+			Type: string(dborg.Namespace.NamespaceType),
+			UUID: dborg.Namespace.UUID,
+		}
+	}
+	return org, nil
+}
+
+func (c *organizationComponentImpl) GetByUUID(ctx context.Context, uuid string) (*types.Organization, error) {
+	dborg, err := c.orgStore.FindByUUID(ctx, uuid)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get organization by uuid, error: %w", err)
+	}
+	org := &types.Organization{
+		Name:     dborg.Name,
+		Nickname: dborg.Nickname,
+		Homepage: dborg.Homepage,
+		Logo:     dborg.Logo,
+		OrgType:  dborg.OrgType,
+		Verified: dborg.Verified,
+		UUID:     dborg.UUID,
+	}
+	if dborg.Namespace != nil {
+		org.Namespace = &types.Namespace{
+			Path: dborg.Nickname,
+			Type: string(dborg.Namespace.NamespaceType),
+			UUID: dborg.Namespace.UUID,
+		}
+	}
 	return org, nil
 }
 

user/component/organization_test.go

@@ -78,6 +78,10 @@ func TestOrganizationComponent_Index(t *testing.T) {
 		Logo:     "org-logo.png",
 		OrgType:  "school",
 		Verified: false,
+		Namespace: &database.Namespace{
+			Path:          "org1",
+			NamespaceType: database.OrgNamespace,
+		},
 	})
 	dbOrgs = append(dbOrgs, database.Organization{
 		ID:       2,
@@ -87,6 +91,10 @@ func TestOrganizationComponent_Index(t *testing.T) {
 		Logo:     "org-logo.png",
 		OrgType:  "school",
 		Verified: false,
+		Namespace: &database.Namespace{
+			Path:          "org2",
+			NamespaceType: database.OrgNamespace,
+		},
 	})
 	mockOrgStore := mockdb.NewMockOrgStore(t)
 	mockOrgStore.EXPECT().GetUserOwnOrgs(mock.Anything, "user1").Return(dbOrgs, len(dbOrgs), nil).Once()
@@ -127,6 +135,12 @@ func TestOrganizationComponent_Index(t *testing.T) {
 			if expectedOrgs[i].Verified != dbOrgs[i].Verified {
 				return false
 			}
+			if expectedOrgs[i].Namespace == nil {
+				return false
+			}
+			if expectedOrgs[i].Namespace.Path != dbOrgs[i].Namespace.Path {
+				return false
+			}
 		}
 		return true
 	})