Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

fix audit logs #97

Merged
merged 1 commit into from
Nov 30, 2022
Merged

fix audit logs #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/services/challengeService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ async function save (challenge) {
let challengesInES
if (!challenge.id) {
try {
challengesInES = await getChallengeFromES(challenge.legacyId)
challengesInES = await getChallengeFromES(challenge.legacyId, true)
if (challengesInES.length > 0) {
logger.debug(`PREVENT DUPLICATE CHALLENGE - ${challenge.legacyId} - V5 already exists ${challengesInES[0].challengeId}`)
challenge.id = challengesInES[0].challengeId
logger.debug(`PREVENT DUPLICATE CHALLENGE - ${challenge.legacyId} - V5 already exists ${challengesInES[0].id}`)
challenge.id = challengesInES[0].id
}
} catch (e) {
logger.error(`Error fetching V5 challenge ${JSON.stringify(e)}`)
Expand Down Expand Up @@ -100,6 +100,10 @@ async function createChallenge (challenge) {
* @param {Object} challenge challenge data
*/
async function updateChallenge (challenge, previousState) {
if (!previousState) {
challengesInES = await getChallengeFromES(challenge.legacyId, true)
previousState = challengesInES[0]
}
const auditLogs = []

try {
Expand Down Expand Up @@ -304,7 +308,7 @@ async function getChallengesFromES (legacyIds) {
/**
* Get existing challenges from ES using legacyId
*/
async function getChallengeFromES (legacyId) {
async function getChallengeFromES (legacyId, full) {
const esQuery = {
index: config.get('ES.CHALLENGE_ES_INDEX'),
type: config.get('ES.CHALLENGE_ES_TYPE'),
Expand Down Expand Up @@ -337,7 +341,7 @@ async function getChallengeFromES (legacyId) {
}
}
// Extract data from hits
return _.map(docs.hits.hits, item => ({
return full ? docs.hits.hits : _.map(docs.hits.hits, item => ({
legacyId: item._source.legacyId,
legacy: {
screeningScorecardId: _.get(item._source, 'legacy.screeningScorecardId'),
Expand Down