optimize db query by "db.Exist"

Author: wxiaoguang

services/asymkey/sign.go

@@ -69,30 +69,27 @@ func signingModeFromStrings(modeStrings []string) []signingMode {
 	return returnable
 }
 
-func userHasPubkeys(ctx context.Context, u *user_model.User) (bool, error) {
-	gpgKeys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
-		OwnerID:        u.ID,
+func userHasPubkeysGPG(ctx context.Context, userID int64) (bool, error) {
+	return db.Exist[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
+		OwnerID:        userID,
 		IncludeSubKeys: true,
-	})
-	if err != nil {
-		return false, err
-	}
-	if len(gpgKeys) > 0 {
-		return true, nil
-	}
+	}.ToConds())
+}
 
-	sshKeys, err := db.Find[asymkey_model.PublicKey](ctx, asymkey_model.FindPublicKeyOptions{
-		OwnerID:    u.ID,
+func userHasPubkeysSSH(ctx context.Context, userID int64) (bool, error) {
+	return db.Exist[asymkey_model.PublicKey](ctx, asymkey_model.FindPublicKeyOptions{
+		OwnerID:    userID,
 		NotKeytype: asymkey_model.KeyTypePrincipal,
-	})
-	if err != nil {
-		return false, err
-	}
-	if len(sshKeys) > 0 {
-		return true, nil
-	}
+	}.ToConds())
+}
 
-	return false, nil
+// userHasPubkeys checks if a user has any public keys (GPG or SSH)
+func userHasPubkeys(ctx context.Context, userID int64) (bool, error) {
+	has, err := userHasPubkeysGPG(ctx, userID)
+	if has || err != nil {
+		return has, err
+	}
+	return userHasPubkeysSSH(ctx, userID)
 }
 
 // ErrWontSign explains the first reason why a commit would not be signed
@@ -196,7 +193,7 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			hasKeys, err := userHasPubkeys(ctx, u)
+			hasKeys, err := userHasPubkeys(ctx, u.ID)
 			if err != nil {
 				return false, nil, nil, err
 			}
@@ -233,7 +230,7 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			hasKeys, err := userHasPubkeys(ctx, u)
+			hasKeys, err := userHasPubkeys(ctx, u.ID)
 			if err != nil {
 				return false, nil, nil, err
 			}
@@ -286,7 +283,7 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			hasKeys, err := userHasPubkeys(ctx, u)
+			hasKeys, err := userHasPubkeys(ctx, u.ID)
 			if err != nil {
 				return false, nil, nil, err
 			}
@@ -354,7 +351,7 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			hasKeys, err := userHasPubkeys(ctx, u)
+			hasKeys, err := userHasPubkeys(ctx, u.ID)
 			if err != nil {
 				return false, nil, nil, err
 			}

services/asymkey/sign_test.go

@@ -1,38 +1,36 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package asymkey
 
 import (
 	"testing"
 
-	"code.gitea.io/gitea/models/unittest"
-	user_model "code.gitea.io/gitea/models/user"
-
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestUserHasPubkeys(t *testing.T) {
-	ctx := t.Context()
+	test := func(t *testing.T, userID int64, expectedHasGPG, expectedHasSSH bool) {
+		ctx := t.Context()
+		hasGPG, err := userHasPubkeysGPG(ctx, userID)
+		require.NoError(t, err)
+		hasSSH, err := userHasPubkeysGPG(ctx, userID)
+		require.NoError(t, err)
+		hasPubkeys, err := userHasPubkeys(ctx, userID)
+		require.NoError(t, err)
+		assert.Equal(t, expectedHasGPG, hasGPG)
+		assert.Equal(t, expectedHasSSH, hasSSH)
+		assert.Equal(t, expectedHasGPG || expectedHasSSH, hasPubkeys)
+	}
 
 	t.Run("AllowUserWithGPGKey", func(t *testing.T) {
-		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 36}) // user has GPG key
-		hasKeys, err := userHasPubkeys(ctx, user)
-		assert.NoError(t, err)
-		assert.True(t, hasKeys)
+		test(t, 36, true, false) // has gpg
 	})
-
 	t.Run("AllowUserWithSSHKey", func(t *testing.T) {
-		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // user has SSH key
-		hasKeys, err := userHasPubkeys(ctx, user)
-		assert.NoError(t, err)
-		assert.True(t, hasKeys)
+		test(t, 2, false, true) // has ssh
 	})
-
 	t.Run("DenyUserWithNoKeys", func(t *testing.T) {
-		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-		hasKeys, err := userHasPubkeys(ctx, user)
-		assert.NoError(t, err)
-		assert.False(t, hasKeys)
+		test(t, 1, false, false) // no pubkey
 	})
 }