Merge pull request #693 from topcoder-platform/dev

feat: add payments attribute in challenge object

Author: rakibansary

.circleci/config.yml

@@ -90,7 +90,7 @@ workflows:
           branches:
             only:
             - dev
-            - PLAT-3614
+            - PLAT-3491
 
     - "build-qa":
         context: org-global

package.json

@@ -42,8 +42,8 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.8.12",
     "@opensearch-project/opensearch": "^2.2.0",
-    "@topcoder-framework/domain-challenge": "^v0.23.1-PLAT-3614.0",
-    "@topcoder-framework/lib-common": "^v0.23.1-PLAT-3614.0",
+    "@topcoder-framework/domain-challenge": "^0.24.0",
+    "@topcoder-framework/lib-common": "^0.24.0",
     "aws-sdk": "^2.1145.0",
     "axios": "^0.19.0",
     "axios-retry": "^3.4.0",

src/common/project-helper.js

@@ -69,8 +69,7 @@ class ProjectHelper {
         : null;
 
       if (markup && markup > 0) {
-        // Change int returned from api to decimal
-        markup = markup / 100;
+        markup = (markup * 100) / 10000;
       }
       return {
         billingAccountId: _.get(res, "data.tcBillingAccountId", null),

src/services/ChallengeService.js

@@ -833,6 +833,10 @@ async function searchChallenges(currentUser, criteria) {
     if (element.status !== constants.challengeStatuses.Completed) {
       _.unset(element, "winners");
     }
+    // TODO: in the long run we wanna do a finer grained filtering of the payments
+    if (!_hasAdminRole && !_.get(currentUser, "isMachine", false)) {
+      _.unset(element, "payments");
+    }
   });
 
   return { total, page, perPage, result };
@@ -968,6 +972,11 @@ async function createChallenge(currentUser, challenge, userToken) {
 
   if (_.get(type, "isTask")) {
     _.set(challenge, "task.isTask", true);
+    // this is only applicable for WorkType: Gig, i.e., Tasks created from Salesforce
+    if (challenge.billing != null && challenge.billing.clientBillingRate != null) {
+      _.set(challenge, "billing.clientBillingRate", challenge.billing.clientBillingRate);
+    }
+
     if (_.isUndefined(_.get(challenge, "task.isAssigned"))) {
       _.set(challenge, "task.isAssigned", false);
     }
@@ -1109,6 +1118,7 @@ createChallenge.schema = {
         .keys({
           billingAccountId: Joi.string(),
           markup: Joi.number().min(0).max(100),
+          clientBillingRate: Joi.number().min(0).max(100),
         })
         .unknown(true),
       task: Joi.object().keys({
@@ -1236,12 +1246,7 @@ async function getPhasesAndPopulate(data) {
  * @returns {Object} the challenge with given id
  */
 async function getChallenge(currentUser, id, checkIfExists) {
-  // get challenge from Elasticsearch
   let challenge;
-  // logger.warn(JSON.stringify({
-  //   index: config.get('ES.ES_INDEX'),
-  //   _id: id
-  // }))
   try {
     if (config.get("ES.OPENSEARCH") == "true") {
       challenge = (
@@ -1301,6 +1306,11 @@ async function getChallenge(currentUser, id, checkIfExists) {
     _.unset(challenge, "winners");
   }
 
+  // TODO: in the long run we wanna do a finer grained filtering of the payments
+  if (!hasAdminRole(currentUser) && !_.get(currentUser, "isMachine", false)) {
+    _.unset(challenge, "payments");
+  }
+
   return challenge;
 }
 getChallenge.schema = {
@@ -1896,6 +1906,7 @@ async function updateChallenge(currentUser, challengeId, data) {
   }
 
   const updatedChallenge = await challengeDomain.lookup(getLookupCriteria("id", challengeId));
+
   await indexChallengeAndPostToKafka(updatedChallenge, track, type);
 
   if (updatedChallenge.legacy.selfService) {

src/services/ChallengeTypeService.js

@@ -24,7 +24,7 @@ const challengeTypeDomain = new ChallengeTypeDomain(
 /**
  * Search challenge types
  * @param {Object} criteria the search criteria
- * @returns {Object} the search result
+ * @returns {Promise<Object>} the search result
  */
 async function searchChallengeTypes(criteria) {
   const scanCriteria = getScanCriteria(_.omit(criteria, ["page", "perPage"]));