fix: api.common and api.version logic error , hard-coding in tests (#144

) * fix: api.common and api.version logic error * fix: hard-coding error in tests * fix: lint error * fix: ci test * fix: ci test again * fix: ci test again again * fix: ci test again again again * fix: lint * fix: CI test again --------- Co-authored-by: jiuxia211 <2064166368@qq.com>
west2-online · Dec 18, 2024 · 67125a8 · 67125a8
1 parent 8886174
commit 67125a8
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 96 deletions.
diff --git a/api/handler/api/common_service.go b/api/handler/api/common_service.go
diff --git a/api/handler/api/paper_service_test.go b/api/handler/api/paper_service_test.go
@@ -34,6 +34,7 @@ import (
 	"github.com/west2-online/fzuhelper-server/api/rpc"
 	"github.com/west2-online/fzuhelper-server/kitex_gen/model"
 	"github.com/west2-online/fzuhelper-server/kitex_gen/paper"
+	"github.com/west2-online/fzuhelper-server/pkg/errno"
 )
 
 func TestGetDownloadUrl(t *testing.T) {
@@ -60,7 +61,7 @@ func TestGetDownloadUrl(t *testing.T) {
 		{
 			Name:          "BindAndValidateError",
 			ExpectedError: false,
-			ExpectedResult: `{"code":"20001","message":"parameter error, 'filepath' field is a 'required' parameter` +
+			ExpectedResult: `{"code":"20001","message":"` + errno.ParamError.ErrorMsg + `, 'filepath' field is a 'required' parameter` +
 				`, but the request body does not have this parameter 'filepath'"}`,
 			Url: "/api/v1/paper/download",
 		},
@@ -165,7 +166,7 @@ func TestListDirFiles(t *testing.T) {
 		{
 			Name:              "EmptyPath",
 			ExpectedError:     false,
-			ExpectedResult:    `{"code":"20001","message":"parameter error, path is empty"}`,
+			ExpectedResult:    `{"code":"20001","message":"` + errno.ParamError.ErrorMsg + `, path is empty"}`,
 			ExpectUpYunResult: nil,
 			Path:              "",
 		},
@@ -224,7 +225,7 @@ func TestGetDownloadUrlForAndroid(t *testing.T) {
 		{
 			Name:          "BindAndValidateError",
 			ExpectedError: false,
-			ExpectedResult: `{"code":20001,"data":null,"msg":"parameter error, 'filepath' field is a 'required' parameter,` +
+			ExpectedResult: `{"code":20001,"data":null,"msg":"` + errno.ParamError.ErrorMsg + `, 'filepath' field is a 'required' parameter,` +
 				` but the request body does not have this parameter 'filepath'"}`,
 			Url: "/api/v1/paper/download",
 		},
@@ -329,7 +330,7 @@ func TestListDirFilesForAndroid(t *testing.T) {
 		{
 			Name:              "EmptyPath",
 			ExpectedError:     false,
-			ExpectedResult:    `{"code":20001,"data":null,"msg":"parameter error, path is empty"}`,
+			ExpectedResult:    `{"code":20001,"data":null,"msg":"` + errno.ParamError.ErrorMsg + `, path is empty"}`,
 			ExpectUpYunResult: nil,
 			Path:              "",
 		},

diff --git a/api/handler/api/version_service.go b/api/handler/api/version_service.go
diff --git a/api/handler/custom/launch_screen_service.go b/api/handler/custom/launch_screen_service.go
@@ -26,7 +26,6 @@ import (
 	"github.com/west2-online/fzuhelper-server/api/rpc"
 	"github.com/west2-online/fzuhelper-server/kitex_gen/launch_screen"
 	"github.com/west2-online/fzuhelper-server/pkg/errno"
-	"github.com/west2-online/fzuhelper-server/pkg/logger"
 )
 
 // MobileGetImage .
@@ -36,7 +35,6 @@ func MobileGetImage(ctx context.Context, c *app.RequestContext) {
 	var req api.MobileGetImageRequest
 	err = c.BindAndValidate(&req)
 	if err != nil {
-		logger.Errorf("api.MobileGetImage: BindAndValidate error %v", err)
 		pack.RespError(c, errno.ParamError.WithError(err))
 		return
 	}
@@ -65,7 +63,6 @@ func AddImagePointTime(ctx context.Context, c *app.RequestContext) {
 	var req api.AddImagePointTimeRequest
 	err = c.BindAndValidate(&req)
 	if err != nil {
-		logger.Errorf("api.AddImagePointTime: BindAndValidate error %v", err)
 		pack.RespError(c, errno.ParamError.WithError(err))
 		return
 	}

diff --git a/api/handler/custom/url_service.go b/api/handler/custom/url_service.go
diff --git a/api/mw/token_test.go b/api/mw/token_test.go
@@ -28,6 +28,8 @@ import (
 	"github.com/west2-online/fzuhelper-server/pkg/constants"
 )
 
+const secretKeyExample = "MC4CAQAwBQYDK2VwBCIEIPAfnWESrQOyNXXHpMqx2xcgXXvPqvuSup4YLqIjMpI3"
+
 // TestCreateExpiredToken 是一个特殊测试，旨在生成一个过期的 Token
 func TestCreateExpiredToken(t *testing.T) {
 	// 默认生成时间是一年一个月七天前的
@@ -46,7 +48,7 @@ func TestCreateExpiredToken(t *testing.T) {
 	}
 	tokenStruct := jwt.NewWithClaims(jwt.SigningMethodEdDSA, claims)
 	key, err := jwt.ParseEdPrivateKeyFromPEM([]byte(fmt.Sprintf("%v\n%v\n%v", "-----BEGIN PRIVATE KEY-----",
-		"此处需要修改为私钥",
+		secretKeyExample,
 		"-----END PRIVATE KEY-----")))
 	if err != nil {
 		t.Errorf("parse private key failed, err: %v", err)

diff --git a/internal/common/service/get_agreement_test.go b/internal/common/service/get_agreement_test.go
@@ -18,11 +18,14 @@ package service
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
 	"testing"
 
 	"github.com/bytedance/mockey"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/west2-online/fzuhelper-server/pkg/errno"
 	"github.com/west2-online/fzuhelper-server/pkg/upyun"
 )
 
@@ -48,9 +51,12 @@ func TestGetUserAgreement(t *testing.T) {
 		{
 			name:           "FileNotFound",
 			mockFileResult: nil,
-			mockFileError:  fmt.Errorf("file not found"),
+			mockFileError:  errno.UpcloudError,
 			expectedResult: nil,
-			expectedError:  fmt.Errorf("CommonService.GetUserAgreement error:file not found"),
+			expectedError: fmt.Errorf("%s", strings.Join([]string{
+				"CommonService.GetUserAgreement error:[",
+				strconv.Itoa(errno.BizFileUploadErrorCode), "] ", errno.UpcloudError.ErrorMsg,
+			}, "")),
 		},
 	}