MM-27449: Compliance Jobs rerun after warning status (#15178)
* add warning as success result * revert config changes * add unit test, update unit test * add a couple more tests * update store layers Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
d48eec6727
Коммит
0302e0f477
@@ -174,5 +174,9 @@ func (srv *JobServer) CheckForPendingJobsByType(jobType string) (bool, *model.Ap
|
||||
}
|
||||
|
||||
func (srv *JobServer) GetLastSuccessfulJobByType(jobType string) (*model.Job, *model.AppError) {
|
||||
return srv.Store.Job().GetNewestJobByStatusAndType(model.JOB_STATUS_SUCCESS, jobType)
|
||||
statuses := []string{model.JOB_STATUS_SUCCESS}
|
||||
if jobType == model.JOB_TYPE_MESSAGE_EXPORT {
|
||||
statuses = []string{model.JOB_STATUS_WARNING, model.JOB_STATUS_SUCCESS}
|
||||
}
|
||||
return srv.Store.Job().GetNewestJobByStatusesAndType(statuses, jobType)
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ func TestScheduler(t *testing.T) {
|
||||
Type: model.JOB_TYPE_MESSAGE_EXPORT,
|
||||
}
|
||||
// mock job store doesn't return a previously successful job, forcing fallback to config
|
||||
mockStore.JobStore.On("GetNewestJobByStatusAndType", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(job, nil)
|
||||
mockStore.JobStore.On("GetNewestJobByStatusesAndType", mock.AnythingOfType("[]string"), mock.AnythingOfType("string")).Return(job, nil)
|
||||
mockStore.JobStore.On("GetCountByStatusAndType", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(int64(1), nil)
|
||||
|
||||
jobServer := &JobServer{
|
||||
|
||||
Ссылка в новой задаче
Block a user