Merge branch 'develop'

Author: rootelement

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

@@ -47,6 +47,8 @@ module.exports = {
   FILE_UPLOAD_SIZE_LIMIT: process.env.FILE_UPLOAD_SIZE_LIMIT
     ? Number(process.env.FILE_UPLOAD_SIZE_LIMIT) : 50 * 1024 * 1024, // 50M
   RESOURCES_API_URL: process.env.RESOURCES_API_URL || 'http://localhost:4000/v5/resources',
+  // TODO: change this to localhost
+  RESOURCE_ROLES_API_URL: process.env.RESOURCE_ROLES_API_URL || 'http://api.topcoder-dev.com/v5/resource-roles',
   GROUPS_API_URL: process.env.GROUPS_API_URL || 'http://localhost:4000/v5/groups',
   PROJECTS_API_URL: process.env.PROJECTS_API_URL || 'http://localhost:4000/v5/projects',
   TERMS_API_URL: process.env.TERMS_API_URL || 'http://localhost:4000/v5/terms',

docs/swagger.yaml

@@ -2219,6 +2219,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 +2364,10 @@ definitions:
                     type: string
                   value:
                     type: number
+      discussions:
+        type: array
+        items:
+          $ref: '#/definitions/Discussion'
       tags:
         type: array
         items:
@@ -2655,6 +2681,10 @@ definitions:
               format: UUID
             duration:
               type: number
+      discussions:
+        type: array
+        items:
+          $ref: '#/definitions/Discussion'
       prizeSets:
         type: array
         items: