@@ -47,8 +47,8 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
47
47
const v5ChallengeObjectFromV4 = await challengeService . buildV5Challenge ( legacyId , challengeListing , challengeDetails )
48
48
const [ v5ChallengeFromAPI ] = await challengeService . getChallengeFromV5API ( legacyId )
49
49
50
- logger . debug ( `V5 Object Built from V4: ${ JSON . stringify ( v5ChallengeObjectFromV4 ) } ` )
51
- logger . debug ( `V5 Object from API: ${ JSON . stringify ( v5ChallengeFromAPI ) } ` )
50
+ // logger.debug(`V5 Object Built from V4: ${JSON.stringify(v5ChallengeObjectFromV4)}`)
51
+ // logger.debug(`V5 Object from API: ${JSON.stringify(v5ChallengeFromAPI)}`)
52
52
53
53
const additionalInformation = { }
54
54
@@ -87,14 +87,23 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
87
87
ommittedFields . push ( 'privateDescription' )
88
88
}
89
89
const challengeV4Prizes = _ . get ( v5ChallengeObjectFromV4 , 'prizeSets' , [ ] )
90
- logger . debug ( `v4 prizes: ${ JSON . stringify ( challengeV4Prizes ) } ` )
90
+ // logger.debug(`v4 prizes: ${JSON.stringify(challengeV4Prizes)}`)
91
91
const challengeV5APIPrizes = _ . get ( v5ChallengeFromAPI , 'prizeSets' , [ ] )
92
+ << < << << Updated upstream
92
93
logger . debug ( `v5 prizes: ${ JSON . stringify ( challengeV5APIPrizes ) } ` )
93
94
const prizeSets = _ . filter ( [
94
95
..._ . intersectionBy ( challengeV4Prizes , challengeV5APIPrizes , 'type' ) ,
95
96
..._ . differenceBy ( challengeV5APIPrizes , challengeV4Prizes , 'type' )
96
97
] , entry => entry . type !== config . COPILOT_PAYMENT_TYPE )
97
98
logger . debug ( `intersection: ${ JSON . stringify ( prizeSets ) } ` )
99
+ === = ===
100
+ // logger.debug(`v5 prizes: ${JSON.stringify(challengeV5APIPrizes)}`)
101
+ const prizeSets = [
102
+ ..._ . intersectionBy ( challengeV4Prizes , challengeV5APIPrizes , 'type' ) ,
103
+ ..._ . differenceBy ( challengeV5APIPrizes , challengeV4Prizes , 'type' )
104
+ ]
105
+ // logger.debug(`intersection: ${JSON.stringify(prizeSets)}`)
106
+ >>> > >>> Stashed changes
98
107
99
108
const copilotPayment = await challengeIfxService . getCopilotPaymentFromIfx ( legacyId )
100
109
if ( copilotPayment ) {
@@ -115,7 +124,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
115
124
prizeSets,
116
125
...additionalInformation
117
126
}
118
- logger . debug ( `new V5 Object: ${ JSON . stringify ( updatedV5Object ) } ` )
127
+ // logger.debug(`new V5 Object: ${JSON.stringify(updatedV5Object)}`)
119
128
return challengeService . save ( updatedV5Object )
120
129
}
121
130
0 commit comments