Merge pull request #715 from topcoder-platform/dev

[PROD RELEASE] TSJR-297 Drop Ubahn & ES dependency

Author: kkartunov

.circleci/config.yml

@@ -78,7 +78,6 @@ workflows:
             branches:
               only:
                 - dev
-                - TSJR-246
 
       # Development builds are executed on "develop" branch only.
       - "build-qa":

.gitignore

@@ -76,6 +76,7 @@ web_modules/
 .env
 .env.test
 taas-es-processor.env
+dev-env.sh
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
@@ -125,3 +126,6 @@ api.env
 
 # macOS files
 .DS_Store
+
+# db backups
+db-backups

config/default.js

@@ -15,8 +15,6 @@ module.exports = {
   AUTH0_URL: process.env.AUTH0_URL,
   // Auth0 audience, used to get TC M2M token
   AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE,
-  // Auth0 audience for U-Bahn
-  AUTH0_AUDIENCE_UBAHN: process.env.AUTH0_AUDIENCE_UBAHN,
   // Auth0 token cache time, used to get TC M2M token
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   // Auth0 client id, used to get TC M2M token
@@ -58,39 +56,6 @@ module.exports = {
   // the default path for importing and exporting data
   DEFAULT_DATA_FILE_PATH: './data/demo-data.json',
 
-  esConfig: {
-    // the elasticsearch host
-    HOST: process.env.ES_HOST || 'http://localhost:9200',
-
-    ELASTICCLOUD: {
-      // The elastic cloud id, if your elasticsearch instance is hosted on elastic cloud. DO NOT provide a value for ES_HOST if you are using this
-      id: process.env.ELASTICCLOUD_ID,
-      // The elastic cloud username for basic authentication. Provide this only if your elasticsearch instance is hosted on elastic cloud
-      username: process.env.ELASTICCLOUD_USERNAME,
-      // The elastic cloud password for basic authentication. Provide this only if your elasticsearch instance is hosted on elastic cloud
-      password: process.env.ELASTICCLOUD_PASSWORD
-    },
-
-    // The Amazon region to use when using AWS Elasticsearch service
-    AWS_REGION: process.env.AWS_REGION || 'us-east-1', // AWS Region to be used if we use AWS ES
-
-    // the job index
-    ES_INDEX_JOB: process.env.ES_INDEX_JOB || 'job',
-    // the job candidate index
-    ES_INDEX_JOB_CANDIDATE: process.env.ES_INDEX_JOB_CANDIDATE || 'job_candidate',
-    // the resource booking index
-    ES_INDEX_RESOURCE_BOOKING: process.env.ES_INDEX_RESOURCE_BOOKING || 'resource_booking',
-    // the role index
-    ES_INDEX_ROLE: process.env.ES_INDEX_ROLE || 'role',
-    // the userMeetingSettings index
-    ES_INDEX_USER_MEETING_SETTINGS: process.env.ES_INDEX_USER_MEETING_SETTINGS || 'user_meeting_settings',
-
-    // the max bulk size in MB for ES indexing
-    MAX_BULK_REQUEST_SIZE_MB: process.env.MAX_BULK_REQUEST_SIZE_MB || 20,
-    // the max number of documents per bulk for ES indexing
-    MAX_BULK_NUM_DOCUMENTS: process.env.MAX_BULK_NUM_DOCUMENTS || 100
-  },
-
   // Topcoder Bus API URL
   BUSAPI_URL: process.env.BUSAPI_URL || 'https://api.topcoder-dev.com/v5',
   // The error topic at which bus api will publish any errors

docs/swagger.yaml

@@ -635,7 +635,8 @@ paths:
           required: false
           schema:
             type: string
-            format: uuid
+            example: '443211'
+            description: 'The topcoder user id'
           description: The user id.
         - in: query
           name: status
@@ -1654,7 +1655,8 @@ paths:
           required: false
           schema:
             type: string
-            format: uuid
+            example: '443211'
+            description: 'The topcoder user id'
           description: The job id.
         - in: query
           name: projectId
@@ -3186,11 +3188,11 @@ paths:
       parameters:
         - in: path
           name: userId
-          description: The userId
+          description: 'The topcoder user id'
           required: true
           schema:
             type: string
-            format: uuid
+            example: '443211'
 
       responses:
         "200":
@@ -3243,11 +3245,12 @@ paths:
       parameters:
         - in: path
           name: userId
-          description: The UUID of the User whose calendar should be deleted
+          description: The topcoder id of the User whose calendar should be deleted
           required: true
           schema:
             type: string
-            format: uuid
+            example: '443211'
+            description: 'The topcoder user id'
         - in: path
           name: calendarId
           description: The id of the calendar to delete. This id comes from Nylas backend server
@@ -4518,9 +4521,8 @@ components:
           description: "The project id."
         userId:
           type: string
-          format: uuid
-          example: "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
-          description: "The user id."
+          example: '443211'
+          description: "The topcoder user id."
         status:
           type: string
           enum:
@@ -4589,9 +4591,8 @@ components:
           description: "The project id."
         userId:
           type: string
-          format: uuid
-          example: "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
-          description: "The user id."
+          example: '443211'
+          description: "The topcoder user id."
         status:
           type: string
           enum:
@@ -4678,9 +4679,8 @@ components:
           description: "The project id."
         userId:
           type: string
-          format: uuid
-          example: "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
-          description: "The user id."
+          example: '443211'
+          description: "The topcoder user id."
         status:
           type: string
           enum:
@@ -4862,8 +4862,8 @@ components:
           description: "The handle of the interview host"
         hostUserId:
           type: string
-          example: "00000000-0000-0000-0000-000000000000"
-          description: "The userId of the interview host"
+          example: "442321"
+          description: "The topcoder userId of the interview host"
         jobCandidateId:
           type: string
           format: uuid
@@ -4949,7 +4949,8 @@ components:
                 pattern: "^[0-9]{1,2}:[0-9]{2}$"
         hostUserId:
           type: string
-          format: uuid
+          example: '443211'
+          description: 'The topcoder user id of the host'
 
     UpdateInterviewByRequestBody:
       properties:
@@ -4962,7 +4963,7 @@ components:
           example: "Europe/London"
         hostUserId:
           type: string
-          description: "UUID of interview host user"
+          description: "The topcoder id of interview host user"
         expireTimestamp:
           type: string
           format: date-time
@@ -5122,9 +5123,8 @@ components:
           description: "The project id."
         userId:
           type: string
-          format: uuid
-          example: "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
-          description: "The external id."
+          example: "442312"
+          description: "The topcoder id."
         jobId:
           type: string
           format: uuid
@@ -5206,9 +5206,8 @@ components:
           description: "The project id."
         userId:
           type: string
-          format: uuid
-          example: "a55fe1bc-1754-45fa-9adc-cf3d6d7c377a"
-          description: "The external id."
+          example: "442321"
+          description: "The topcoder id."
         sendWeeklySurvey:
           type: boolean
           example: true,
@@ -5566,8 +5565,8 @@ components:
           description: The job id.
         userId:
           type: string
-          format: uuid
-          description: The user id.
+          example: '442321'
+          description: 'The topcoder user id'
         projectId:
           type: integer
           description: The project id.
@@ -5779,8 +5778,8 @@ components:
           description: "The resource booking id."
         userId:
           type: string
-          format: uuid
-          description: "The user id."
+          example: '442321'
+          description: "The topcoder user id."
         handle:
           type: string
           example: "Tony"
@@ -6023,8 +6022,8 @@ components:
                 description: "The job candidate id."
               userId:
                 type: string
-                format: uuid
-                description: "User id."
+                example: '44231'
+                description: "The topcoder user id."
               resume:
                 type: string
                 format: url
@@ -6369,7 +6368,7 @@ components:
         userId:
           type: number
           example: 40157055
-          description: the user id
+          description: 'The topcoder user id'
         handle:
           type: string
           example: maxceemdev
@@ -6701,7 +6700,8 @@ components:
       properties:
         userId:
           type: string
-          format: uuid
+          example: '442321'
+          description: 'The topcoder user id'
         defaultAvailableTime:
           type: array
           items:

docs/tc-taas-rcrm-data-sync-api-logInsights.png

@@ -32,13 +32,13 @@ module.exports = {
       await Promise.all(resourceBookings.map(async rb => {
         if (!_.isNil(rb.startDate) && !_.isNil(rb.endDate)) {
           const periods = helper.extractWorkPeriods(rb.startDate, rb.endDate)
-          const user = await helper.ensureUserById(rb.userId)
+          let tcUser = await helper.ensureTopcoderUserIdExists(rb.userId)
           _.forEach(periods, period => {
             workPeriodData.push({
               id: uuid(),
               resource_booking_id: rb.id,
               project_id: rb.projectId,
-              user_handle: user.handle,
+              user_handle: tcUser.handleLower,
               start_date: period.startDate,
               end_date: period.endDate,
               days_worked: null,

migrations/2021-04-22-3-populate-work-periods-for-resource-bookings.js

@@ -73,7 +73,7 @@ module.exports = {
       for (const rb of resourceBookings) {
         if (!_.isNil(rb.startDate) && !_.isNil(rb.endDate)) {
           const periods = helper.extractWorkPeriods(rb.startDate, rb.endDate)
-          const user = await helper.ensureUserById(rb.userId)
+          let tcUser = await helper.ensureTopcoderUserIdExists(rb.userId)
           _.forEach(periods, period => {
             workPeriodData.push({
               id: uuid(),