Merge pull request #3441 from appirio-tech/dev

Production Release 2.5

Author: vikasrohit

.circleci/config.yml

@@ -90,6 +90,13 @@ jobs:
       LOGICAL_ENV: "dev"
     steps: *deploy_steps
 
+  deployTest01:
+    <<: *deploy_defaults
+    environment:
+      DEPLOY_ENV: "DEV"
+      LOGICAL_ENV: "test01"
+    steps: *deploy_steps
+
   deployProd:
     <<: *deploy_defaults
     environment:
@@ -120,6 +127,14 @@ workflows:
             branches:
               only: ['dev', 'dev-msinteg']
 
+      - deployTest01:
+          context : org-global
+          requires:
+            - build-dev
+          filters:
+            branches:
+              only: ['v5-upgrade']
+
       - deployProd:
           context : org-global
           requires:

docs/LocalSetup.md

@@ -35,7 +35,7 @@ psql messages coder -h local.topcoder-dev.com
 And execute the following statement:
 
 ```sql
-INSERT INTO "referenceLookups" (reference, endpoint, "createdAt", "updatedAt") VALUES ('project', 'https://api.topcoder-dev.com/v4/projects/{id}', now(), now());
+INSERT INTO "referenceLookups" (reference, endpoint, "createdAt", "updatedAt") VALUES ('project', 'https://api.topcoder-dev.com/v5/projects/{id}', now(), now());
 ```
 
 

src/api/orgConfig.js

@@ -10,7 +10,7 @@ import { PROJECTS_API_URL } from '../config/constants'
  * @returns {Promise<Object>} organization config data
  */
 export function getOrgConfig(groupIds) {
-  return axios.get(`${PROJECTS_API_URL}/v4/projects/metadata/orgConfig?filter=orgId=in(${groupIds})`)
+  return axios.get(`${PROJECTS_API_URL}/v5/projects/metadata/orgConfig?orgId=${groupIds}`)
     .then(resp => {
       return _.get(resp.data, 'result.content', {})
     })

src/api/projectAttachments.js

@@ -1,14 +1,13 @@
-import _ from 'lodash'
 import { axiosInstance as axios } from './requestInterceptor'
 import { PROJECTS_API_URL, FILE_PICKER_SUBMISSION_CONTAINER_NAME } from '../config/constants'
 
 export function addProjectAttachment(projectId, fileData) {
   // add s3 bucket prop
   fileData.s3Bucket = FILE_PICKER_SUBMISSION_CONTAINER_NAME
-  return axios.post(`${PROJECTS_API_URL}/v4/projects/${projectId}/attachments`, { param: fileData })
+  return axios.post(`${PROJECTS_API_URL}/v5/projects/${projectId}/attachments`, fileData)
     .then( resp => {
-      resp.data.result.content.downloadUrl = `/projects/${projectId}/attachments/${resp.data.result.content.id}`
-      return _.get(resp.data, 'result.content', {})
+      resp.data.downloadUrl = `/projects/${projectId}/attachments/${resp.data.id}`
+      return resp.data
     })
 }
 
@@ -19,56 +18,54 @@ export function updateProjectAttachment(projectId, attachmentId, attachment) {
       allowedUsers: null
     }
   }
-  
+
   return axios.patch(
-    `${PROJECTS_API_URL}/v4/projects/${projectId}/attachments/${attachmentId}`,
-    { param: attachment })
+    `${PROJECTS_API_URL}/v5/projects/${projectId}/attachments/${attachmentId}`, attachment)
     .then ( resp => {
-      resp.data.result.content.downloadUrl = `/projects/${projectId}/attachments/${attachmentId}`
-      return _.get(resp.data, 'result.content', {})
+      resp.data.downloadUrl = `/projects/${projectId}/attachments/${attachmentId}`
+      return resp.data
     })
 }
 
 export function removeProjectAttachment(projectId, attachmentId) {
   // return attachmentId so reducer knows which one to remove from list
-  return axios.delete(`${PROJECTS_API_URL}/v4/projects/${projectId}/attachments/${attachmentId}`)
+  return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/attachments/${attachmentId}`)
     .then(() => attachmentId)
 }
 
 export function getProjectAttachment(projectId, attachmentId) {
   return axios.get(
-    `${PROJECTS_API_URL}/v4/projects/${projectId}/attachments/${attachmentId}`)
-    .then ( resp => resp.data.result.content.url )
+    `${PROJECTS_API_URL}/v5/projects/${projectId}/attachments/${attachmentId}`)
+    .then ( resp => resp.data.url )
 }
 
 export function addProductAttachment(projectId, phaseId, productId, fileData) {
   // add s3 bucket prop
   fileData.s3Bucket = FILE_PICKER_SUBMISSION_CONTAINER_NAME
-  return axios.post(`${PROJECTS_API_URL}/v4/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments`, { param: fileData })
+  return axios.post(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments`, fileData)
     .then( resp => {
-      resp.data.result.content.downloadUrl = `/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${resp.data.result.content.id}`
-      return _.get(resp.data, 'result.content', {})
+      resp.data.downloadUrl = `/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${resp.data.id}`
+      return resp.data
     })
 }
 
 export function updateProductAttachment(projectId, phaseId, productId, attachmentId, attachment) {
   return axios.patch(
-    `${PROJECTS_API_URL}/v4/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`,
-    { param: attachment })
+    `${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`, attachment)
     .then ( resp => {
-      resp.data.result.content.downloadUrl = `/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`
-      return _.get(resp.data, 'result.content', {})
+      resp.data.downloadUrl = `/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`
+      return resp.data
     })
 }
 
 export function removeProductAttachment(projectId, phaseId, productId, attachmentId) {
   // return attachmentId so reducer knows which one to remove from list
-  return axios.delete(`${PROJECTS_API_URL}/v4/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`)
+  return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`)
     .then(() => attachmentId)
 }
 
 export function getProductAttachment(projectId, phaseId, productId, attachmentId) {
   return axios.get(
-    `${PROJECTS_API_URL}/v4/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`)
-    .then(resp => resp.data.result.content.url)
+    `${PROJECTS_API_URL}/v5/projects/${projectId}/phases/${phaseId}/products/${productId}/attachments/${attachmentId}`)
+    .then(resp => resp.data.url)
 }

src/api/projectMemberInvites.js

@@ -8,11 +8,9 @@ import { PROJECTS_API_URL } from '../config/constants'
  * @return {object}  project member invite returned by api
  */
 export function updateProjectMemberInvite(projectId, member) {
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/invite/`
-  return axios.put(url, { param: member})
-    .then(resp => {
-      return resp.data.result.content
-    })
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/`
+  return axios.put(url, member)
+    .then(resp => resp.data)
 }
 
 /**
@@ -23,29 +21,25 @@ export function updateProjectMemberInvite(projectId, member) {
  */
 export function createProjectMemberInvite(projectId, member) {
   const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle,firstName,lastName,photoURL'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/invite/?fields=` + encodeURIComponent(fields)
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/?fields=` + encodeURIComponent(fields)
   return axios({
     method: 'post',
     url,
-    data: {
-      param: member
-    },
+    data: member,
     validateStatus (status) {
       return (status >= 200 && status < 300) || status === 403
     },
   })
-    .then(resp => {
-      return resp.data.result.content
-    })
+    .then(resp => resp.data)
 }
 
 export function getProjectMemberInvites(projectId) {
   const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle,firstName,lastName,photoURL'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/invites/?fields=`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invites/?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)
     .then( resp => {
-      return resp.data.result.content
+      return resp.data
     })
 }
 
