From 209e587fefa5c0bb3cc025cbf8fb9695b2297d0c Mon Sep 17 00:00:00 2001 From: James Cori Date: Mon, 21 Dec 2020 15:13:55 -0500 Subject: [PATCH 1/9] Skip Forums on Legacy Challenge Create --- src/services/ProcessorService.js | 3 ++- src/services/termsService.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index 2903ad7..eb72925 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -402,7 +402,8 @@ async function processCreate (message) { logger.debug('processCreate :: beforeTry') try { - const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) + logger.info(`processCreate :: Skip Forums - ${config.V4_CHALLENGE_API_URL}?skipForum=true`) + const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}?skipForum=true`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) let forumId = 0 if (message.payload.legacy && message.payload.legacy.forumId) { diff --git a/src/services/termsService.js b/src/services/termsService.js index 34eaf1a..037df58 100644 --- a/src/services/termsService.js +++ b/src/services/termsService.js @@ -4,7 +4,6 @@ const util = require('util') const config = require('config') const helper = require('../common/helper') - const QUERY_GET_CHALLENGE_TERMS = 'SELECT resource_role_id, terms_of_use_id FROM project_role_terms_of_use_xref WHERE project_id = %d' const QUERY_INSERT_CHALLENGE_TERMS = `INSERT INTO project_role_terms_of_use_xref (project_id, resource_role_id, terms_of_use_id, create_date, modify_date, sort_order, group_ind) From 996958c9512ceca9c0bc7dcb4a998a260c91708b Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 00:50:53 +0200 Subject: [PATCH 2/9] fix issue with multiple groups --- src/services/groupsService.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index 46a03a7..354ffe0 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -4,11 +4,12 @@ const util = require('util') const helper = require('../common/helper') const QUERY_GET_ELIGIBILITY_ID = 'SELECT limit 1 * FROM contest_eligibility WHERE contest_id = %d' +const QUERY_GET_SINGLE_ELIGIBILITY_ID = 'SELECT limit 1 * FROM contest_eligibility WHERE contest_id = %d AND group_id = %d' const QUERY_GET_GROUP_ELIGIBILITY_ID = 'SELECT limit 1 * FROM group_contest_eligibility WHERE contest_eligibility_id = %d AND group_id = %d' const QUERY_GET_GROUPS = 'SELECT group_id FROM group_contest_eligibility WHERE contest_eligibility_id = %d' const QUERY_GET_GROUPS_COUNT = 'SELECT count(*) as cnt FROM group_contest_eligibility WHERE contest_eligibility_id = %d' -const QUERY_INSERT_CONTEST_ELIGIBILITY = 'INSERT INTO contest_eligibility (contest_eligibility_id, contest_id, is_studio) VALUES(contest_eligibility_seq.NEXTVAL, ?, 0)' +const QUERY_INSERT_CONTEST_ELIGIBILITY = 'INSERT INTO contest_eligibility (contest_eligibility_id, contest_id, is_studio, group_id) VALUES(contest_eligibility_seq.NEXTVAL, ?, 0, ?)' const QUERY_INSERT_GROUP_CONTEST_ELIGIBILITY = 'INSERT INTO group_contest_eligibility (contest_eligibility_id, group_id) VALUES(?, ?)' const QUERY_DELETE_GROUP_CONTEST_ELIGIBILITY = 'DELETE FROM group_contest_eligibility WHERE contest_eligibility_id = ? AND group_id = ?' const QUERY_DELETE_CONTEST_ELIGIBILITY = 'DELETE FROM contest_eligibility WHERE contest_eligibility_id = ?' @@ -53,9 +54,9 @@ async function addGroupToChallenge (challengeLegacyId, groupLegacyId) { try { await connection.beginTransactionAsync() - let eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId) + let eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId, groupLegacyId) if (!eligibilityId) { - eligibilityId = await createChallengeEligibilityRecord(connection, challengeLegacyId) + eligibilityId = await createChallengeEligibilityRecord(connection, challengeLegacyId, groupLegacyId) } const groupMappingExists = await groupEligbilityExists(connection, eligibilityId, groupLegacyId) @@ -81,7 +82,7 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { try { await connection.beginTransactionAsync() - const eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId) + const eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId, groupLegacyId) if (!eligibilityId) { throw new Error(`Eligibility not found for legacyId ${challengeLegacyId}`) } @@ -113,12 +114,18 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { * Gets the eligibility ID of a legacyId * @param {Object} connection * @param {Number} challengeLegacyId + * @param {Number} groupId * @returns {Object} { eligibilityId } */ -async function getChallengeEligibilityId (connection, challengeLegacyId) { +async function getChallengeEligibilityId (connection, challengeLegacyId, groupId) { // get the challenge eligibility record, if one doesn't exist, create it and return the id // logger.info(`getChallengeEligibilityId Query: ${util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)}`) - const result = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)) + let result + if (groupId) { + result = await connection.queryAsync(util.format(QUERY_GET_SINGLE_ELIGIBILITY_ID, challengeLegacyId, groupId)) + } else { + result = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)) + } // logger.info(`getChallengeEligibilityId Result: ${JSON.stringify(result)}`) return (result && result[0]) ? result[0].contest_eligibility_id : false } @@ -136,9 +143,9 @@ async function groupEligbilityExists (connection, eligibilityId, groupLegacyId) return (result && result[0]) || false } -async function createChallengeEligibilityRecord (connection, challengeLegacyId) { +async function createChallengeEligibilityRecord (connection, challengeLegacyId, groupId) { const query = await prepare(connection, QUERY_INSERT_CONTEST_ELIGIBILITY) - const result = await query.executeAsync([challengeLegacyId]) + const result = await query.executeAsync([challengeLegacyId, groupId]) if (result) { const idResult = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)) return idResult[0].contest_eligibility_id From 9148266ecf6dc8113b0cc8d6e23e03720268a7b3 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 03:40:04 +0200 Subject: [PATCH 3/9] re-write the groups service --- src/services/groupsService.js | 184 +++++++++++++++------------------- 1 file changed, 82 insertions(+), 102 deletions(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index 354ffe0..73d31fe 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -3,14 +3,12 @@ const _ = require('lodash') const util = require('util') const helper = require('../common/helper') -const QUERY_GET_ELIGIBILITY_ID = 'SELECT limit 1 * FROM contest_eligibility WHERE contest_id = %d' -const QUERY_GET_SINGLE_ELIGIBILITY_ID = 'SELECT limit 1 * FROM contest_eligibility WHERE contest_id = %d AND group_id = %d' -const QUERY_GET_GROUP_ELIGIBILITY_ID = 'SELECT limit 1 * FROM group_contest_eligibility WHERE contest_eligibility_id = %d AND group_id = %d' -const QUERY_GET_GROUPS = 'SELECT group_id FROM group_contest_eligibility WHERE contest_eligibility_id = %d' -const QUERY_GET_GROUPS_COUNT = 'SELECT count(*) as cnt FROM group_contest_eligibility WHERE contest_eligibility_id = %d' +const QUERY_GET_CONTEST_ELIGIBILITIES_IDS = 'SELECT contest_eligibility_id FROM contest_eligibility WHERE contest_id = %d' +const QUERY_INSERT_CONTEST_ELIGIBILITY = 'INSERT INTO contest_eligibility (contest_eligibility_id, contest_id, is_studio) VALUES(contest_eligibility_seq.NEXTVAL, ?, 0)' -const QUERY_INSERT_CONTEST_ELIGIBILITY = 'INSERT INTO contest_eligibility (contest_eligibility_id, contest_id, is_studio, group_id) VALUES(contest_eligibility_seq.NEXTVAL, ?, 0, ?)' +const QUERY_GET_GROUPS = 'SELECT contest_eligibility_id, group_id FROM group_contest_eligibility WHERE contest_eligibility_id in' const QUERY_INSERT_GROUP_CONTEST_ELIGIBILITY = 'INSERT INTO group_contest_eligibility (contest_eligibility_id, group_id) VALUES(?, ?)' + const QUERY_DELETE_GROUP_CONTEST_ELIGIBILITY = 'DELETE FROM group_contest_eligibility WHERE contest_eligibility_id = ? AND group_id = ?' const QUERY_DELETE_CONTEST_ELIGIBILITY = 'DELETE FROM contest_eligibility WHERE contest_eligibility_id = ?' @@ -26,15 +24,20 @@ async function prepare (connection, sql) { return Promise.promisifyAll(stmt) } +/** + * Get groups for a challenge + * @param {Number} challengeLegacyId the legacy challenge ID + */ async function getGroupsForChallenge (challengeLegacyId) { // logger.debug(`Getting Groups for Challenge ${challengeLegacyId}`) const connection = await helper.getInformixConnection() let groupIds = [] try { // await connection.beginTransactionAsync() - const eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId) - if (eligibilityId) { - groupIds = await getGroupIdsForEligibilityId(connection, eligibilityId) + const eligibilityIds = await getChallengeEligibilityIds(connection, challengeLegacyId) + if (eligibilityIds && eligibilityIds.length > 0) { + const groups = await getGroupsForEligibilityIds(connection, eligibilityIds) + groupIds = _.map(groups, g => g.group_id) // logger.debug(`Groups Found for ${challengeLegacyId} - ${JSON.stringify(groupIds)}`) } // logger.debug(`No groups Found for ${challengeLegacyId}`) @@ -49,23 +52,25 @@ async function getGroupsForChallenge (challengeLegacyId) { return groupIds } +/** + * Add a group to a challenge + * @param {Number} challengeLegacyId the legacy challenge ID + * @param {Number} groupLegacyId the legacy group ID + */ async function addGroupToChallenge (challengeLegacyId, groupLegacyId) { + const existingGroups = await getGroupsForChallenge(challengeLegacyId) + if (existingGroups.indexOf(groupLegacyId) > -1) { + logger.info(`Group ${groupLegacyId} is already assigned to challenge ${challengeLegacyId}. Skipping...`) + return + } const connection = await helper.getInformixConnection() try { await connection.beginTransactionAsync() - let eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId, groupLegacyId) - if (!eligibilityId) { - eligibilityId = await createChallengeEligibilityRecord(connection, challengeLegacyId, groupLegacyId) - } - - const groupMappingExists = await groupEligbilityExists(connection, eligibilityId, groupLegacyId) - if (groupMappingExists) { - logger.warn(`Group Relation Already Exists for ${groupMappingExists} - ${eligibilityId} ${groupLegacyId}`) - } else { - await createGroupEligibilityRecord(connection, eligibilityId, groupLegacyId) - } - + // create eligibility entry + const eligibilityId = await createContestEligibility(connection, challengeLegacyId) + // create group association + await createGroupContestEligibility(connection, eligibilityId, groupLegacyId) await connection.commitTransactionAsync() } catch (e) { logger.error(`Error in 'addGroupToChallenge' ${e}, rolling back transaction`) @@ -77,28 +82,24 @@ async function addGroupToChallenge (challengeLegacyId, groupLegacyId) { } } +/** + * Remove group from a challenge + * @param {Number} challengeLegacyId the legacy challenge ID + * @param {Number} groupLegacyId the group ID + */ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { const connection = await helper.getInformixConnection() try { await connection.beginTransactionAsync() - const eligibilityId = await getChallengeEligibilityId(connection, challengeLegacyId, groupLegacyId) - if (!eligibilityId) { - throw new Error(`Eligibility not found for legacyId ${challengeLegacyId}`) - } - const groupEligibilityRecord = await groupEligbilityExists(connection, eligibilityId, groupLegacyId) - - if (groupEligibilityRecord) { - await deleteGroupEligibilityRecord(connection, eligibilityId, groupLegacyId) - // logger.debug('Getting Groups Count') - const { groupsCount } = await getCountOfGroupsInEligibilityRecord(connection, eligibilityId) - // logger.debug(`${groupsCount} groups exist`) - if (groupsCount <= 0) { - logger.debug('No groups exist, deleting eligibility group') - await deleteEligibilityRecord(connection, eligibilityId) + const eligibilityIds = await getChallengeEligibilityIds(connection, challengeLegacyId) + if (eligibilityIds && eligibilityIds.length > 0) { + const groups = await getGroupsForEligibilityIds(connection, eligibilityIds) + const groupToRemove = _.find(groups, g => group_id === groupLegacyId) + if (groupToRemove) { + await clearData(groupToRemove.contest_eligibility_id, groupToRemove.group_id) } } - await connection.commitTransactionAsync() } catch (e) { logger.error(`Error in 'removeGroupFromChallenge' ${e}, rolling back transaction`) @@ -111,86 +112,65 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { } /** - * Gets the eligibility ID of a legacyId - * @param {Object} connection - * @param {Number} challengeLegacyId - * @param {Number} groupId - * @returns {Object} { eligibilityId } + * Get group IDs + * @param {Object} connection the connection + * @param {Array} eligibilityIds the eligibility IDs */ -async function getChallengeEligibilityId (connection, challengeLegacyId, groupId) { - // get the challenge eligibility record, if one doesn't exist, create it and return the id - // logger.info(`getChallengeEligibilityId Query: ${util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)}`) - let result - if (groupId) { - result = await connection.queryAsync(util.format(QUERY_GET_SINGLE_ELIGIBILITY_ID, challengeLegacyId, groupId)) - } else { - result = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)) - } - // logger.info(`getChallengeEligibilityId Result: ${JSON.stringify(result)}`) - return (result && result[0]) ? result[0].contest_eligibility_id : false +async function getGroupsForEligibilityIds (connection, eligibilityIds) { + const query = `${QUERY_GET_GROUPS} (${eligibilityIds.join(', ')})` + // logger.debug(`getGroupIdsForEligibilityId ${query}`) + const result = await connection.queryAsync(query) + return result } /** - * @param {Object} connection - * @param {Number} eligibilityId - * @param {Number} groupLegacyId - * @returns {Object} DB Result + * Gets the eligibility IDs + * @param {Object} connection the connection + * @param {Number} challengeLegacyId the legacy challenge ID */ -async function groupEligbilityExists (connection, eligibilityId, groupLegacyId) { - // logger.debug(`groupEligibiltyExists query ${util.format(QUERY_GET_GROUP_ELIGIBILITY_ID, eligibilityId, groupLegacyId)}`) - const result = await connection.queryAsync(util.format(QUERY_GET_GROUP_ELIGIBILITY_ID, eligibilityId, groupLegacyId)) - // logger.debug(`groupEligibiltyExists result ${JSON.stringify(result)} ${JSON.stringify(result[0])}`) - return (result && result[0]) || false +async function getChallengeEligibilityIds (connection, challengeLegacyId) { + const query = util.format(QUERY_GET_CONTEST_ELIGIBILITIES_IDS, challengeLegacyId) + // logger.debug(`getGroupIdsForEligibilityId ${query}`) + const result = await connection.queryAsync(query) + return _.map(result, r => r.contest_eligibility_id) } -async function createChallengeEligibilityRecord (connection, challengeLegacyId, groupId) { +/** + * Create a contest eligibility + * @param {Object} connection the connection + * @param {Number} legacyChallengeId the legacy challenge ID + */ +async function createContestEligibility (connection, legacyChallengeId) { const query = await prepare(connection, QUERY_INSERT_CONTEST_ELIGIBILITY) - const result = await query.executeAsync([challengeLegacyId, groupId]) - if (result) { - const idResult = await connection.queryAsync(util.format(QUERY_GET_ELIGIBILITY_ID, challengeLegacyId)) - return idResult[0].contest_eligibility_id - } - return false + await query.executeAsync([legacyChallengeId]) + const ids = await getChallengeEligibilityIds(connection, legacyChallengeId) + const groups = await getGroupsForEligibilityIds(connection, ids) + return _.get(_.filter(ids, id => !_.find(groups, g => g.contest_eligibility_id === id)), '[0]') } -async function createGroupEligibilityRecord (connection, eligibilityId, groupLegacyId) { +/** + * Create group contest eligibility + * @param {Object} connection the connection + * @param {Number} eligibilityId the eligibility ID + * @param {Number} groupId the group ID + */ +async function createGroupContestEligibility (connection, eligibilityId, groupId) { const query = await prepare(connection, QUERY_INSERT_GROUP_CONTEST_ELIGIBILITY) - const result = await query.executeAsync([eligibilityId, groupLegacyId]) - if (result) { - const idResult = await connection.queryAsync(util.format(QUERY_GET_GROUP_ELIGIBILITY_ID, eligibilityId, groupLegacyId)) - return idResult[0] - } - return result -} - -async function deleteGroupEligibilityRecord (connection, eligibilityId, groupLegacyId) { - const query = await prepare(connection, QUERY_DELETE_GROUP_CONTEST_ELIGIBILITY) - const result = await query.executeAsync([eligibilityId, groupLegacyId]) - // logger.debug(`deleteGroupEligibilityRecord ${JSON.stringify(result)}`) - return result + return await query.executeAsync([eligibilityId, groupId]) } -async function deleteEligibilityRecord (connection, eligibilityId) { - const query = await prepare(connection, QUERY_DELETE_CONTEST_ELIGIBILITY) - // logger.debug(`deleteEligibilityRecord Query ${JSON.stringify(query)}`) - const result = await query.executeAsync([eligibilityId]) - // logger.debug(`deleteEligibilityRecord ${JSON.stringify(result)}`) - return result -} - -async function getCountOfGroupsInEligibilityRecord (connection, eligibilityId) { - const query = util.format(QUERY_GET_GROUPS_COUNT, eligibilityId) - // logger.debug(`Query! ${query}`) - const result = await connection.queryAsync(query) - // logger.debug(`getCountOfGroupsInEligibilityRecord ${JSON.stringify(result)}`) - return { groupsCount: result[0].cnt || 0 } -} +/** + * Removes entries from group_contest_eligibility and contest_eligibility + * @param {Number} eligibilityId the eligibility ID + * @param {Number} groupId the group ID + */ +async function clearData (eligibilityId, groupId) { + let query + query = await prepare(connection, QUERY_DELETE_CONTEST_ELIGIBILITY) + await query.executeAsync([eligibilityId]) -async function getGroupIdsForEligibilityId (connection, eligibilityId) { - const query = util.format(QUERY_GET_GROUPS, eligibilityId) - // logger.debug(`getGroupIdsForEligibilityId ${query}`) - const result = await connection.queryAsync(query) - return _.map(result, r => r.group_id) + query = await prepare(connection, QUERY_DELETE_GROUP_CONTEST_ELIGIBILITY) + await query.executeAsync([eligibilityId, groupId]) } module.exports = { From fe5b548e4deec51358f11ebeee8c2ae761dba155 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 13:32:58 +0200 Subject: [PATCH 4/9] fix remove groups --- src/services/groupsService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index 73d31fe..aae2b63 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -95,7 +95,7 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { const eligibilityIds = await getChallengeEligibilityIds(connection, challengeLegacyId) if (eligibilityIds && eligibilityIds.length > 0) { const groups = await getGroupsForEligibilityIds(connection, eligibilityIds) - const groupToRemove = _.find(groups, g => group_id === groupLegacyId) + const groupToRemove = _.find(groups, g => g.group_id === groupLegacyId) if (groupToRemove) { await clearData(groupToRemove.contest_eligibility_id, groupToRemove.group_id) } From c48880e9dc344750050a923c13f063c1dbc6cf12 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 13:43:49 +0200 Subject: [PATCH 5/9] fix missing param on clearData --- src/services/groupsService.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index aae2b63..a710450 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -97,7 +97,7 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { const groups = await getGroupsForEligibilityIds(connection, eligibilityIds) const groupToRemove = _.find(groups, g => g.group_id === groupLegacyId) if (groupToRemove) { - await clearData(groupToRemove.contest_eligibility_id, groupToRemove.group_id) + await clearData(connection, groupToRemove.contest_eligibility_id, groupToRemove.group_id) } } await connection.commitTransactionAsync() @@ -161,10 +161,11 @@ async function createGroupContestEligibility (connection, eligibilityId, groupId /** * Removes entries from group_contest_eligibility and contest_eligibility + * @param {Object} connection the connection * @param {Number} eligibilityId the eligibility ID * @param {Number} groupId the group ID */ -async function clearData (eligibilityId, groupId) { +async function clearData (connection, eligibilityId, groupId) { let query query = await prepare(connection, QUERY_DELETE_CONTEST_ELIGIBILITY) await query.executeAsync([eligibilityId]) From 8a9614381a361ec3e6d43fc0ae90a4961ab65cc1 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 13:53:22 +0200 Subject: [PATCH 6/9] reorder of query execution --- src/services/groupsService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index a710450..c94d117 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -167,11 +167,11 @@ async function createGroupContestEligibility (connection, eligibilityId, groupId */ async function clearData (connection, eligibilityId, groupId) { let query - query = await prepare(connection, QUERY_DELETE_CONTEST_ELIGIBILITY) - await query.executeAsync([eligibilityId]) - query = await prepare(connection, QUERY_DELETE_GROUP_CONTEST_ELIGIBILITY) await query.executeAsync([eligibilityId, groupId]) + + query = await prepare(connection, QUERY_DELETE_CONTEST_ELIGIBILITY) + await query.executeAsync([eligibilityId]) } module.exports = { From 2da77b602172cb9c93a4ef6a92dc95380bb1f5d5 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Wed, 23 Dec 2020 14:12:30 +0200 Subject: [PATCH 7/9] fix minor typo --- src/services/groupsService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/groupsService.js b/src/services/groupsService.js index c94d117..d8325b8 100644 --- a/src/services/groupsService.js +++ b/src/services/groupsService.js @@ -106,7 +106,7 @@ async function removeGroupFromChallenge (challengeLegacyId, groupLegacyId) { await connection.rollbackTransactionAsync() throw e } finally { - logger.info(`Group ${groupLegacyId} removed to challenge ${challengeLegacyId}`) + logger.info(`Group ${groupLegacyId} removed from challenge ${challengeLegacyId}`) await connection.closeAsync() } } From 530f6fae345c24bf8aaa37e69a36c68510f63fee Mon Sep 17 00:00:00 2001 From: James Cori Date: Thu, 24 Dec 2020 14:31:14 -0500 Subject: [PATCH 8/9] Fixing Skip Forum GET call --- src/services/ProcessorService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index eb72925..5d396bd 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -402,8 +402,8 @@ async function processCreate (message) { logger.debug('processCreate :: beforeTry') try { - logger.info(`processCreate :: Skip Forums - ${config.V4_CHALLENGE_API_URL}?skipForum=true`) - const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}?skipForum=true`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) + logger.info(`processCreate :: Skip Forums - ${config.V4_CHALLENGE_API_URL}?filter=skipForum=true body: ${JSON.stringify({ param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) })}`) + const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}?filterskipForum=true`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) let forumId = 0 if (message.payload.legacy && message.payload.legacy.forumId) { From ad03fb4418fbad771b251b95737ac1f74d0700c4 Mon Sep 17 00:00:00 2001 From: James Cori Date: Thu, 24 Dec 2020 16:50:44 -0500 Subject: [PATCH 9/9] I can't spel --- src/services/ProcessorService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index 5d396bd..12b8ec4 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -403,7 +403,7 @@ async function processCreate (message) { logger.debug('processCreate :: beforeTry') try { logger.info(`processCreate :: Skip Forums - ${config.V4_CHALLENGE_API_URL}?filter=skipForum=true body: ${JSON.stringify({ param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) })}`) - const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}?filterskipForum=true`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) + const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}?filter=skipForum=true`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken) let forumId = 0 if (message.payload.legacy && message.payload.legacy.forumId) {