Skip to content

Commit 272542c

Browse files
authored
Merge pull request #60 from topcoder-platform/feature/busEvents
Feature/bus events
2 parents 754abce + e013822 commit 272542c

File tree

13 files changed

+750
-305
lines changed

13 files changed

+750
-305
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copy config/sample.local.js as config/local.js, update the properties and accord
2121
Once you start your PostgreSQL database through docker, it will create a projectsDB.
2222
*To create tables - note this will drop tables if they already exist*
2323
```
24-
NODE_ENV=development npm run sync
24+
NODE_ENV=development npm run sync:db
2525
```
2626

2727
#### Redis
@@ -34,7 +34,7 @@ Docker compose includes elasticsearch instance as well. It will open ports 9200
3434

3535
There is a helper script to sync the indices and mappings with the elasticsearch.
3636

37-
Run `npm run elasticsearch:sync` from the root of project to execute the script.
37+
Run `npm run sync:es` from the root of project to execute the script.
3838

3939
> NOTE: This will first clear all the indices and than recreate them. So use with caution.
4040

config/custom-environment-variables.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
},
3737
"analyticsKey": "ANALYTICS_KEY",
3838
"validIssuers": "VALID_ISSUERS",
39-
"jwksUri": "JWKS_URI"
39+
"jwksUri": "JWKS_URI",
40+
"busApiUrl": "BUS_API_URL",
41+
"busApiToken": "BUS_API_TOKEN"
4042
}

config/default.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
},
4444
"analyticsKey": "",
4545
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
46-
"jwksUri": ""
46+
"jwksUri": "",
47+
"busApiUrl": "http://api.topcoder-dev.com",
48+
"busApiToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoicHJvamVjdC1zZXJ2aWNlIiwiaWF0IjoxNTEyNzQ3MDgyLCJleHAiOjE1MjEzODcwODJ9.PHuNcFDaotGAL8RhQXQMdpL8yOKXxjB5DbBIodmt7RE"
4749
}

config/sample.local.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (process.env.NODE_ENV === 'test') {
2525
projectIdFieldId: '00N2C000000Vxxx',
2626
},
2727
dbConfig: {
28-
masterUrl: 'postgres://coder:mysecretpassword@dockerhost:5432/projectsdb',
28+
masterUrl: 'postgres://coder:mysecretpassword@dockerhost:54321/projectsdb',
2929
maxPoolSize: 50,
3030
minPoolSize: 4,
3131
idleTimeout: 1000,

package-lock.json

Lines changed: 71 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"migrate:es": "./node_modules/.bin/babel-node migrations/seedElasticsearchIndex.js",
1616
"prestart": "npm run -s build",
1717
"start": "node dist",
18-
"start:dev": "NODE_ENV=local PORT=8001 nodemon -w src --exec \"babel-node src --presets es2015\" | ./node_modules/.bin/bunyan",
18+
"start:dev": "NODE_ENV=development PORT=8001 nodemon -w src --exec \"babel-node src --presets es2015\" | ./node_modules/.bin/bunyan",
1919
"test": "NODE_ENV=test npm run lint && NODE_ENV=test npm run sync:es && NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- --compilers js:babel-core/register $(find src -path '*spec.js*')",
2020
"test:watch": "NODE_ENV=test ./node_modules/.bin/mocha -w --compilers js:babel-core/register $(find src -path '*spec.js*')",
2121
"seed": "babel-node src/tests/seed.js --presets es2015"
@@ -35,11 +35,13 @@
3535
"analytics-node": "^2.1.1",
3636
"app-module-path": "^1.0.7",
3737
"aws-sdk": "^2.33.0",
38+
"axios": "^0.17.1",
3839
"bluebird": "^3.4.1",
3940
"body-parser": "^1.15.0",
4041
"co": "^4.6.0",
4142
"config": "^1.20.1",
4243
"continuation-local-storage": "^3.1.7",
44+
"cors": "^2.8.4",
4345
"elasticsearch": "^11.0.1",
4446
"express": "^4.13.4",
4547
"express-list-routes": "^0.1.4",

0 commit comments

Comments
 (0)