Skip to content

Commit e065d89

Browse files
committed
fix: common.GetTermList error handle
1 parent 0cbd4a4 commit e065d89

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

internal/common/service/term.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ package service
1818

1919
import (
2020
"fmt"
21-
"github.com/west2-online/fzuhelper-server/pkg/logger"
2221

2322
"github.com/west2-online/fzuhelper-server/kitex_gen/common"
2423
"github.com/west2-online/fzuhelper-server/pkg/base"
2524
"github.com/west2-online/fzuhelper-server/pkg/constants"
25+
"github.com/west2-online/fzuhelper-server/pkg/logger"
2626
"github.com/west2-online/jwch"
2727
)
2828

@@ -33,8 +33,9 @@ func (s *CommonService) GetTermList() (*jwch.SchoolCalendar, error) {
3333
logger.Errorf("service.GetTermList: term list cache read failed, key=%s, err=%v", constants.TermListKey, err)
3434
return nil, fmt.Errorf("service.GetTermList: Get term list cache failed %w", err)
3535
}
36-
if list == nil {
36+
if list == nil || len(list.Terms) == 0 {
3737
logger.Errorf("service.GetTermList: term list cache returned nil, key=%s", constants.TermListKey)
38+
return nil, fmt.Errorf("service.GetTermList: Get term list cache failed: cache returned nil")
3839
}
3940
return list, nil
4041
}
@@ -44,9 +45,6 @@ func (s *CommonService) GetTermList() (*jwch.SchoolCalendar, error) {
4445
logger.Errorf("service.GetTermList: fetch school calendar failed, err=%v", err)
4546
return nil, fmt.Errorf("service.GetTermList: Get term list failed %w", err)
4647
}
47-
if calendar == nil {
48-
logger.Errorf("service.GetTermList: fetched school calendar is nil")
49-
}
5048
go func() {
5149
err = s.cache.Common.SetTermListCache(s.ctx, constants.TermListKey, calendar)
5250
if err != nil {

0 commit comments

Comments
 (0)