mirror of https://gitee.com/answerdev/answer.git
fix(activity): return err when can not find activity type
This commit is contained in:
parent
4f835e3841
commit
fb757139ae
|
@ -63,7 +63,7 @@ func (ar *ActivityRepo) GetActivityTypeByObjKey(ctx context.Context, objectKey,
|
||||||
configKey := fmt.Sprintf("%s.%s", objectKey, action)
|
configKey := fmt.Sprintf("%s.%s", objectKey, action)
|
||||||
cfg, err := ar.configService.GetConfigByKey(ctx, configKey)
|
cfg, err := ar.configService.GetConfigByKey(ctx, configKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
return 0, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
||||||
}
|
}
|
||||||
return cfg.ID, nil
|
return cfg.ID, nil
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ func (ar *ActivityRepo) GetActivityTypeByObjKey(ctx context.Context, objectKey,
|
||||||
func (ar *ActivityRepo) GetActivityTypeByConfigKey(ctx context.Context, configKey string) (activityType int, err error) {
|
func (ar *ActivityRepo) GetActivityTypeByConfigKey(ctx context.Context, configKey string) (activityType int, err error) {
|
||||||
cfg, err := ar.configService.GetConfigByKey(ctx, configKey)
|
cfg, err := ar.configService.GetConfigByKey(ctx, configKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
return 0, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
||||||
}
|
}
|
||||||
return cfg.ID, nil
|
return cfg.ID, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"github.com/answerdev/answer/internal/service/unique"
|
"github.com/answerdev/answer/internal/service/unique"
|
||||||
"github.com/answerdev/answer/pkg/obj"
|
"github.com/answerdev/answer/pkg/obj"
|
||||||
"github.com/segmentfault/pacman/errors"
|
"github.com/segmentfault/pacman/errors"
|
||||||
|
"github.com/segmentfault/pacman/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FollowRepo follow repository
|
// FollowRepo follow repository
|
||||||
|
@ -71,11 +72,12 @@ func (ar *FollowRepo) GetFollowAmount(ctx context.Context, objectID string) (fol
|
||||||
func (ar *FollowRepo) GetFollowUserIDs(ctx context.Context, objectID string) (userIDs []string, err error) {
|
func (ar *FollowRepo) GetFollowUserIDs(ctx context.Context, objectID string) (userIDs []string, err error) {
|
||||||
objectTypeStr, err := obj.GetObjectTypeStrByObjectID(objectID)
|
objectTypeStr, err := obj.GetObjectTypeStrByObjectID(objectID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
return nil, err
|
||||||
}
|
}
|
||||||
activityType, err := ar.activityRepo.GetActivityTypeByObjKey(ctx, objectTypeStr, "follow")
|
activityType, err := ar.activityRepo.GetActivityTypeByObjKey(ctx, objectTypeStr, "follow")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
|
log.Errorf("can't get activity type by object key: %s", objectTypeStr)
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
userIDs = make([]string, 0)
|
userIDs = make([]string, 0)
|
||||||
|
|
Loading…
Reference in New Issue