Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix CheckChangeReservedTag

aichy126e914edd5a002
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 16266afb..fb09395f 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -354,10 +354,21 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
// if user can not use reserved tag, old reserved tag can not be removed and new reserved tag can not be added.
if !req.CanUseReservedTag {
- CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
- if !CheckTag {
+ CheckOldTag, CheckNewTag, CheckOldTaglist, CheckNewTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
+ if !CheckOldTag {
errMsg := fmt.Sprintf(`The reserved tag "%s" must be present.`,
- strings.Join(CheckTaglist, ","))
+ strings.Join(CheckOldTaglist, ","))
+ errorlist := make([]*validator.FormErrorField, 0)
+ errorlist = append(errorlist, &validator.FormErrorField{
+ ErrorField: "tags",
+ ErrorMsg: errMsg,
+ })
+ err = errors.BadRequest(reason.RequestFormatError).WithMsg(errMsg)
+ return errorlist, err
+ }
+ if !CheckNewTag {
+ errMsg := fmt.Sprintf(`"%s" can only be used by moderators.`,
+ strings.Join(CheckNewTaglist, ","))
errorlist := make([]*validator.FormErrorField, 0)
errorlist = append(errorlist, &validator.FormErrorField{
ErrorField: "tags",
@@ -474,7 +485,7 @@ func (qs *QuestionService) ChangeTag(ctx context.Context, objectTagData *schema.
return qs.tagCommon.ObjectChangeTag(ctx, objectTagData)
}
-func (qs *QuestionService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
+func (qs *QuestionService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, bool, []string, []string) {
return qs.tagCommon.CheckChangeReservedTag(ctx, oldobjectTagData, objectTagData)
}
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 7317c0fc..dfdb832a 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -443,9 +443,10 @@ func (ts *TagCommonService) CheckTagsIsChange(ctx context.Context, tagNameList,
return false
}
-func (ts *TagCommonService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
+func (ts *TagCommonService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, bool, []string, []string) {
reservedTagsMap := make(map[string]bool)
needTagsMap := make([]string, 0)
+ notNeedTagsMap := make([]string, 0)
for _, tag := range objectTagData {
if tag.Reserved {
reservedTagsMap[tag.SlugName] = true
@@ -456,14 +457,27 @@ func (ts *TagCommonService) CheckChangeReservedTag(ctx context.Context, oldobjec
_, ok := reservedTagsMap[tag.SlugName]
if !ok {
needTagsMap = append(needTagsMap, tag.SlugName)
+ } else {
+ reservedTagsMap[tag.SlugName] = false
}
}
}
+
+ for k, v := range reservedTagsMap {
+ if v {
+ notNeedTagsMap = append(notNeedTagsMap, k)
+ }
+ }
+
if len(needTagsMap) > 0 {
- return false, needTagsMap
+ return false, true, needTagsMap, []string{}
+ }
+
+ if len(notNeedTagsMap) > 0 {
+ return true, false, []string{}, notNeedTagsMap
}
- return true, []string{}
+ return true, true, []string{}, []string{}
}
// ObjectChangeTag change object tag list