From 975e6b15635a3284505457ddb1e2bda895d3abc4 Mon Sep 17 00:00:00 2001
From: QTom <qt@truesightai.com>
Date: Wed, 25 Mar 2026 19:03:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20golangci-lint=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=9A=84=205=20=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- gofmt: 修复 admin_service/antigravity_oauth_service/token_refresh_service 格式
- staticcheck S1009: 移除 SetUserSettingsResponse.IsSuccess 中冗余的 nil 检查
- unused: 将仅测试使用的 applyAntigravitySubscriptionResult 移至测试文件

Made-with: Cursor
---
 backend/internal/pkg/antigravity/client.go    |  2 +-
 backend/internal/service/admin_service.go     |  1 -
 .../service/antigravity_oauth_service.go      |  2 +-
 .../antigravity_privacy_service_test.go       | 28 ++++++++++++++++++-
 .../antigravity_subscription_service.go       | 24 ----------------
 .../internal/service/token_refresh_service.go |  1 -
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/backend/internal/pkg/antigravity/client.go b/backend/internal/pkg/antigravity/client.go
index 880db797..fdd7fea1 100644
--- a/backend/internal/pkg/antigravity/client.go
+++ b/backend/internal/pkg/antigravity/client.go
@@ -767,7 +767,7 @@ func (r *SetUserSettingsResponse) IsSuccess() bool {
 		return false
 	}
 	// userSettings 为 nil 或空 map 均视为成功
-	if r.UserSettings == nil || len(r.UserSettings) == 0 {
+	if len(r.UserSettings) == 0 {
 		return true
 	}
 	// 如果包含 telemetryEnabled 字段，说明未成功清除
diff --git a/backend/internal/service/admin_service.go b/backend/internal/service/admin_service.go
index 3ac6a144..10f71bbc 100644
--- a/backend/internal/service/admin_service.go
+++ b/backend/internal/service/admin_service.go
@@ -2740,4 +2740,3 @@ func (s *adminServiceImpl) ForceAntigravityPrivacy(ctx context.Context, account
 	applyAntigravityPrivacyMode(account, mode)
 	return mode
 }
-
diff --git a/backend/internal/service/antigravity_oauth_service.go b/backend/internal/service/antigravity_oauth_service.go
index e0caae4c..a300d898 100644
--- a/backend/internal/service/antigravity_oauth_service.go
+++ b/backend/internal/service/antigravity_oauth_service.go
@@ -322,7 +322,7 @@ func (s *AntigravityOAuthService) RefreshAccountToken(ctx context.Context, accou
 // loadCodeAssistResult 封装 loadProjectIDWithRetry 的返回结果，
 // 同时携带从 LoadCodeAssist 响应中提取的 plan_type 信息。
 type loadCodeAssistResult struct {
-	ProjectID string
+	ProjectID    string
 	Subscription *AntigravitySubscriptionResult
 }
 
diff --git a/backend/internal/service/antigravity_privacy_service_test.go b/backend/internal/service/antigravity_privacy_service_test.go
index 11f05ab9..893500a6 100644
--- a/backend/internal/service/antigravity_privacy_service_test.go
+++ b/backend/internal/service/antigravity_privacy_service_test.go
@@ -2,7 +2,33 @@
 
 package service
 
-import "testing"
+import (
+	"testing"
+)
+
+func applyAntigravitySubscriptionResult(account *Account, result AntigravitySubscriptionResult) (map[string]any, map[string]any) {
+	credentials := make(map[string]any)
+	for k, v := range account.Credentials {
+		credentials[k] = v
+	}
+	credentials["plan_type"] = result.PlanType
+
+	extra := make(map[string]any)
+	for k, v := range account.Extra {
+		extra[k] = v
+	}
+	if result.SubscriptionStatus != "" {
+		extra["subscription_status"] = result.SubscriptionStatus
+	} else {
+		delete(extra, "subscription_status")
+	}
+	if result.SubscriptionError != "" {
+		extra["subscription_error"] = result.SubscriptionError
+	} else {
+		delete(extra, "subscription_error")
+	}
+	return credentials, extra
+}
 
 func TestApplyAntigravityPrivacyMode_SetsInMemoryExtra(t *testing.T) {
 	account := &Account{}
diff --git a/backend/internal/service/antigravity_subscription_service.go b/backend/internal/service/antigravity_subscription_service.go
index 46904427..04559be8 100644
--- a/backend/internal/service/antigravity_subscription_service.go
+++ b/backend/internal/service/antigravity_subscription_service.go
@@ -36,27 +36,3 @@ func NormalizeAntigravitySubscription(resp *antigravity.LoadCodeAssistResponse)
 		PlanType: antigravity.TierIDToPlanType(tierID),
 	}
 }
-
-func applyAntigravitySubscriptionResult(account *Account, result AntigravitySubscriptionResult) (map[string]any, map[string]any) {
-	credentials := make(map[string]any)
-	for k, v := range account.Credentials {
-		credentials[k] = v
-	}
-	credentials["plan_type"] = result.PlanType
-
-	extra := make(map[string]any)
-	for k, v := range account.Extra {
-		extra[k] = v
-	}
-	if result.SubscriptionStatus != "" {
-		extra["subscription_status"] = result.SubscriptionStatus
-	} else {
-		delete(extra, "subscription_status")
-	}
-	if result.SubscriptionError != "" {
-		extra["subscription_error"] = result.SubscriptionError
-	} else {
-		delete(extra, "subscription_error")
-	}
-	return credentials, extra
-}
diff --git a/backend/internal/service/token_refresh_service.go b/backend/internal/service/token_refresh_service.go
index f3d7ce58..ac14aa56 100644
--- a/backend/internal/service/token_refresh_service.go
+++ b/backend/internal/service/token_refresh_service.go
@@ -526,4 +526,3 @@ func (s *TokenRefreshService) ensureAntigravityPrivacy(ctx context.Context, acco
 		)
 	}
 }
-