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

Commit 4dcd1fd

Browse files
Resolve conflicts
2 parents 5bf6f2d + a958b4c commit 4dcd1fd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

config/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ module.exports = {
5151
V5_RESOURCES_API_URL: process.env.V5_RESOURCES_API_URL || 'http://localhost:4000/v5/resources',
5252
V5_TERMS_API_URL: process.env.V5_TERMS_API_URL || 'http://localhost:4000/v5/terms',
5353
V5_RESOURCE_ROLES_API_URL: process.env.V5_RESOURCE_ROLES_API_URL || 'http://localhost:4000/v5/resource-roles',
54+
MEMBER_API_URL: process.env.MEMBER_API_URL || 'https://api.topcoder-dev.com/v5/members',
5455

5556
V5_CHALLENGE_TYPE_API_URL: process.env.V5_CHALLENGE_TYPE_API_URL || 'http://localhost:4000/v5/challenge-types',
5657
V4_CHALLENGE_TYPE_API_URL: process.env.V4_CHALLENGE_TYPE_API_URL || 'http://localhost:4000/v4/challenge-types',
@@ -60,7 +61,6 @@ module.exports = {
6061
V5_PROJECTS_API_URL: process.env.V5_PROJECTS_API_URL || 'https://api.topcoder-dev.com/v5/projects',
6162
V5_CHALLENGE_MIGRATION_API_URL: process.env.V5_CHALLENGE_MIGRATION_API_URL || 'https://api.topcoder-dev.com/v5/challenge-migration',
6263
V4_ES_FEEDER_API_URL: process.env.V4_ES_FEEDER_API_URL || 'https://api.topcoder-dev.com/v4/esfeeder/challenges',
63-
MEMBER_API_URL: process.env.MEMBER_API_URL || 'https://api.topcoder-dev.com/v5/members',
6464

6565
V5_GROUPS_API_URL: process.env.V5_GROUPS_API_URL || 'https://api.topcoder-dev.com/v5/groups',
6666

src/services/ProcessorService.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ async function processMessage (message) {
657657
try {
658658
metaValue = constants.supportedMetadata[metadataKey].method(message.payload, constants.supportedMetadata[metadataKey].defaultValue)
659659
if (metaValue !== null && metaValue !== '') {
660-
// logger.info(`Setting ${constants.supportedMetadata[metadataKey].description} to ${metaValue}`)
660+
logger.info(`Setting ${constants.supportedMetadata[metadataKey].description} to ${metaValue}`)
661661
await metadataService.createOrUpdateMetadata(legacyId, metadataKey, metaValue, updatedByUserId)
662662
}
663663
} catch (e) {
@@ -668,7 +668,7 @@ async function processMessage (message) {
668668
await updateMemberPayments(legacyId, message.payload.prizeSets, updatedByUserId)
669669
await associateChallengeGroups(message.payload.groups, legacyId, m2mToken)
670670
await associateChallengeTerms(message.payload.terms, legacyId, createdByUserId, updatedByUserId)
671-
await setCopilotPayment(message.payload.id, legacyId, _.get(message, 'payload.prizeSets'), createdByUserId, updatedByUserId, m2mToken)
671+
await setCopilotPayment(challengeUuid, legacyId, _.get(message, 'payload.prizeSets'), createdByUserId, updatedByUserId, m2mToken)
672672

673673
if (message.payload.status && challenge) {
674674
// logger.info(`The status has changed from ${challenge.currentStatus} to ${message.payload.status}`)
@@ -677,7 +677,7 @@ async function processMessage (message) {
677677
const activated = await activateChallenge(legacyId)
678678
logger.info(`Activated! ${JSON.stringify(activated)}`)
679679
// Repost all challenge resource on Kafka so they will get created on legacy by the legacy-challenge-resource-processor
680-
await rePostResourcesOnKafka(message.payload.id, m2mToken)
680+
await rePostResourcesOnKafka(challengeUuid, m2mToken)
681681
}
682682
if (message.payload.status === constants.challengeStatuses.Completed && challenge.currentStatus !== constants.challengeStatuses.Completed) {
683683
if (message.payload.task.isTask) {

0 commit comments

Comments
 (0)