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.

update short id

aichy1263367ecd20317
diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go
index 6293a681..084231d2 100644
--- a/internal/repo/answer/answer_repo.go
+++ b/internal/repo/answer/answer_repo.go
@@ -210,7 +210,9 @@ func (ar *answerRepo) GetByUserIDQuestionID(ctx context.Context, userID string,
// SearchList
func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearch) ([]*entity.Answer, int64, error) {
- search.QuestionID = uid.DeShortID(search.QuestionID)
+ if search.QuestionID != "" {
+ search.QuestionID = uid.DeShortID(search.QuestionID)
+ }
search.ID = uid.DeShortID(search.ID)
var count int64
var err error
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index a20718fe..5b1ab705 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -173,7 +173,7 @@ func (qr *questionRepo) SearchByTitleLike(ctx context.Context, title string) (qu
func (qr *questionRepo) FindByID(ctx context.Context, id []string) (questionList []*entity.Question, err error) {
for key, itemID := range id {
- id[key] = uid.EnShortID(itemID)
+ id[key] = uid.DeShortID(itemID)
}
questionList = make([]*entity.Question, 0)
err = qr.data.DB.Table("question").In("id", id).Find(&questionList)
@@ -181,7 +181,7 @@ func (qr *questionRepo) FindByID(ctx context.Context, id []string) (questionList
return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
for _, item := range questionList {
- item.ID = uid.DeShortID(item.ID)
+ item.ID = uid.EnShortID(item.ID)
}
return
}
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 36bab816..556059a9 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -26,6 +26,7 @@ import (
tagcommon "github.com/answerdev/answer/internal/service/tag_common"
usercommon "github.com/answerdev/answer/internal/service/user_common"
"github.com/answerdev/answer/pkg/htmltext"
+ "github.com/answerdev/answer/pkg/uid"
"github.com/jinzhu/copier"
"github.com/segmentfault/pacman/errors"
"github.com/segmentfault/pacman/i18n"
@@ -719,12 +720,13 @@ func (qs *QuestionService) SearchUserAnswerList(ctx context.Context, userName, o
for _, item := range answerList {
answerinfo := qs.questioncommon.AnswerCommon.ShowFormat(ctx, item)
answerlist = append(answerlist, answerinfo)
- questionIDs = append(questionIDs, item.QuestionID)
+ questionIDs = append(questionIDs, uid.DeShortID(item.QuestionID))
}
questionMaps, err := qs.questioncommon.FindInfoByID(ctx, questionIDs, loginUserID)
if err != nil {
return userAnswerlist, count, err
}
+
for _, item := range answerlist {
_, ok := questionMaps[item.QuestionID]
if ok {