Fixes critical before the merge with "develop" branch

Author: birdofpreyru

.exchange-rates.cache

@@ -1 +1 @@
-{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1505930400,"base":"USD","rates":{"AED":3.673018,"AFN":68.656569,"ALL":111.44,"AMD":478.524504,"ANG":1.780058,"AOA":165.9215,"ARS":17.1918,"AUD":1.237099,"AWG":1.795494,"AZN":1.7,"BAM":1.6299,"BBD":2,"BDT":80.744036,"BGN":1.628849,"BHD":0.377242,"BIF":1745,"BMD":1,"BND":1.343932,"BOB":6.910011,"BRL":3.118843,"BSD":1,"BTC":0.000250862204,"BTN":64.297439,"BWP":10.168588,"BYN":1.936496,"BZD":2.01576,"CAD":1.224481,"CDF":1561,"CHF":0.960967,"CLF":0.02304,"CLP":620.7,"CNH":6.564588,"CNY":6.578274,"COP":2891.57,"CRC":576.185,"CUC":1,"CUP":25.5,"CVE":92.3,"CZK":21.729067,"DJF":178.57,"DKK":6.194406,"DOP":47.725,"DZD":111.27,"EGP":17.644487,"ERN":15.331258,"ETB":23.6,"EUR":0.832486,"FJD":2.005257,"FKP":0.735598,"GBP":0.735598,"GEL":2.47365,"GGP":0.735598,"GHS":4.416,"GIP":0.735598,"GMD":45.99,"GNF":9000,"GTQ":7.294791,"GYD":207.79088,"HKD":7.798183,"HNL":23.394859,"HRK":6.227232,"HTG":62.924,"HUF":257.1675,"IDR":13274.524737,"ILS":3.500145,"IMP":0.735598,"INR":64.35,"IQD":1183.5,"IRR":33345,"ISK":106.94,"JEP":0.735598,"JMD":130.733525,"JOD":0.708997,"JPY":111.36833333,"KES":103.395,"KGS":68.46186,"KHR":4058.6,"KMF":410.375,"KPW":900,"KRW":1127.58,"KWD":0.301307,"KYD":0.83331,"KZT":341,"LAK":8305.5,"LBP":1510.5,"LKR":152.844139,"LRD":117.2,"LSL":13.235,"LYD":1.355,"MAD":9.3273,"MDL":17.608826,"MGA":3015,"MKD":51.28,"MMK":1363.1,"MNT":2467.964653,"MOP":8.038032,"MRO":364,"MUR":33.411,"MVR":15.409873,"MWK":725.38,"MXN":17.651,"MYR":4.187519,"MZN":61.499992,"NAD":13.23625,"NGN":356,"NIO":30.34,"NOK":7.791998,"NPR":102.835,"NZD":1.35051,"OMR":0.385011,"PAB":1,"PEN":3.243489,"PGK":3.1975,"PHP":50.82,"PKR":105.385,"PLN":3.559467,"PYG":5665.2,"QAR":3.717528,"RON":3.826506,"RSD":99.183482,"RUB":57.8311,"RWF":835,"SAR":3.75015,"SBD":7.785588,"SCR":13.549114,"SDG":6.675,"SEK":7.938334,"SGD":1.342854,"SHP":0.735598,"SLL":7550.000256,"SOS":588,"SRD":7.438,"SSP":126.175,"STD":20456.065836,"SVC":8.749337,"SYP":514.98999,"SZL":13.235,"THB":33.07,"TJS":8.797608,"TMT":3.499986,"TND":2.424711,"TOP":2.208494,"TRY":3.476708,"TTD":6.754956,"TWD":30.13,"TZS":2241.65,"UAH":26.165,"UGX":3618.833069,"USD":1,"UYU":28.843697,"UZS":8090,"VEF":10.16465,"VND":22726.641005,"VUV":103.797249,"WST":2.495435,"XAF":546.07514,"XAG":0.05775363,"XAU":0.00076107,"XCD":2.70255,"XDR":0.701882,"XOF":546.07514,"XPD":0.0010959,"XPF":99.342027,"XPT":0.00105877,"YER":250.25,"ZAR":13.240692,"ZMW":9.525,"ZWL":322.355011}}
+{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1506888001,"base":"USD","rates":{"AED":3.67304,"AFN":68.671,"ALL":113.870562,"AMD":481.658804,"ANG":1.790817,"AOA":165.9215,"ARS":17.556721,"AUD":1.275165,"AWG":1.792249,"AZN":1.68525,"BAM":1.665744,"BBD":2,"BDT":82.808961,"BGN":1.65936,"BHD":0.379507,"BIF":1759.35,"BMD":1,"BND":1.3655,"BOB":7.007198,"BRL":3.164872,"BSD":1,"BTC":0.000231700681,"BTN":65.367042,"BWP":10.361384,"BYN":1.97054,"BZD":2.027943,"CAD":1.248955,"CDF":1574.900794,"CHF":0.96829,"CLF":0.02376,"CLP":640.1,"CNH":6.647985,"CNY":6.6525,"COP":2936.91,"CRC":576.194261,"CUC":1,"CUP":25.5,"CVE":93.7,"CZK":22.033,"DJF":178.97,"DKK":6.309359,"DOP":48.055714,"DZD":113.760984,"EGP":17.675,"ERN":15.332621,"ETB":23.639913,"EUR":0.84796,"FJD":2.024752,"FKP":0.747231,"GBP":0.747231,"GEL":2.47065,"GGP":0.747231,"GHS":4.433011,"GIP":0.747231,"GMD":47.35,"GNF":9048.55,"GTQ":7.379029,"GYD":207.42747,"HKD":7.81132,"HNL":23.548227,"HRK":6.381207,"HTG":63.462522,"HUF":264.275,"IDR":13498.158815,"ILS":3.53425,"IMP":0.747231,"INR":65.3033,"IQD":1176.086141,"IRR":33482.5,"ISK":106.1,"JEP":0.747231,"JMD":130.991002,"JOD":0.7086,"JPY":112.649,"KES":103.866643,"KGS":68.645752,"KHR":4074.55,"KMF":417.125,"KPW":900,"KRW":1147.5,"KWD":0.303898,"KYD":0.838314,"KZT":342.53341,"LAK":8343.8,"LBP":1517.25,"LKR":154.010818,"LRD":117.662332,"LSL":13.586291,"LYD":1.379274,"MAD":9.479793,"MDL":17.574784,"MGA":3046.35,"MKD":52.11,"MMK":1372.75,"MNT":2459.308235,"MOP":8.094148,"MRO":367.14129,"MUR":33.98,"MVR":15.409873,"MWK":729.93295,"MXN":18.249844,"MYR":4.22244,"MZN":62.008262,"NAD":13.586291,"NGN":359.708899,"NIO":30.544456,"NOK":7.974222,"NPR":105.151062,"NZD":1.383952,"OMR":0.387495,"PAB":1,"PEN":3.286661,"PGK":3.213892,"PHP":50.981395,"PKR":106.010974,"PLN":3.6583,"PYG":5689.4,"QAR":3.66285,"RON":3.889289,"RSD":101.522947,"RUB":57.5892,"RWF":837.363477,"SAR":3.7502,"SBD":7.848531,"SCR":13.391885,"SDG":6.717258,"SEK":8.164529,"SGD":1.357997,"SHP":0.747231,"SLL":7603.75,"SOS":582.924833,"SRD":7.438,"SSP":126.8534,"STD":20820.5,"SVC":8.80296,"SYP":514.94999,"SZL":13.465,"THB":33.3855,"TJS":8.84842,"TMT":3.499986,"TND":2.477994,"TOP":2.22345,"TRY":3.562514,"TTD":6.793774,"TWD":30.33,"TZS":2266.250904,"UAH":26.751304,"UGX":3626.9,"USD":1,"UYU":29.321769,"UZS":8117.9,"VEF":10.15575,"VND":22770.766667,"VUV":104.889999,"WST":2.5127,"XAF":556.225298,"XAG":0.06004933,"XAU":0.00078121,"XCD":2.70255,"XDR":0.707566,"XOF":556.225298,"XPD":0.00106535,"XPF":101.188544,"XPT":0.00109532,"YER":250.3,"ZAR":13.503994,"ZMW":9.723815,"ZWL":322.355011}}

