Merge pull request #557 from topcoder-platform/develop

Prod Release: 2.4.0

Author: vikasrohit

.circleci/config.yml

@@ -32,7 +32,7 @@ deploy_steps: &deploy_steps
         ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
         source buildenvvar
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
-        
+
          echo "======= Running Masterscript - deploy projects-api-consumers ==========="
         if [ -e ${LOGICAL_ENV}-${APPNAME}-appvar.json ]; then  sudo rm -vf ${LOGICAL_ENV}-${APPNAME}-appvar.json; fi
         ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumers-deployvar
@@ -42,7 +42,7 @@ deploy_steps: &deploy_steps
 jobs:
   test:
     docker:
-      - image: circleci/node:8.9.4
+      - image: circleci/node:12.16.1
       - image: circleci/postgres:9.6.2-alpine
         environment:
         - POSTGRES_USER: circle_test

.eslintrc

@@ -10,18 +10,15 @@
   "rules": {
     "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "src/tests/*.js"]}],
     "max-len": ["error", { "ignoreComments": true, "code": 120 }],
-    "valid-jsdoc": ["error", {
-      "requireReturn": true,
-      "requireReturnType": true,
-      "requireParamDescription": true,
-      "requireReturnDescription": true
-    }],
     "require-jsdoc": ["error", {
-        "require": {
-            "FunctionDeclaration": true,
-            "MethodDefinition": true,
-            "ClassDeclaration": true
-        }
-    }]
+      "require": {
+        "FunctionDeclaration": true,
+        "MethodDefinition": true,
+        "ClassDeclaration": true
+      }
+    }],
+    "indent": 0,
+    "no-multi-spaces": 0,
+    "valid-jsdoc": 0
   }
 }

.nvmrc

@@ -1 +1 @@
-v8.9.4
+12

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.2.1
+FROM node:12.16.1
 LABEL version="1.2"
 LABEL description="Projects microservice"
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list

README.md

@@ -39,8 +39,8 @@
     "url": "localhost:9092"
   },
   "analyticsKey": "",
-  "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
-  "validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
+  "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
+  "validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
   "jwksUri": "",
   "busApiUrl": "http://api.topcoder-dev.com/v5",
   "messageApiUrl": "http://api.topcoder-dev.com/v5",

config/default.json

@@ -73,7 +73,7 @@ services:
       args:
         NODE_VERSION: 8.11.3
         GIT_URL: https://github.com/topcoder-platform/project-processor-es
-        GIT_BRANCH: feature/link-attachments
+        GIT_BRANCH: develop
     command: start kafka-client
     expose:
       - "5000"

data/demo-data.json

@@ -7,7 +7,7 @@ const token =
 
 async function seed() {
   await seedMetadata(targetUrl, token);
-  await seedProjects(targetUrl, token);
+  // await seedProjects(targetUrl, token);
 }
 
 seed().then(() => process.exit());

docs/permissions.html

@@ -7,6 +7,28 @@ if (!process.env.CONNECT_USER_TOKEN) {
   process.exit(1);
 }
 
+/**
+ * Iteratively goes through the object and replaces prices with random values.
+ *
+ * This method MUTATES object.
+ *
+ * @param {Object} o object
+ */
+function dummifyPrices(o) {
+  Object.keys(o).forEach(function (k) {
+      if (o[k] !== null && typeof o[k] === 'object') {
+        dummifyPrices(o[k]);
+          return;
+      }
+      if (k === 'price' && typeof o[k] === 'number') {
+          o[k] = 100 + Math.round(Math.random() * 10000);
+      }
+      if (k === 'price' && typeof o[k] === 'string') {
+        o[k] = (100 + Math.round(Math.random() * 10000)).toFixed(0);
+    }
+  });
+}
+
 // we need to know any logged in Connect user token to retrieve data from DEV
 const CONNECT_USER_TOKEN = process.env.CONNECT_USER_TOKEN;
 
@@ -29,6 +51,7 @@ module.exports = (targetUrl, token) => {
   })
   .then(async function (response) {
     let data = response.data;
+    dummifyPrices(data)
 
     console.log('Creating metadata objects locally...');