Add more tests, add mocks.
Этот коммит содержится в:
@@ -10640,7 +10640,7 @@ func (s *OpenTracingLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(revie
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *OpenTracingLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error) {
|
||||
func (s *OpenTracingLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error) {
|
||||
origCtx := s.Root.Store.Context()
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TrueUpReviewStore.GetTrueUpReviewStatus")
|
||||
s.Root.Store.SetContext(newCtx)
|
||||
|
||||
@@ -12157,7 +12157,7 @@ func (s *RetryLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatu
|
||||
|
||||
}
|
||||
|
||||
func (s *RetryLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error) {
|
||||
func (s *RetryLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error) {
|
||||
|
||||
tries := 0
|
||||
for {
|
||||
|
||||
@@ -57,6 +57,7 @@ func genStore() *mocks.Store {
|
||||
mock.On("Draft").Return(&mocks.DraftStore{})
|
||||
mock.On("PostPriority").Return(&mocks.PostPriorityStore{})
|
||||
mock.On("PostAcknowledgement").Return(&mocks.PostAcknowledgementStore{})
|
||||
mock.On("TrueUpReview").Return(&mocks.TrueUpReviewStore{})
|
||||
return mock
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
package sqlstore
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v6/model"
|
||||
"github.com/mattermost/mattermost-server/v6/store"
|
||||
sq "github.com/mattermost/squirrel"
|
||||
@@ -27,11 +29,11 @@ func trueUpReviewStatusColumns() []string {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error) {
|
||||
func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error) {
|
||||
query := s.getQueryBuilder().
|
||||
Select("*").
|
||||
From("TrueUpReviewHistory").
|
||||
Where(sq.Eq{"DueDate": dueDate})
|
||||
Where(sq.Eq{"DueDate": dueDate.Format("2006-01-02")})
|
||||
|
||||
queryString, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
@@ -40,7 +42,7 @@ func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.Tru
|
||||
var trueUpReviewStatus model.TrueUpReviewStatus
|
||||
if err := s.GetReplicaX().Get(&trueUpReviewStatus, queryString, args...); err != nil {
|
||||
trueUpReviewStatus.Completed = false
|
||||
trueUpReviewStatus.DueDate = dueDate
|
||||
trueUpReviewStatus.DueDate = dueDate.Format("2006-01-02")
|
||||
|
||||
// If no record is available, create one so there is a record trail.
|
||||
return s.CreateTrueUpReviewStatusRecord(&trueUpReviewStatus)
|
||||
|
||||
@@ -1000,7 +1000,7 @@ type PostAcknowledgementStore interface {
|
||||
}
|
||||
|
||||
type TrueUpReviewStore interface {
|
||||
GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error)
|
||||
GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error)
|
||||
CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ package mocks
|
||||
import (
|
||||
model "github.com/mattermost/mattermost-server/v6/model"
|
||||
mock "github.com/stretchr/testify/mock"
|
||||
|
||||
time "time"
|
||||
)
|
||||
|
||||
// TrueUpReviewStore is an autogenerated mock type for the TrueUpReviewStore type
|
||||
@@ -38,11 +40,11 @@ func (_m *TrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.
|
||||
}
|
||||
|
||||
// GetTrueUpReviewStatus provides a mock function with given fields: dueDate
|
||||
func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error) {
|
||||
func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error) {
|
||||
ret := _m.Called(dueDate)
|
||||
|
||||
var r0 *model.TrueUpReviewStatus
|
||||
if rf, ok := ret.Get(0).(func(string) *model.TrueUpReviewStatus); ok {
|
||||
if rf, ok := ret.Get(0).(func(time.Time) *model.TrueUpReviewStatus); ok {
|
||||
r0 = rf(dueDate)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
@@ -51,7 +53,7 @@ func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueU
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
if rf, ok := ret.Get(1).(func(time.Time) error); ok {
|
||||
r1 = rf(dueDate)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
|
||||
@@ -9575,7 +9575,7 @@ func (s *TimerLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatu
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (s *TimerLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate string) (*model.TrueUpReviewStatus, error) {
|
||||
func (s *TimerLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.TrueUpReviewStatus, error) {
|
||||
start := time.Now()
|
||||
|
||||
result, err := s.TrueUpReviewStore.GetTrueUpReviewStatus(dueDate)
|
||||
|
||||
Ссылка в новой задаче
Block a user