@@ -55,8 +49,6 @@ export function getProjectMemberInvites(projectId) {
  * @return {object}  project member invite returned by api
  */
 export function getProjectInviteById(projectId) {
-  return axios.get(`${PROJECTS_API_URL}/v4/projects/${projectId}/members/invite/`)
-    .then(resp => {
-      return resp.data.result.content
-    })
+  return axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/`)
+    .then(resp => resp.data)
 }

src/api/projectMembers.js

@@ -42,26 +42,24 @@ export function loadMemberSuggestions(value) {
 
 
 export function addProjectMember(projectId, newMember) {
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/`
-  return axios.post(url, { param: newMember})
-    .then(resp => {
-      return resp.data.result.content
-    })
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/`
+  return axios.post(url, newMember)
+    .then(resp => resp.data)
 }
 
 
 export function updateProjectMember(projectId, memberId, updatedProps) {
   const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHourStart,workingHourEnd,timeZone'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/${memberId}/?fields=`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/${memberId}/?fields=`
     + encodeURIComponent(fields)
-  return axios.patch(url, { param: updatedProps })
+  return axios.patch(url, updatedProps)
     .then(resp => {
-      return resp.data.result.content
+      return resp.data
     })
 }
 
 export function removeProjectMember(projectId, memberId) {
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/${memberId}/`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/${memberId}/`
   return axios.delete(url)
     .then(() => {
       // return the member id just removed
@@ -71,20 +69,20 @@ export function removeProjectMember(projectId, memberId) {
 
 export function getProjectMembers(projectId) {
   const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHourStart,workingHourEnd,timeZone'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/?fields=`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)
     .then( resp => {
-      return resp.data.result.content
+      return resp.data
     })
 }
 
 export function getProjectMember(projectId, memberId) {
   const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHourStart,workingHourEnd,timeZone'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/${memberId}?fields=`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/${memberId}?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)
     .then( resp => {
-      return resp.data.result.content
+      return resp.data
     })
 }

src/api/projectReports.js

@@ -9,15 +9,15 @@ import { PROJECTS_API_URL } from '../config/constants'
  */
 export function getProjectSummary(projectId) {
 
-  const summaryPromise = axios.get(`${PROJECTS_API_URL}/v4/projects/${projectId}/reports?reportName=summary`)
-  const budgetPromise = axios.get(`${PROJECTS_API_URL}/v4/projects/${projectId}/reports?reportName=projectBudget`)
+  const summaryPromise = axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/reports?reportName=summary`)
+  const budgetPromise = axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/reports?reportName=projectBudget`)
 
   return Promise.all([summaryPromise, budgetPromise]).then(responses => {
-    const res = _.get(responses[0].data, 'result.content', {})
+    const res = responses[0].data
     const designMetrics = _.find(res, c => c['challenge.track'] === 'Design') || {}
     const totalRegistrants = _.sumBy(res, c => c['challenge.num_registrations'])
 
-    const res1 = _.get(responses[1].data, 'result.content', {})
+    const res1 = responses[1].data
     const filterReport = c => `${c['project_stream.tc_connect_project_id']}` === projectId.toString()
     const projectBudget = _.find(res1, filterReport) || {}
 
@@ -29,7 +29,7 @@ export function getProjectSummary(projectId) {
         revenue: parseFloat(projectBudget['project_stream.total_invoiced_amount'] || 0),
         remaining: parseFloat(projectBudget['project_stream.remaining_invoiced_budget'] || 0)
       },
-      // null values will be filled in as back-end implementation/integration is done. 
+      // null values will be filled in as back-end implementation/integration is done.
       topcoderDifference: {
         countries: null,
         registrants: totalRegistrants,