Merge pull request #165 from topcoder-platform/dev

Production release to support Connect 2.4.4

Author: vikasrohit

.circleci/config.yml

@@ -76,7 +76,7 @@ workflows:
             - test
           filters:
             branches:
-              only: ['dev', 'feature/dev-challenges']
+              only: ['dev', 'feature/timeline-milestone']
       - deployProd:
           requires:
             - test

README.md

@@ -62,7 +62,7 @@ Authentication is handled via Authorization (Bearer) token header field. Token i
 ```
 eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJhZG1pbmlzdHJhdG9yIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJwc2hhaDEiLCJleHAiOjI0NjI0OTQ2MTgsInVzZXJJZCI6IjQwMTM1OTc4IiwiaWF0IjoxNDYyNDk0MDE4LCJlbWFpbCI6InBzaGFoMUB0ZXN0LmNvbSIsImp0aSI6ImY0ZTFhNTE0LTg5ODAtNDY0MC04ZWM1LWUzNmUzMWE3ZTg0OSJ9.XuNN7tpMOXvBG1QwWRQROj7NfuUbqhkjwn39Vy4tR5I
 ```
-It's been signed with the secret 'secret'. This secret should match your entry in config/local.json. You can generate your own token using https://jwt.io
+It's been signed with the secret 'secret'. This secret should match your entry in config/local.js. You can generate your own token using https://jwt.io
 
 ### Local Deployment
 Build image:

config/custom-environment-variables.json

@@ -9,7 +9,9 @@
     "host": "PROJECTS_ES_URL",
     "apiVersion": "2.3",
     "indexName": "PROJECTS_ES_INDEX_NAME",
-    "docType": "projectV4"
+    "docType": "projectV4",
+    "timelineIndexName": "TIMELINES_ES_INDEX_NAME",
+    "timelineDocType": "TIMELINES_ES_DOC_TYPE"
   },
   "rabbitmqURL": "RABBITMQ_URL",
   "pubsubQueueName": "PUBSUB_QUEUE_NAME",

config/default.json

@@ -20,7 +20,9 @@
     "host": "",
     "apiVersion": "2.3",
     "indexName": "projects",
-    "docType": "projectV4"
+    "docType": "projectV4",
+    "timelineIndexName": "timelines",
+    "timelineDocType": "timelineV4"
   },
   "systemUserClientId": "",
   "systemUserClientSecret": "",

config/development.json

@@ -1,5 +1,6 @@
 {
   "pubsubQueueName": "dev.project.service",
   "pubsubExchangeName": "dev.projects",
-  "attachmentsS3Bucket": "topcoder-dev-media"
+  "attachmentsS3Bucket": "topcoder-dev-media",
+  "connectProjectsUrl": "https://connect.topcoder-dev.com/projects/"
 }

config/production.json

@@ -1,3 +1,4 @@
 {
-  "authDomain": "topcoder.com"
+  "authDomain": "topcoder.com",
+  "connectProjectsUrl": "https://connect.topcoder.com/projects/",
 }

config/test.json

@@ -7,9 +7,12 @@
       "host": "http://localhost:9200",
       "apiVersion": "2.3",
       "indexName": "projects_test",
-      "docType": "projectV4"
+      "docType": "projectV4",
+      "timelineIndexName": "timelines_test",
+      "timelineDocType": "timelineV4"
     },
     "rabbitmqUrl": "amqp://localhost:5672",
