From 347dc191b7264f2bfa97d090de7e9765dedc0924 Mon Sep 17 00:00:00 2001 From: "DESKTOP-L8OUL9F\\gfl0034" <1003614916@qq.com> Date: Thu, 24 Sep 2026 16:25:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=8D=95=E6=B5=8B=E5=86=B2=E7=AA=81=E6=AE=8B=E7=95=99=E5=B9=B6?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=20auth=5Ftype=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rebase 后 service_test 残留冲突标记，补齐 ListFeedback 筛选参数与游客 contact。 Co-authored-by: Cursor --- internal/module/client/logic/service_test.go | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/internal/module/client/logic/service_test.go b/internal/module/client/logic/service_test.go index 9b5b788..7b59c63 100644 --- a/internal/module/client/logic/service_test.go +++ b/internal/module/client/logic/service_test.go @@ -1,7 +1,6 @@ package logic import ( -<<<<<<< HEAD "context" "testing" @@ -48,8 +47,17 @@ func (s *stubClientRepo) InsertFeedback(_ context.Context, f *entity.Feedback) e return nil } -func (s *stubClientRepo) ListFeedback(_ context.Context, _, _ int) ([]entity.Feedback, int64, error) { - return s.feedback, int64(len(s.feedback)), nil +func (s *stubClientRepo) ListFeedback(_ context.Context, _, _ int, authType string) ([]entity.Feedback, int64, error) { + if authType == "" { + return s.feedback, int64(len(s.feedback)), nil + } + out := make([]entity.Feedback, 0) + for i := range s.feedback { + if s.feedback[i].AuthType == authType { + out = append(out, s.feedback[i]) + } + } + return out, int64(len(out)), nil } func (s *stubClientRepo) UpdateFeedbackStatus(_ context.Context, id int64, status string) error { @@ -133,13 +141,6 @@ func (s stubOTP) AuthenticateEmail(context.Context, string, string, *userentity. func ctxLang(lang string) context.Context { return reqctx.With(context.Background(), &reqctx.RequestContext{Language: lang}) } -======= - "testing" - - "spark-server/internal/module/client/entity" - "spark-server/internal/pkg/reqctx" -) ->>>>>>> c844c07 (feat: 意见反馈支持登录与游客分流) func TestLegalPlansFeedbackFallback(t *testing.T) { svc := NewService(nil, nil, nil) @@ -193,11 +194,11 @@ func TestClientServiceAdminAndRepo(t *testing.T) { if err := svc.UpsertLegalAdmin(ctx, &entity.LegalDocument{Key: entity.DocPrivacy, Lang: "en", Title: "Privacy", Content: "body"}); err != nil { t.Fatal(err) } - list, total, err := svc.ListFeedbackAdmin(ctx, 0, 10) + list, total, err := svc.ListFeedbackAdmin(ctx, 0, 10, "") if err != nil || total != 0 || len(list) != 0 { t.Fatalf("feedback list %+v %d %v", list, total, err) } - _, err = svc.SubmitFeedback(ctx, FeedbackInput{Content: "ok"}) + _, err = svc.SubmitFeedback(ctx, FeedbackInput{Content: "ok feedback", Contact: "guest@example.com"}) if err != nil { t.Fatal(err) }