mirror of
https://github.com/standardnotes/server
synced 2026-08-28 11:57:18 -04:00
fix(scheduler): eliminate read/write concurrency hazzard while updating predicate status
This commit is contained in:
+4
-46
@@ -1,8 +1,7 @@
|
||||
import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/predicates'
|
||||
import 'reflect-metadata'
|
||||
|
||||
import { JobDoneInterpreterInterface } from '../../Job/JobDoneInterpreterInterface'
|
||||
import { JobRepositoryInterface } from '../../Job/JobRepositoryInterface'
|
||||
import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/predicates'
|
||||
|
||||
import { Predicate } from '../../Predicate/Predicate'
|
||||
import { PredicateRepositoryInterface } from '../../Predicate/PredicateRepositoryInterface'
|
||||
import { PredicateStatus } from '../../Predicate/PredicateStatus'
|
||||
@@ -11,12 +10,10 @@ import { UpdatePredicateStatus } from './UpdatePredicateStatus'
|
||||
|
||||
describe('UpdatePredicateStatus', () => {
|
||||
let predicateRepository: PredicateRepositoryInterface
|
||||
let jobRepository: JobRepositoryInterface
|
||||
let jobDoneInterpreter: JobDoneInterpreterInterface
|
||||
let predicateComplete: Predicate
|
||||
let predicateIncomplete: Predicate
|
||||
|
||||
const createUseCase = () => new UpdatePredicateStatus(predicateRepository, jobRepository, jobDoneInterpreter)
|
||||
const createUseCase = () => new UpdatePredicateStatus(predicateRepository)
|
||||
|
||||
beforeEach(() => {
|
||||
predicateComplete = {
|
||||
@@ -33,15 +30,9 @@ describe('UpdatePredicateStatus', () => {
|
||||
predicateRepository = {} as jest.Mocked<PredicateRepositoryInterface>
|
||||
predicateRepository.findByJobUuid = jest.fn().mockReturnValue([predicateComplete, predicateIncomplete])
|
||||
predicateRepository.save = jest.fn()
|
||||
|
||||
jobRepository = {} as jest.Mocked<JobRepositoryInterface>
|
||||
jobRepository.markJobAsDone = jest.fn()
|
||||
|
||||
jobDoneInterpreter = {} as jest.Mocked<JobDoneInterpreterInterface>
|
||||
jobDoneInterpreter.interpret = jest.fn()
|
||||
})
|
||||
|
||||
it('should mark a predicate as complete and update job as done', async () => {
|
||||
it('should mark a predicate as complete', async () => {
|
||||
expect(
|
||||
await createUseCase().execute({
|
||||
predicate: { name: PredicateName.EmailBackupsEnabled, jobUuid: '1-2-3', authority: PredicateAuthority.Auth },
|
||||
@@ -49,7 +40,6 @@ describe('UpdatePredicateStatus', () => {
|
||||
}),
|
||||
).toEqual({
|
||||
success: true,
|
||||
allPredicatesChecked: true,
|
||||
})
|
||||
|
||||
expect(predicateRepository.save).toHaveBeenCalledWith({
|
||||
@@ -57,37 +47,5 @@ describe('UpdatePredicateStatus', () => {
|
||||
name: 'email-backups-enabled',
|
||||
status: 'denied',
|
||||
})
|
||||
|
||||
expect(jobRepository.markJobAsDone).toHaveBeenCalled()
|
||||
expect(jobDoneInterpreter.interpret).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should mark a predicate as complete and not update job as done if there are still incomplete predicates', async () => {
|
||||
predicateRepository.findByJobUuid = jest
|
||||
.fn()
|
||||
.mockReturnValue([
|
||||
predicateComplete,
|
||||
predicateIncomplete,
|
||||
{ uuid: '3-4-5', status: PredicateStatus.Pending } as jest.Mocked<Predicate>,
|
||||
])
|
||||
|
||||
expect(
|
||||
await createUseCase().execute({
|
||||
predicate: { name: PredicateName.EmailBackupsEnabled, jobUuid: '1-2-3', authority: PredicateAuthority.Auth },
|
||||
predicateVerificationResult: PredicateVerificationResult.Denied,
|
||||
}),
|
||||
).toEqual({
|
||||
success: true,
|
||||
allPredicatesChecked: false,
|
||||
})
|
||||
|
||||
expect(predicateRepository.save).toHaveBeenCalledWith({
|
||||
uuid: '2-3-4',
|
||||
name: 'email-backups-enabled',
|
||||
status: 'denied',
|
||||
})
|
||||
|
||||
expect(jobRepository.markJobAsDone).not.toHaveBeenCalled()
|
||||
expect(jobDoneInterpreter.interpret).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user