Merge branch 'develop' into update-mappings

Author: James Cori

app-constants.js

@@ -47,6 +47,10 @@ const EVENT_ORIGINATOR = 'topcoder-challenges-api'
 
 const EVENT_MIME_TYPE = 'application/json'
 
+const DiscussionTypes = {
+  Challenge: 'challenge'
+}
+
 // using a testing topc, should be changed to use real topics in comments when they are created
 const Topics = {
   ChallengeCreated: 'challenge.notification.create',
@@ -85,5 +89,6 @@ module.exports = {
   EVENT_MIME_TYPE,
   Topics,
   challengeTracks,
-  challengeTextSortField
+  challengeTextSortField,
+  DiscussionTypes
 }

config/default.js

@@ -59,6 +59,9 @@ module.exports = {
     ? process.env.COPILOT_RESOURCE_ROLE_IDS.split(',') : ['10ba038e-48da-487b-96e8-8d3b99b6d18b'],
   SUBMITTER_ROLE_ID: process.env.SUBMITTER_ROLE_ID || '732339e7-8e30-49d7-9198-cccf9451e221',
 
+  MANAGER_ROLE_ID: process.env.MANAGER_ROLE_ID || '0e9c6879-39e4-4eb6-b8df-92407890faf1',
+  OBSERVER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '2a4dc376-a31c-4d00-b173-13934d89e286',
+
   // health check timeout in milliseconds
   HEALTH_CHECK_TIMEOUT: process.env.HEALTH_CHECK_TIMEOUT || 3000,
 

docs/swagger.yaml

@@ -1736,6 +1736,11 @@ paths:
           description: Filter by timeline template id
           required: false
           type: string
+        - name: isDefault
+          in: query
+          description: Filter by is default flag
+          required: false
+          type: boolean
       responses:
         '200':
           description: OK
@@ -2219,6 +2224,28 @@ definitions:
       - $ref: '#/definitions/EventData'
     required:
       - id
+  Discussion:
+    type: object
+    properties:
+      id:
+        type: string
+        format: UUID
+      name:
+        type: string
+      type:
+        type: string
+        enum:
+          - challenge
+      provider:
+        type: string
+      url:
+        type: string
+        description: Only M2M tokens can modify this
+      options:
+        type: array
+        description: Only M2M tokens can modify this
+        items:
+          type: object
   TimelineTemplate:
     type: object
     allOf:
@@ -2342,6 +2369,10 @@ definitions:
                     type: string
                   value:
                     type: number
+      discussions:
+        type: array
+        items:
+          $ref: '#/definitions/Discussion'
       tags:
         type: array
         items:
@@ -2554,6 +2585,9 @@ definitions:
       timelineTemplateId:
         type: string
         format: UUID
+      isDefault:
+        type: boolean
+        default: false
     required:
       - typeId
       - trackId
@@ -2655,6 +2689,10 @@ definitions:
               format: UUID
             duration:
               type: number
+      discussions:
+        type: array
+        items:
+          $ref: '#/definitions/Discussion'
       prizeSets:
         type: array
         items: