Merge pull request #1 from topcoder-platform/dev

latest

Author: PrakashDurlabhji

.circleci/config.yml

@@ -48,6 +48,7 @@ jobs:
         - POSTGRES_USER: circle_test
         - POSTGRES_DB: circle_test
       - image: elasticsearch:2.3
+      - image: rabbitmq:3-management
     environment:
       DB_MASTER_URL: postgres://circle_test:@127.0.0.1:5432/circle_test
       AUTH_SECRET: secret
@@ -96,7 +97,7 @@ workflows:
             - test
           filters:
             branches:
-              only: ['dev', 'dev-sts']
+              only: ['dev', 'dev-sts', 'feature/looker-api-integration']
       - deployProd:
           context : org-global
           requires:

.eslintrc

@@ -8,7 +8,7 @@
     "mocha": true
   },
   "rules": {
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "**/serviceMocks.js"]}],
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "src/tests/*.js"]}],
     "max-len": ["error", { "ignoreComments": true, "code": 120 }],
     "valid-jsdoc": ["error", {
       "requireReturn": true,

.nvmrc

@@ -1 +1 @@
-v6.9.4
+v8.2.1

README.md

@@ -9,7 +9,7 @@ Microservice to manage CRUD operations for all things Projects.
 ### Requirements
 
 * [docker-compose](https://docs.docker.com/compose/install/) - We use docker-compose for running dependencies locally.
-* Nodejs 8.9.4 - consider using [nvm](https://github.com/creationix/nvm) or equivalent to manage your node version
+* Nodejs 8.2.1 - consider using [nvm](https://github.com/creationix/nvm) or equivalent to manage your node version
 * Install [libpg](https://www.npmjs.com/package/pg-native)
 
 ### Steps to run locally

config/custom-environment-variables.json

@@ -22,8 +22,6 @@
   "fileServiceEndpoint": "FILE_SERVICE_ENDPOINT",
   "identityServiceEndpoint": "IDENTITY_SERVICE_ENDPOINT",
   "memberServiceEndpoint": "MEMBER_SERVICE_ENDPOINT",
-  "systemUserClientId": "SYSTEM_USER_CLIENT_ID",
-  "systemUserClientSecret": "SYSTEM_USER_CLIENT_SECRET",
   "connectProjectsUrl": "CONNECT_PROJECTS_URL",
   "dbConfig": {
     "masterUrl": "DB_MASTER_URL",
@@ -51,5 +49,18 @@
   "connectUrl": "CONNECT_URL",
   "accountsAppUrl": "ACCOUNTS_APP_URL",
   "inviteEmailSubject": "INVITE_EMAIL_SUBJECT",
-  "inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE"
+  "inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE",
+  "SSO_REFCODES": "SSO_REFCODES",
+  "lookerConfig": {
+    "BASE_URL": "LOOKER_API_BASE_URL",
+    "CLIENT_ID": "LOOKER_API_CLIENT_ID",
+    "CLIENT_SECRET": "LOOKER_API_CLIENT_SECRET",
+    "TOKEN": "TOKEN",
+    "USE_MOCK": "LOOKER_API_ENABLE_MOCK",
+    "QUERIES": {
+      "REG_STATS": "LOOKER_API_REG_STATS_QUERY_ID",
+      "BUDGET": "LOOKER_API_BUDGET_QUERY_ID"
+    }
+  },
+  "DEFAULT_M2M_USERID": "DEFAULT_M2M_USERID"
 }

config/default.json

@@ -25,8 +25,6 @@
     "timelineIndexName": "timelines",
     "timelineDocType": "timelineV4"
   },
-  "systemUserClientId": "",
-  "systemUserClientSecret": "",
   "connectProjectUrl":"",
   "dbConfig": {
     "masterUrl": "",
@@ -60,5 +58,19 @@
   "connectUrl":"https://connect.topcoder-dev.com",
   "accountsAppUrl": "https://accounts.topcoder-dev.com",
   "MAX_REVISION_NUMBER": 100,
-  "UNIQUE_GMAIL_VALIDATION": true
+  "UNIQUE_GMAIL_VALIDATION": false,
+  "SSO_REFCODES": "[]",
+  "VALID_STATUSES_BEFORE_PAUSED": "[\"active\"]",
+  "lookerConfig": {
+    "BASE_URL": "",
+    "CLIENT_ID": "",
+    "CLIENT_SECRET": "",
+    "TOKEN": "TOKEN",
+    "USE_MOCK": "true",
+    "QUERIES": {
+      "REG_STATS": 1234,
+      "BUDGET": 123
+    }
+  },
+  "DEFAULT_M2M_USERID": -101
 }

local/seed/seedMetadata.js

@@ -37,7 +37,45 @@ module.exports = (targetUrl, token) => {
       'Authorization': 'Bearer ' + token
     }
 
-    let promises = _(data.result.content.projectTypes).map(pt=>{
+    let promises
+
+    promises = _(data.result.content.forms).orderBy(['key', 'asc'], ['version', 'asc']).map(pt=>{
+      const param = _.omit(pt, ['id', 'version', 'revision', 'key']);
+      return axios
+        .post(destUrl + `metadata/form/${pt.key}/versions`,{param}, {headers:headers})
+        .catch((err) => {
+          const errMessage = _.get(err, 'response.data.result.content.message', '');
+          console.log(`Failed to create form with key=${pt.key} version=${pt.version}.`, errMessage)
+        })
+    });
+
+    await Promise.all(promises);
+
+    promises = _(data.result.content.planConfigs).orderBy(['key', 'asc'], ['version', 'asc']).map(pt=>{
+      const param = _.omit(pt, ['id', 'version', 'revision', 'key']);
+      return axios
+        .post(destUrl + `metadata/planConfig/${pt.key}/versions`,{param}, {headers:headers})
+        .catch((err) => {
+          const errMessage = _.get(err, 'response.data.result.content.message', '');
+          console.log(`Failed to create planConfig with key=${pt.key} version=${pt.version}.`, errMessage)
+        })
+    });
+
+    await Promise.all(promises);
+
+    promises = _(data.result.content.priceConfigs).orderBy(['key', 'asc'], ['version', 'asc']).map(pt=>{
+      const param = _.omit(pt, ['id', 'version', 'revision', 'key']);
+      return axios
+        .post(destUrl + `metadata/priceConfig/${pt.key}/versions`,{param}, {headers:headers})
+        .catch((err) => {
+          const errMessage = _.get(err, 'response.data.result.content.message', '');
+          console.log(`Failed to create priceConfig with key=${pt.key} version=${pt.version}.`, errMessage)
+        })
+    });
+
+    await Promise.all(promises);
+
+    promises = _(data.result.content.projectTypes).map(pt=>{
       return axios
         .post(destUrl+'metadata/projectTypes',{param:pt}, {headers:headers})
         .catch((err) => {

local/seed/seedProjects.js

@@ -1,4 +1,5 @@
 import util from '../../src/tests/util';
+import models from '../../src/models';
 
 const axios = require('axios');
 const Promise = require('bluebird');
@@ -54,6 +55,21 @@ module.exports = (targetUrl, token) => {
           });
         }
 
+        await models.ProjectEstimation.create({
+          projectId,
+          buildingBlockKey: 'BLOCK_KEY',
+          conditions: '( HAS_DEV_DELIVERABLE && ONLY_ONE_OS_MOBILE && CA_NEEDED )',
+          price: 6500.50,
+          quantity: 10,
+          minTime: 35,
+          maxTime: 35,
+          metadata: {
+            deliverable: 'dev-qa',
+          },
+          createdBy: 1,
+          updatedBy: 1,
+        });
+
         // creating invitations
         if (Array.isArray(invites)) {
           let promises = []
@@ -134,4 +150,3 @@ function updateProjectMemberInvite(projectId, params, targetUrl, headers) {
       console.log(`Failed to update project member invites ${projectId}: ${err.message}`);
     })
 }
-

migrations/20190502_status_history_create.sql

@@ -0,0 +1,29 @@
+--
+-- Create table status history
+--
+
+CREATE TABLE status_history (
+    id bigint,
+    "reference" character varying(45) NOT NULL,
+    "referenceId" bigint NOT NULL,
+    "status" character varying(45) NOT NULL,
+    "comment" text,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "createdBy" integer NOT NULL,
+    "updatedBy" integer NOT NULL
+);
+
+CREATE SEQUENCE status_history_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE status_history_id_seq OWNED BY status_history.id;
+
+ALTER TABLE ONLY status_history ALTER COLUMN id SET DEFAULT nextval('status_history_id_seq'::regclass);
+
+ALTER TABLE ONLY status_history
+    ADD CONSTRAINT status_history_pkey PRIMARY KEY (id);

migrations/20190526_project_estimation.sql

@@ -0,0 +1,35 @@
+--
+-- CREATE NEW TABLE:
+--   project_estimations
+--
+
+CREATE TABLE project_estimations
+(
+    id bigint NOT NULL,
+    "buildingBlockKey" character varying(255) NOT NULL,
+    conditions character varying(512) NOT NULL,
+    price double precision NOT NULL,
+    "minTime" integer NOT NULL,
+    "maxTime" integer NOT NULL,
+    metadata json NOT NULL DEFAULT '{}'::json,
+    "projectId" bigint NOT NULL,
+    "deletedAt" timestamp with time zone,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedBy" bigint,
+    "createdBy" integer NOT NULL,
+    "updatedBy" integer NOT NULL,
+    CONSTRAINT project_estimations_pkey PRIMARY KEY (id)
+);
+
+CREATE SEQUENCE project_estimations_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE project_estimations_id_seq OWNED BY project_estimations.id;
+
+ALTER TABLE project_estimations
+    ALTER COLUMN id SET DEFAULT nextval('project_estimations_id_seq');

migrations/20190604_project_estimation_add_quantity.sql

@@ -0,0 +1,10 @@
+--
+-- UPDATE EXISTING TABLES:
+--   project_estimations:
+--     added column `quantity`
+
+--
+-- product_templates
+
+-- Add new column
+ALTER TABLE project_estimations ADD COLUMN "quantity" int DEFAULT 1;

migrations/20190611_extract_scope_from_project_templates_2.sql

@@ -0,0 +1,12 @@
+--
+-- FIX for 20190316_extract_scope_from_project_templates.sql
+-- apply created auto-increments sequences to `id` columns
+
+ALTER TABLE form
+    ALTER COLUMN id SET DEFAULT nextval('form_id_seq');
+
+ALTER TABLE price_config
+    ALTER COLUMN id SET DEFAULT nextval('price_config_id_seq');
+
+ALTER TABLE plan_config
+    ALTER COLUMN id SET DEFAULT nextval('plan_config_id_seq');

migrations/20190620_migrate_product_templates.sql

@@ -0,0 +1,11 @@
+--
+-- UPDATE EXISTING TABLES:
+--   template:
+--     remove `sections` if exists and change `questions` to `sections`
+
+--
+-- product_templates
+
+UPDATE product_templates
+SET template = (template::jsonb #- '{questions}' #- '{sections}') || jsonb_build_object('sections', template::jsonb ->'questions')
+WHERE template::jsonb ? 'questions';

migrations/20190624_workStream.sql

@@ -0,0 +1,82 @@
+--
+-- CREATE NEW TABLE:
+--   work_streams
+--
+CREATE TABLE work_streams (
+    id bigint NOT NULL,
+    "name" character varying(255) NOT NULL,
+    "type" character varying(45) NOT NULL,
+    "status" character varying(255) NOT NULL,
+    "projectId" bigint NOT NULL,
+    "deletedAt" timestamp with time zone,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedBy" bigint,
+    "createdBy" bigint NOT NULL,
+    "updatedBy" bigint NOT NULL
+);
+
+CREATE SEQUENCE work_streams_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE work_streams_id_seq OWNED BY work_streams.id;
+
+ALTER TABLE work_streams
+    ALTER COLUMN id SET DEFAULT nextval('work_streams_id_seq');
+
+ALTER TABLE ONLY work_streams
+    ADD CONSTRAINT "work_streams_pkey" PRIMARY KEY (id);
+
+ALTER TABLE ONLY work_streams
+    ADD CONSTRAINT "work_streams_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES projects(id) ON UPDATE CASCADE ON DELETE SET NULL;
+
+--
+-- CREATE NEW TABLE:
+--   work_management_permissions
+--
+CREATE TABLE work_management_permissions (
+    id bigint NOT NULL,
+    "policy" character varying(255) NOT NULL,
+    "permission" json NOT NULL,
+    "projectTemplateId" bigint NOT NULL,
+    "deletedAt" timestamp with time zone,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedBy" bigint,
+    "createdBy" bigint NOT NULL,
+    "updatedBy" bigint NOT NULL
+);
+
+CREATE SEQUENCE work_management_permissions_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE work_management_permissions_id_seq OWNED BY work_management_permissions.id;
+
+ALTER TABLE work_management_permissions
+    ALTER COLUMN id SET DEFAULT nextval('work_management_permissions_id_seq');
+
+--
+-- CREATE NEW TABLE:
+--   phase_work_streams
+--
+CREATE TABLE phase_work_streams (
+    "workStreamId" bigint NOT NULL,
+    "phaseId" bigint NOT NULL
+);
+
+ALTER TABLE ONLY phase_work_streams
+    ADD CONSTRAINT "phase_work_streams_pkey" PRIMARY KEY ("workStreamId", "phaseId");
+
+ALTER TABLE ONLY phase_work_streams
+    ADD CONSTRAINT "phase_work_streams_phaseId_fkey" FOREIGN KEY ("phaseId") REFERENCES project_phases(id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+ALTER TABLE ONLY phase_work_streams
+    ADD CONSTRAINT "phase_work_streams_workStreamId_fkey" FOREIGN KEY ("workStreamId") REFERENCES work_streams(id) ON UPDATE CASCADE ON DELETE CASCADE;