Merge branch 'develop' of https://github.com/topcoder-platform/challenge-api into develop

Author: ThomasKranitsas

.circleci/config.yml

@@ -72,6 +72,7 @@ workflows:
                 - develop
                 - fix/challenge-timelines-edit-routes
                 - test/performance-profile
+                - ss-bughunt
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

README.md

@@ -129,8 +129,10 @@ You can find sample `.env` files inside the `/docs` directory.
    npm run services:up
    ```
 
-4. ♻ Update following two parts:
-- https://github.com/topcoder-platform/challenge-api/blob/develop/src/models/Challenge.js#L116
+4. ♻ Update following three parts:
+- https://github.com/topcoder-platform/challenge-api/blob/develop/src/models/Challenge.js#L140
+  `throughput: 'ON_DEMAND',` should be updated to `throughput:{ read: 4, write: 2 },`
+- https://github.com/topcoder-platform/challenge-api/blob/develop/src/models/Phase.js#L33
   `throughput: 'ON_DEMAND',` should be updated to `throughput:{ read: 4, write: 2 },`
 - https://github.com/topcoder-platform/challenge-api/blob/develop/config/default.js#L27-L28
 

config/default.js

@@ -73,6 +73,9 @@ module.exports = {
   OBSERVER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '2a4dc376-a31c-4d00-b173-13934d89e286',
   CLIENT_MANAGER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '9b2f1905-8128-42da-85df-ed64410f4781',
 
+  // topgear billing accounts
+  TOPGEAR_BILLING_ACCOUNTS_ID: process.env.TOPGEAR_BILLING_ACCOUNTS_ID ? process.env.TOPGEAR_BILLING_ACCOUNTS_ID.split(',') : [],
+
   // health check timeout in milliseconds
   HEALTH_CHECK_TIMEOUT: process.env.HEALTH_CHECK_TIMEOUT || 3000,
 

src/common/helper.js

@@ -494,14 +494,15 @@ async function createSelfServiceProject (name, description, type, token) {
   const res = await axios.post(url, projectObj, { headers: { Authorization: `Bearer ${token}` } })
   const projectId = _.get(res, 'data.id')
   const phaseUrl = `${config.PROJECTS_API_URL}/${projectId}/phases`
-  const phaseStartDate = Date.now()
-  const phaseEndDate = Date.now()
+  const phaseStartDate = new Date()
+  const phaseEndDate = new Date()
   phaseEndDate.setMonth(phaseEndDate.getMonth() + 3)
   const phaseObj = {
     name: 'project main phase',
     description: 'default 90-day phase generated by self-service APIs',
-    startDate: phaseStartDate,
-    endDate: phaseEndDate
+    startDate: phaseStartDate.getTime(),
+    endDate: phaseEndDate.getTime(),
+    status: 'draft'
   }
   await axios.post(phaseUrl, phaseObj, { headers: { Authorization: `Bearer ${token}` } })
   return projectId

src/services/ChallengeService.js

@@ -166,7 +166,7 @@ async function searchChallenges (currentUser, criteria) {
   if (criteria.types) {
     for (const t of criteria.types) {
       const typeSearchRes = await ChallengeTypeService.searchChallengeTypes({ abbreviation: t })
-      if (typeSearchRes.total > 0) {
+      if (typeSearchRes.total > 0 || criteria.types.length === 1) {
         includedTypeIds.push(_.get(typeSearchRes, 'result[0].id'))
       }
     }
@@ -1446,6 +1446,9 @@ async function update (currentUser, challengeId, data, isFull) {
   // helper.ensureNoDuplicateOrNullElements(data.gitRepoURLs, 'gitRepoURLs')
 
   const challenge = await helper.getById('Challenge', challengeId)
+  if (challenge.task && (challenge.status === constants.challengeStatuses.Completed || data.status === constants.challengeStatuses.Completed || _.get(data, 'winners.length') > 0 || _.get(challenge, 'winners.length') > 0)) {
+    _.unset(data, 'task')
+  }
   let dynamicDescription = _.cloneDeep(data.description || challenge.description)
   if (challenge.legacy.selfService && data.metadata && data.metadata.length > 0) {
     for (const entry of data.metadata) {
@@ -1488,6 +1491,17 @@ async function update (currentUser, challengeId, data, isFull) {
     _.set(data, 'billing.billingAccountId', billingAccountId)
     _.set(data, 'billing.markup', markup || 0)
   }
+  if (billingAccountId && _.includes(config.TOPGEAR_BILLING_ACCOUNTS_ID, _.toString(billingAccountId))) {
+    if (_.isEmpty(data.metadata)) {
+      data.metadata = []
+    }
+    if (!_.find(data.metadata, e => e.name === 'postMortemRequired')) {
+      data.metadata.push({
+        name: 'postMortemRequired',
+        value: 'false'
+      })
+    }
+  }
   if (data.status) {
     if (data.status === constants.challengeStatuses.Active) {
       if (!_.get(challenge, 'legacy.pureV5Task') && !_.get(challenge, 'legacy.pureV5') && _.isUndefined(_.get(challenge, 'legacyId'))) {