diff --git a/lib/model/query/audits.js b/lib/model/query/audits.js index ec5a4d0eb..2384dd93f 100644 --- a/lib/model/query/audits.js +++ b/lib/model/query/audits.js @@ -38,7 +38,7 @@ const actionCondition = (action) => { // The backup action was logged by a backup script that has been removed. // Even though the script has been removed, the audit log entries it logged // have not, so we should continue to exclude those. - return sql`action not in ('entity.create', 'entity.bulk.create', 'entity.error', 'entity.update.version', 'entity.update.resolve', 'entity.delete', 'submission.create', 'submission.update', 'submission.update.version', 'submission.attachment.update', 'submission.backlog.reprocess', 'submission.delete', 'submission.restore', 'backup', 'analytics')`; + return sql`action not in ('entity.create', 'entity.bulk.create', 'entity.error', 'entity.update.version', 'entity.update.resolve', 'entity.delete', 'submission.create', 'submission.update', 'submission.update.version', 'submission.attachment.update', 'submission.backlog.hold', 'submission.backlog.reprocess', 'submission.backlog.force', 'submission.delete', 'submission.restore', 'backup', 'analytics')`; else if (action === 'user') return sql`action in ('user.create', 'user.update', 'user.delete', 'user.assignment.create', 'user.assignment.delete', 'user.session.create')`; else if (action === 'field_key') @@ -50,7 +50,7 @@ const actionCondition = (action) => { else if (action === 'form') return sql`action in ('form.create', 'form.update', 'form.delete', 'form.restore', 'form.purge', 'form.attachment.update', 'form.submission.export', 'form.update.draft.set', 'form.update.draft.delete', 'form.update.draft.replace', 'form.update.publish', 'upgrade.process.form.entities_version')`; else if (action === 'submission') - return sql`action in ('submission.create', 'submission.update', 'submission.update.version', 'submission.attachment.update', 'submission.backlog.reprocess', 'submission.delete', 'submission.restore', 'submission.purge')`; + return sql`action in ('submission.create', 'submission.update', 'submission.update.version', 'submission.attachment.update', 'submission.backlog.hold', 'submission.backlog.reprocess', 'submission.backlog.force', 'submission.delete', 'submission.restore', 'submission.purge')`; else if (action === 'dataset') return sql`action in ('dataset.create', 'dataset.update')`; else if (action === 'entity') diff --git a/test/integration/api/audits.js b/test/integration/api/audits.js index f5dc7cd03..732216ebe 100644 --- a/test/integration/api/audits.js +++ b/test/integration/api/audits.js @@ -645,7 +645,7 @@ describe('/audits', () => { }); })); - it.skip('should filter out offline entity submission reprocessing events given action=nonverbose', testService(async (service, container) => { + it('should filter out offline entity submission backlog events given action=nonverbose', testService(async (service, container) => { const asAlice = await service.login('alice'); await asAlice.post('/v1/projects/1/forms?publish=true') diff --git a/test/integration/api/offline-entities.js b/test/integration/api/offline-entities.js index 0ed56ff59..dc6cf1362 100644 --- a/test/integration/api/offline-entities.js +++ b/test/integration/api/offline-entities.js @@ -734,9 +734,6 @@ describe('Offline Entities', () => { await exhaust(container); - // force process the backlog - await container.Entities.processBacklog(true); - // The create doesn't go thorugh the backlog so there's no backlog events here await asAlice.get('/v1/projects/1/forms/offlineEntity/submissions/two/audits') .expect(200)