+    "connectProjectsUrl": "https://local.topcoder-dev.com/projects/",
     "dbConfig": {
         "masterUrl": "postgres://coder:mysecretpassword@localhost:5432/projectsdb_test",
         "maxPoolSize": 50,

migrations/20180608_project_add_templateId_and_new_tables.sql

@@ -35,6 +35,7 @@ CREATE TABLE milestones (
     duration integer NOT NULL,
     "startDate" timestamp with time zone NOT NULL,
     "endDate" timestamp with time zone,
+    "actualStartDate" timestamp with time zone,
     "completionDate" timestamp with time zone,
     status character varying(45) NOT NULL,
     type character varying(45) NOT NULL,
@@ -108,6 +109,10 @@ CREATE TABLE product_milestone_templates (
     duration integer NOT NULL,
     type character varying(45) NOT NULL,
     "order" integer NOT NULL,
+    "plannedText" character varying(512) NOT NULL,
+    "activeText" character varying(512) NOT NULL,
+    "blockedText" character varying(512) NOT NULL,
+    "completedText" character varying(512) NOT NULL,
     "deletedAt" timestamp with time zone,
     "createdAt" timestamp with time zone,
     "updatedAt" timestamp with time zone,
@@ -313,9 +318,5 @@ ALTER TABLE ONLY milestones
 ALTER TABLE ONLY phase_products
     ADD CONSTRAINT "phase_products_phaseId_fkey" FOREIGN KEY ("phaseId") REFERENCES project_phases(id) ON UPDATE CASCADE ON DELETE SET NULL;
 
-
-ALTER TABLE ONLY product_milestone_templates
-    ADD CONSTRAINT "product_milestone_templates_productTemplateId_fkey" FOREIGN KEY ("productTemplateId") REFERENCES product_templates(id) ON UPDATE CASCADE ON DELETE CASCADE;
-
 ALTER TABLE ONLY project_phases
     ADD CONSTRAINT "project_phases_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES projects(id) ON UPDATE CASCADE ON DELETE SET NULL;

migrations/20180717_project_types_metadata.sql

@@ -0,0 +1,13 @@
+--
+-- UPDATE EXISTING TABLES:
+--   project_types
+--     metadata column: added
+--
+
+--
+-- project_types
+--
+
+ALTER TABLE project_types ADD COLUMN "metadata" json;
+UPDATE project_types set metadata='{}' where metadata is null;
+ALTER TABLE project_types ALTER COLUMN "metadata" SET NOT NULL;

migrations/20180727_product_categories.sql

@@ -0,0 +1,35 @@
+-- UPDATE EXISTING TABLES:
+--   product_templates
+--     category column: added
+-- CREATE NEW TABLE:
+--   product_categories
+
+--
+-- product_categories
+--
+CREATE TABLE product_categories (
+    key character varying(45) NOT NULL,
+    "displayName" character varying(255) NOT NULL,
+    "icon" character varying(255) NOT NULL,
+    "info" character varying(255) NOT NULL,
+    "question" character varying(255) NOT NULL,
+    "aliases" json NOT NULL,
+    "hidden" boolean DEFAULT false,
+    "disabled" boolean DEFAULT false,
+    "deletedAt" timestamp with time zone,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedBy" integer,
+    "createdBy" integer NOT NULL,
+    "updatedBy" integer NOT NULL
+);
+
+ALTER TABLE ONLY product_categories
+    ADD CONSTRAINT product_categories_pkey PRIMARY KEY (key);
+
+--
+-- product_templates
+--
+ALTER TABLE product_templates ADD COLUMN "category" character varying(45);
+UPDATE product_templates set category='generic' where category is null;
+ALTER TABLE product_templates ALTER COLUMN "category" SET NOT NULL;

migrations/20180801_deletedBy_soft_deleted.sql

@@ -0,0 +1,24 @@
+--
+-- UPDATE EXISTING TABLES:
+--   projects
+--     deletedBy column: added
+--   project_attachments
+--     deletedBy column: added
+--   project_members
+--     deletedBy column: added
+--
+
+--
+-- projects
+--
+ALTER TABLE projects ADD COLUMN "deletedBy" bigint;
+
+--
+-- project_attachments
+--
+ALTER TABLE project_attachments ADD COLUMN "deletedBy" bigint;
+
+--
+-- project_members
+--
+ALTER TABLE project_members ADD COLUMN "deletedBy" bigint;

migrations/elasticsearch_sync.js

@@ -16,6 +16,7 @@ import util from '../src/util';
 
 const ES_PROJECT_INDEX = config.get('elasticsearchConfig.indexName');
 const ES_PROJECT_TYPE = config.get('elasticsearchConfig.docType');
+const ES_TIMELINE_INDEX = config.get('elasticsearchConfig.timelineIndexName');
 
 // create new elasticsearch client
 // the client modifies the config object, so always passed the cloned object
@@ -323,10 +324,14 @@ esClient.indices.delete({
   ignore: [404],
 })
 .then(() => esClient.indices.create(getRequestBody(ES_PROJECT_INDEX)))
+// Re-create timeline index
+.then(() => esClient.indices.delete({ index: ES_TIMELINE_INDEX, ignore: [404] }))
+.then(() => esClient.indices.create({ index: ES_TIMELINE_INDEX }))
 .then(() => {
   console.log('elasticsearch indices synced successfully');
   process.exit();
-}).catch((err) => {
+})
+.catch((err) => {
   console.error('elasticsearch indices sync failed', err);
   process.exit();
 });

migrations/seedElasticsearchIndex.js

@@ -6,6 +6,7 @@ import config from 'config';
 import Promise from 'bluebird';
 import models from '../src/models';
 import RabbitMQService from '../src/services/rabbitmq';
+import { TIMELINE_REFERENCES } from '../src/constants';
 
 const logger = bunyan.createLogger({ name: 'init-es', level: config.get('logLevel') });
 
@@ -23,6 +24,19 @@ function getProjectIds() {
   return [];
 }
 
+/**
+ * Retrieve timeline ids from cli if provided
+ * @return {Array} list of timelineIds
+ */
+function getTimelineIds() {
+  let timelineIdArg = _.find(process.argv, a => a.indexOf('timelineIds') > -1);
+  if (timelineIdArg) {
+    timelineIdArg = timelineIdArg.split('=');
+    return timelineIdArg[1].split(',').map(i => parseInt(i, 10));
+  }
+  return [];
+}
+
 Promise.coroutine(function* wrapped() {
   try {
     const rabbit = new RabbitMQService(logger);
@@ -58,12 +72,48 @@ Promise.coroutine(function* wrapped() {
     logger.info(`Retrieved #${members.length} members`);
     members = _.groupBy(members, 'projectId');
 
+    // Get timelines
+    const timelineIds = getTimelineIds();
+    const timelineWhereClause = (timelineIds.length > 0) ? { id: { $in: timelineIds } } : {};
+    let timelines = yield models.Timeline.findAll({
+      where: timelineWhereClause,
+      include: [{ model: models.Milestone, as: 'milestones' }],
+    });
+    logger.info(`Retrieved #${projects.length} timelines`);
+
+    // Convert to raw json and remove unnecessary fields
+    timelines = _.map(timelines, (timeline) => {
+      const entity = _.omit(timeline.toJSON(), ['deletedBy', 'deletedAt']);
+      entity.milestones = _.map(entity.milestones, milestone => _.omit(milestone, ['deletedBy', 'deletedAt']));
+      return entity;
+    });
+
+    // Get projectId for each timeline
+    yield Promise.all(
+      _.map(timelines, (timeline) => {
+        if (timeline.reference === TIMELINE_REFERENCES.PROJECT) {
+          timeline.projectId = timeline.referenceId;
+          return Promise.resolve(timeline);
+        }
+
+        return models.ProjectPhase.findById(timeline.referenceId)
+          .then((phase) => {
+            timeline.projectId = phase.projectId;
+            return Promise.resolve(timeline);
+          });
+      }),
+    );
+
     const promises = [];
     _.forEach(projects, (p) => {
       p.members = members[p.id];
       logger.debug(`Processing Project #${p.id}`);
       promises.push(rabbit.publish('project.initial', p, {}));
     });
+    _.forEach(timelines, (t) => {
+      logger.debug(`Processing Timeline #${t.id}`);
+      promises.push(rabbit.publish('timeline.initial', t, {}));
+    });
     Promise.all(promises)
       .then(() => {
         logger.info(`Published ${promises.length} msgs`);