Skip to content

Fix tag relationship processing errors #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Fix tag relationship processing errors #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bee95c
perf: optimize tag has new tag check
sosyz Oct 26, 2024
9234042
fix: add status filter when update tag rel
sosyz Oct 27, 2024
f61b2a6
fix: wrong status when enable tag rel
sosyz Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/repo/repo_test/tag_rel_repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func Test_tagListRepo_GetObjectTagRelWithoutStatus(t *testing.T) {
assert.NoError(t, err)
assert.True(t, exist)

err = tagRelRepo.EnableTagRelByIDs(context.TODO(), ids)
err = tagRelRepo.EnableTagRelByIDs(context.TODO(), ids, false)
assert.NoError(t, err)

count, err = tagRelRepo.CountTagRelByTagID(context.TODO(), "10030000000000101")
Expand Down
26 changes: 22 additions & 4 deletions internal/repo/tag/tag_rel_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package tag

import (
"context"

"github.com/apache/incubator-answer/internal/base/data"
"github.com/apache/incubator-answer/internal/base/handler"
"github.com/apache/incubator-answer/internal/base/reason"
Expand Down Expand Up @@ -85,7 +86,7 @@ func (tr *tagRelRepo) RecoverTagRelListByObjectID(ctx context.Context, objectID

func (tr *tagRelRepo) HideTagRelListByObjectID(ctx context.Context, objectID string) (err error) {
objectID = uid.DeShortID(objectID)
_, err = tr.data.DB.Context(ctx).Where("object_id = ?", objectID).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusHide})
_, err = tr.data.DB.Context(ctx).Where("object_id = ?", objectID).And("status = ?", entity.TagRelStatusAvailable).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusHide})
if err != nil {
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
Expand All @@ -94,7 +95,7 @@ func (tr *tagRelRepo) HideTagRelListByObjectID(ctx context.Context, objectID str

func (tr *tagRelRepo) ShowTagRelListByObjectID(ctx context.Context, objectID string) (err error) {
objectID = uid.DeShortID(objectID)
_, err = tr.data.DB.Context(ctx).Where("object_id = ?", objectID).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusAvailable})
_, err = tr.data.DB.Context(ctx).Where("object_id = ?", objectID).And("status = ?", entity.TagRelStatusHide).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusAvailable})
if err != nil {
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
Expand Down Expand Up @@ -129,8 +130,12 @@ func (tr *tagRelRepo) GetObjectTagRelWithoutStatus(ctx context.Context, objectID
}

// EnableTagRelByIDs update tag status to available
func (tr *tagRelRepo) EnableTagRelByIDs(ctx context.Context, ids []int64) (err error) {
_, err = tr.data.DB.Context(ctx).In("id", ids).Update(&entity.TagRel{Status: entity.TagRelStatusAvailable})
func (tr *tagRelRepo) EnableTagRelByIDs(ctx context.Context, ids []int64, hide bool) (err error) {
status := entity.TagRelStatusAvailable
if hide {
status = entity.TagRelStatusHide
}
_, err = tr.data.DB.Context(ctx).In("id", ids).Update(&entity.TagRel{Status: status})
if err != nil {
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
Expand Down Expand Up @@ -185,3 +190,16 @@ func (tr *tagRelRepo) CountTagRelByTagID(ctx context.Context, tagID string) (cou
}
return
}

// GetTagRelDefaultStatusByObjectID get tag rel default status
func (tr *tagRelRepo) GetTagRelDefaultStatusByObjectID(ctx context.Context, objectID string) (status int, err error) {
question := entity.Question{}
exist, err := tr.data.DB.Context(ctx).ID(objectID).Cols("show", "status").Get(&question)
if err != nil {
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
if exist && (question.Show == entity.QuestionHide || question.Status == entity.QuestionStatusDeleted) {
return entity.TagRelStatusHide, nil
}
return entity.TagRelStatusAvailable, nil
}
35 changes: 17 additions & 18 deletions internal/service/tag_common/tag_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ type TagRelRepo interface {
ShowTagRelListByObjectID(ctx context.Context, objectID string) (err error)
HideTagRelListByObjectID(ctx context.Context, objectID string) (err error)
RemoveTagRelListByIDs(ctx context.Context, ids []int64) (err error)
EnableTagRelByIDs(ctx context.Context, ids []int64) (err error)
EnableTagRelByIDs(ctx context.Context, ids []int64, hide bool) (err error)
GetObjectTagRelWithoutStatus(ctx context.Context, objectId, tagID string) (tagRel *entity.TagRel, exist bool, err error)
GetObjectTagRelList(ctx context.Context, objectId string) (tagListList []*entity.TagRel, err error)
BatchGetObjectTagRelList(ctx context.Context, objectIds []string) (tagListList []*entity.TagRel, err error)
CountTagRelByTagID(ctx context.Context, tagID string) (count int64, err error)
GetTagRelDefaultStatusByObjectID(ctx context.Context, objectID string) (status int, err error)
}

// TagCommonService user service
Expand Down Expand Up @@ -290,24 +291,18 @@ func (ts *TagCommonService) ExistRecommend(ctx context.Context, tags []*schema.T

func (ts *TagCommonService) HasNewTag(ctx context.Context, tags []*schema.TagItem) (bool, error) {
tagNames := make([]string, 0)
tagMap := make(map[string]bool)
tagMap := make(map[string]struct{})
for _, item := range tags {
item.SlugName = strings.ReplaceAll(item.SlugName, " ", "-")
tagNames = append(tagNames, item.SlugName)
tagMap[item.SlugName] = false
tagMap[item.SlugName] = struct{}{}
}
list, err := ts.GetTagListByNames(ctx, tagNames)
if err != nil {
return true, err
}
for _, item := range list {
_, ok := tagMap[item.SlugName]
if ok {
tagMap[item.SlugName] = true
}
}
for _, has := range tagMap {
if !has {
if _, ok := tagMap[item.SlugName]; !ok {
return true, nil
}
}
Expand Down Expand Up @@ -768,10 +763,9 @@ func (ts *TagCommonService) ShowTagRelListByObjectID(ctx context.Context, object

// CreateOrUpdateTagRelList if tag relation is exists update status, if not create it
func (ts *TagCommonService) CreateOrUpdateTagRelList(ctx context.Context, objectId string, tagIDs []string) (err error) {
addTagIDMapping := make(map[string]bool)
needRefreshTagIDs := make([]string, 0)
addTagIDMapping := make(map[string]struct{})
for _, t := range tagIDs {
addTagIDMapping[t] = true
addTagIDMapping[t] = struct{}{}
}

// get all old relation
Expand All @@ -780,29 +774,34 @@ func (ts *TagCommonService) CreateOrUpdateTagRelList(ctx context.Context, object
return err
}
var deleteTagRel []int64
needRefreshTagIDs := make([]string, 0, len(oldTagRelList)+len(tagIDs))
needRefreshTagIDs = append(needRefreshTagIDs, tagIDs...)
for _, rel := range oldTagRelList {
if !addTagIDMapping[rel.TagID] {
if _, ok := addTagIDMapping[rel.TagID]; !ok {
deleteTagRel = append(deleteTagRel, rel.ID)
needRefreshTagIDs = append(needRefreshTagIDs, rel.TagID)
}
}

addTagRelList := make([]*entity.TagRel, 0)
enableTagRelList := make([]int64, 0)
defaultTagRelStatus, err := ts.tagRelRepo.GetTagRelDefaultStatusByObjectID(ctx, objectId)
if err != nil {
return err
}
for _, tagID := range tagIDs {
needRefreshTagIDs = append(needRefreshTagIDs, tagID)
rel, exist, err := ts.tagRelRepo.GetObjectTagRelWithoutStatus(ctx, objectId, tagID)
if err != nil {
return err
}
// if not exist add tag relation
if !exist {
addTagRelList = append(addTagRelList, &entity.TagRel{
TagID: tagID, ObjectID: objectId, Status: entity.TagStatusAvailable,
TagID: tagID, ObjectID: objectId, Status: defaultTagRelStatus,
})
}
// if exist and has been removed, that should be enabled
if exist && rel.Status != entity.TagStatusAvailable {
if exist && rel.Status != entity.TagRelStatusAvailable && rel.Status != entity.TagRelStatusHide {
enableTagRelList = append(enableTagRelList, rel.ID)
}
}
Expand All @@ -818,7 +817,7 @@ func (ts *TagCommonService) CreateOrUpdateTagRelList(ctx context.Context, object
}
}
if len(enableTagRelList) > 0 {
if err = ts.tagRelRepo.EnableTagRelByIDs(ctx, enableTagRelList); err != nil {
if err = ts.tagRelRepo.EnableTagRelByIDs(ctx, enableTagRelList, defaultTagRelStatus == entity.TagRelStatusHide); err != nil {
return err
}
}
Expand Down