Dockerfile

@@ -9,8 +9,7 @@ WORKDIR /opt/app
 COPY . .
 
 RUN npm install
-# tests are failing so this is commented for now to be able to create the container
-#RUN npm test
+RUN npm test
 RUN npm run build
 ENV NODE_ENV=$NODE_ENV
 

__tests__/shared/components/__snapshots__/Content.jsx.snap

@@ -236,6 +236,36 @@ exports[`Matches shallow shapshot 1`] = `
       ; the link here leads to a test challenge.
     </li>
   </ul>
+  <h3>
+    TCO Assets
+  </h3>
+  <ul>
+    <li>
+      TCO Scoreboard demo is mounted on 
+      <code>
+        /scoreboard/:id
+      </code>
+      , where 
+      <code>
+        :id
+      </code>
+       is the competition ID, not related to the regular challenge IDs. Here are two demo links for the scoreboards for the competitions created by the scoreboard init script: ‌
+      <Link
+        replace={false}
+        to="/scoreboard/123"
+      >
+        ID = 123
+      </Link>
+      , ‌
+      <Link
+        replace={false}
+        to="/scoreboard/1234"
+      >
+        ID = 1234
+      </Link>
+      .
+    </li>
+  </ul>
   <h3>
     Separate Topcoder Communities
   </h3>

bin/init-scoreboard-data

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+/* Script for intialization of test scoreboard data in DB. */
+
+/* Enables Babel for the server-side code (with exception of this very file). */
+require('babel-register')({
+  ignore: /node_modules\/(?!appirio-tech.*|topcoder|tc-)/,
+});
+
+/* Runs the script itself. */
+require('../src/server/tco/scoreboard/init-data.js');

config/default.json

@@ -101,7 +101,7 @@
   "SWIFT_PROGRAM_ID": 3445,
 
   "SCOREBOARD":{
-    "DB": "postgres://scoreboard:p@ssword123@localhost:5432/scoreboard",
+    "DB": "postgres://postgres:postgres@localhost:5432/scoreboard",
     "ADMIN_ROLE": "administrator"
   }
 }

docker-compose.yml

@@ -15,7 +15,7 @@
     "lint:scss": "stylelint **/*.scss --syntax scss",
     "start": "cross-env BABEL_ENV=production node ./bin/www",
     "test": "npm run lint && npm run jest",
-    "init-scoreboard-data": "babel-node src/server/tco/scoreboard/init-data.js"
+    "init-scoreboard-data": "node ./bin/init-scoreboard-data"
   },
   "repository": {
     "type": "git",
@@ -105,7 +105,6 @@
     "xml2json": "^0.11.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
     "babel-eslint": "^7.2.3",
     "babel-loader": "^7.1.2",
     "babel-plugin-dynamic-import-node": "^1.0.2",

package-lock.json

@@ -48,8 +48,8 @@ async function init() {
       submissionCode: {
         codeField1: 'Best',
         codeField2: 'Done',
-        codeField3: 40
-      }
+        codeField3: 40,
+      },
     });
 
     await SubmissionService.create({
@@ -58,8 +58,8 @@ async function init() {
       submissionCode: {
         codeField1: 'Good',
         codeField2: 'Final Submission',
-        codeField3: 30
-      }
+        codeField3: 30,
+      },
     });
 
     // create submissions
@@ -69,8 +69,8 @@ async function init() {
       submissionDesign: {
         designField1: 'RUX',
         designField2: '48h',
-        designField3: 40
-      }
+        designField3: 40,
+      },
     });
 
     // create submissions
@@ -80,8 +80,8 @@ async function init() {
       submissionDesign: {
         designField1: 'FAST',
         designField2: '24h',
-        designField3: 30
-      }
+        designField3: 30,
+      },
     });
 
     // clear challenge competitors

package.json

@@ -7,7 +7,6 @@
  * @author TCSCODER
  * @version 1.0
  */
-import Sequelize from 'sequelize';
 import helper from '../common/helper';
 import designFields from '../config/submissionDesignFields.json';
 

src/server/tco/scoreboard/init-data.js

@@ -30,6 +30,31 @@ const ChallengeSchema = Joi.object().keys({
   })),
 });
 
+/**
+ * creates the competitors for a challenge.
+ * @param {Integer} challengeId the challenge id
+ * @param {Array} competitors the list of competitors
+ */
+async function handleChallengeCompetitors(challengeId, competitors) {
+  if (competitors) {
+    // Remove any potential connection from the challenge to competitors
+    // This is neeeded in case competitors are updated.
+    await ChallengeCompetitor.destroy({ where: { challengeId } });
+
+    _.each(competitors, async (competitor) => {
+      let existingCompetitor = await Competitor.findOne({ where: { handle: competitor.handle } });
+      if (!existingCompetitor) {
+        existingCompetitor = await Competitor.create(competitor);
+      }
+
+      await ChallengeCompetitor.create({
+        challengeId,
+        handle: existingCompetitor.handle,
+      });
+    });
+  }
+}
+
 /**
  * Create a Challenge
  * @param {Object} challenge the challenge
@@ -57,7 +82,7 @@ create.schema = { challenge: ChallengeSchema };
 function get(id) {
   return helper.ensureExists(Challenge, {
     where: { id },
-    include: [{ model: models.Submission, include : [{ all: true }] }, {
+    include: [{ model: models.Submission, include: [{ all: true }] }, {
       model: Competitor, through: { attributes: [] },
     }],
   }, true);
@@ -97,31 +122,6 @@ update.schema = {
   challenge: ChallengeSchema,
 };
 
-/**
- * creates the competitors for a challenge.
- * @param {Integer} challengeId the challenge id
- * @param {Array} competitors the list of competitors
- */
-async function handleChallengeCompetitors(challengeId, competitors) {
-  if (competitors) {
-    // Remove any potential connection from the challenge to competitors
-    // This is neeeded in case competitors are updated.
-    await ChallengeCompetitor.destroy({ where: { challengeId: challengeId } });
-
-    _.each(competitors, async (competitor) => {
-      let existingCompetitor = await Competitor.findOne({ where: { handle: competitor.handle } });
-      if (!existingCompetitor) {
-        existingCompetitor = await Competitor.create(competitor);
-      }
-
-      await ChallengeCompetitor.create({
-        challengeId: challengeId,
-        handle: existingCompetitor.handle
-      });
-    });
-  }
-}
-
 module.exports = {
   create,
   get,