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.

feat(user): change delete user display info

LinkinStarsda0bc8b76dd7
diff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.go
index c85be9fa..eec28f40 100644
--- a/internal/service/notification/notification_service.go
+++ b/internal/service/notification/notification_service.go
@@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
usercommon "github.com/answerdev/answer/internal/service/user_common"
+ "github.com/answerdev/answer/pkg/converter"
"github.com/answerdev/answer/internal/base/constant"
"github.com/answerdev/answer/internal/base/data"
@@ -214,7 +215,7 @@ func (ns *NotificationService) formatNotificationPage(ctx context.Context, notif
}
if userInfo.Status == entity.UserStatusDeleted {
item.UserInfo = &schema.UserBasicInfo{
- DisplayName: "user" + userInfo.ID,
+ DisplayName: "user" + converter.DeleteUserDisplay(userInfo.ID),
Status: constant.UserDeleted,
}
}
diff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.go
index 71990a37..42689427 100644
--- a/internal/service/user_admin/user_backyard.go
+++ b/internal/service/user_admin/user_backyard.go
@@ -108,7 +108,7 @@ func (us *UserAdminService) UpdateUserStatus(ctx context.Context, req *schema.Up
}
if req.IsDeleted() {
userInfo.Status = entity.UserStatusDeleted
- userInfo.EMail = fmt.Sprintf("%s.%d", userInfo.EMail, time.Now().UnixNano())
+ userInfo.EMail = fmt.Sprintf("%s.%d", userInfo.EMail, time.Now().Unix())
}
if req.IsSuspended() {
userInfo.Status = entity.UserStatusSuspended
diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go
index 7cb65e8f..35948e40 100644
--- a/internal/service/user_common/user.go
+++ b/internal/service/user_common/user.go
@@ -3,6 +3,7 @@ package usercommon
import (
"context"
"github.com/answerdev/answer/internal/base/constant"
+ "github.com/answerdev/answer/pkg/converter"
"strings"
"github.com/Chain-Zhang/pinyin"
@@ -136,7 +137,7 @@ func (us *UserCommon) FormatUserBasicInfo(ctx context.Context, userInfo *entity.
userBasicInfo.Status = constant.ConvertUserStatus(userInfo.Status, userInfo.MailStatus)
if userBasicInfo.Status == constant.UserDeleted {
userBasicInfo.Avatar = ""
- userBasicInfo.DisplayName = "user" + userInfo.ID
+ userBasicInfo.DisplayName = "user" + converter.DeleteUserDisplay(userInfo.ID)
}
return userBasicInfo
}
diff --git a/pkg/converter/user.go b/pkg/converter/user.go
new file mode 100644
index 00000000..d1b2611e
--- /dev/null
+++ b/pkg/converter/user.go
@@ -0,0 +1,7 @@
+package converter
+
+import "github.com/segmentfault/pacman/utils"
+
+func DeleteUserDisplay(userID string) string {
+ return utils.EnShortID(StringToInt64(userID), 100)
+}