feat: more precise and detailed handling of errors

internal/paper/handler.go

@@ -19,6 +19,7 @@ package paper
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/west2-online/fzuhelper-server/internal/paper/service"
 	"github.com/west2-online/fzuhelper-server/kitex_gen/model"
@@ -47,12 +48,12 @@ func (s *PaperServiceImpl) ListDirFiles(ctx context.Context, req *paper.ListDirF
 
 	success, fileDir, err = service.NewPaperService(ctx, s.ClientSet).GetDir(req)
 	if !success {
-		logger.Infof("Paper.ListDirFiles: get dir info failed from upyun")
+		logger.Errorf("Paper.ListDirFiles: get dir info failed from upyun")
 		resp.Base = base.BuildBaseResp(errors.New("failed to get info from upyun"))
 		return resp, nil
 	}
 	if err != nil {
-		logger.Infof("Paper.ListDirFiles: get dir info failed: %v", err)
+		base.LogError(fmt.Errorf("Paper.ListDirFiles: get dir info failed: %w", err))
 		resp.Base = base.BuildBaseResp(errors.New("failed to get info from upyun"))
 		return resp, nil
 	}
@@ -68,8 +69,7 @@ func (s *PaperServiceImpl) GetDownloadUrl(ctx context.Context, req *paper.GetDow
 
 	url, err := service.NewPaperService(ctx, s.ClientSet).GetDownloadUrl(req)
 	if err != nil {
-		logger.Infof("Paper.GetDownloadUrl: get download url failed: %v", err)
-		resp.Base = base.BuildBaseResp(err)
+		resp.Base = base.BuildRespAndLog(fmt.Errorf("Paper.GetDownloadUrl: get download url failed: %w", err))
 		return resp, nil
 	}
 

internal/paper/service/get_dir.go

@@ -49,6 +49,9 @@ func (s *PaperService) GetDir(req *paper.ListDirFilesRequest) (bool, *model.UpYu
 		return false, nil, fmt.Errorf("service.GetDir: get dir info failed: %w", err)
 	}
 
-	err = s.cache.Paper.SetFileDirCache(s.ctx, key, *fileDir)
+	if err = s.cache.Paper.SetFileDirCache(s.ctx, key, *fileDir); err != nil {
+		return true, fileDir, fmt.Errorf("service.GetDir: set file dir cache failed: %w", err)
+	}
+
 	return true, fileDir, err
 }

pkg/base/pack.go

@@ -47,8 +47,28 @@ func LogError(err error) {
 
 	e := errno.ConvertErr(err)
 	if e.StackTrace() != nil {
-		logger.Errorf("%s\n%+v", err.Error(), e.StackTrace())
+		logger.LErrorf("%v\nStacktrace:%+v\n", err, e.StackTrace())
 		return
 	}
-	logger.Errorf("%s\n", err.Error())
+	logger.LErrorf("%v\n", err)
+}
+
+func BuildRespAndLog(err error) *model.BaseResp {
+	if err == nil {
+		return &model.BaseResp{
+			Code: errno.SuccessCode,
+			Msg:  errno.Success.ErrorMsg,
+		}
+	}
+
+	Errno := errno.ConvertErr(err)
+	if Errno.StackTrace() != nil {
+		logger.LErrorf("%v\nStacktrace:%+v\n", err, Errno.StackTrace())
+	} else {
+		logger.LErrorf("%v\n", err)
+	}
+	return &model.BaseResp{
+		Code: Errno.ErrorCode,
+		Msg:  Errno.ErrorMsg,
+	}
 }

pkg/base/pack_test.go

@@ -0,0 +1,66 @@
+/*
+Copyright 2024 The west2-online Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package base
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/west2-online/fzuhelper-server/pkg/errno"
+)
+
+func TestBuildBaseResp(t *testing.T) {
+	nilError := BuildBaseResp(nil)
+	assert.Equal(t, int64(errno.SuccessCode), nilError.Code)
+	assert.Equal(t, errno.Success.ErrorMsg, nilError.Msg)
+
+	normalError := BuildBaseResp(fmt.Errorf("ok"))
+	assert.Equal(t, int64(errno.InternalServiceErrorCode), normalError.Code)
+	assert.Equal(t, "ok", normalError.Msg)
+
+	errnoError := BuildBaseResp(errno.NewErrNo(200, "ok"))
+	assert.Equal(t, int64(200), errnoError.Code)
+	assert.Equal(t, "ok", errnoError.Msg)
+}
+
+func TestBuildSuccessResp(t *testing.T) {
+	r := BuildSuccessResp()
+	assert.Equal(t, int64(errno.SuccessCode), r.Code)
+	assert.Equal(t, errno.Success.ErrorMsg, r.Msg)
+}
+
+func TestLogError(t *testing.T) {
+	LogError(nil)
+	LogError(fmt.Errorf("ok"))
+	LogError(errno.Success)
+}
+
+func TestBuildRespAndLog(t *testing.T) {
+	nilError := BuildBaseResp(nil)
+	assert.Equal(t, int64(errno.SuccessCode), nilError.Code)
+	assert.Equal(t, errno.Success.ErrorMsg, nilError.Msg)
+
+	normalError := BuildBaseResp(fmt.Errorf("ok"))
+	assert.Equal(t, int64(errno.InternalServiceErrorCode), normalError.Code)
+	assert.Equal(t, "ok", normalError.Msg)
+
+	errnoError := BuildBaseResp(errno.NewErrNo(200, "ok"))
+	assert.Equal(t, int64(200), errnoError.Code)
+	assert.Equal(t, "ok", errnoError.Msg)
+}

pkg/cache/paper/get_file_dir.go

@@ -18,23 +18,23 @@ package paper
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/bytedance/sonic"
 
 	"github.com/west2-online/fzuhelper-server/kitex_gen/model"
+	"github.com/west2-online/fzuhelper-server/pkg/errno"
 )
 
 func (c *CachePaper) GetFileDirCache(ctx context.Context, key string) (bool, *model.UpYunFileDir, error) {
 	ret := &model.UpYunFileDir{}
 
 	data, err := c.client.Get(ctx, key).Bytes()
 	if err != nil {
-		return false, ret, fmt.Errorf("dal.GetFileDirCache: get dir info failed: %w", err)
+		return false, ret, errno.Errorf(errno.InternalDatabaseErrorCode, "dal.GetFileDirCache: get dir info failed: %v", err)
 	}
 	err = sonic.Unmarshal(data, &ret)
 	if err != nil {
-		return false, ret, fmt.Errorf("dal.GetFileDirCache: Unmarshal dir info failed: %w", err)
+		return false, ret, errno.Errorf(errno.InternalJSONErrorCode, "dal.GetFileDirCache: Unmarshal dir info failed: %v", err)
 	}
 	return true, ret, nil
 }

pkg/cache/paper/set_file_dir.go

@@ -18,20 +18,23 @@ package paper
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/bytedance/sonic"
 
 	"github.com/west2-online/fzuhelper-server/kitex_gen/model"
 	"github.com/west2-online/fzuhelper-server/pkg/constants"
+	"github.com/west2-online/fzuhelper-server/pkg/errno"
 )
 
 const TwoDay = 2 * constants.OneDay
 
 func (c *CachePaper) SetFileDirCache(ctx context.Context, key string, dir model.UpYunFileDir) error {
 	data, err := sonic.Marshal(dir)
 	if err != nil {
-		return fmt.Errorf("dal.SetFileDirCache: Unmarshal dir info failed: %w", err)
+		return errno.Errorf(errno.InternalJSONErrorCode, "dal.SetFileDirCache: Unmarshal dir info failed: %v", err)
 	}
-	return c.client.Set(ctx, key, data, TwoDay).Err()
+	if err = c.client.Set(ctx, key, data, TwoDay).Err(); err != nil {
+		return errno.Errorf(errno.InternalDatabaseErrorCode, "%v", err)
+	}
+	return nil
 }

pkg/logger/output.go

@@ -59,3 +59,8 @@ func Fatal(args ...interface{}) {
 func Fatalf(template string, args ...interface{}) {
 	klog.Fatalf(template, args...)
 }
+
+// LErrorf Equals Errorf less one stack
+func LErrorf(template string, args ...interface{}) {
+	loggerObj.Errorf(template, args...)
+}