Skip to content

Feature/bus events #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 21, 2017
Merged

Feature/bus events #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a6fed0d
New events integration
gondzo Dec 15, 2017
fa160bd
Deploy to dev for testing
gondzo Dec 15, 2017
ca84967
Remove cors in dev environment
gondzo Dec 15, 2017
120f593
add debugging info
gondzo Dec 17, 2017
fa9eeea
lint fixes
gondzo Dec 17, 2017
d606edb
lint
gondzo Dec 17, 2017
19411a5
lint
gondzo Dec 18, 2017
58ade2c
add debug info
gondzo Dec 18, 2017
a57a26c
Add userId to all events
gondzo Dec 20, 2017
ee9acd6
fix lint
gondzo Dec 20, 2017
e013822
Remove feature branch from deployment
gondzo Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Copy config/sample.local.js as config/local.js, update the properties and accord
Once you start your PostgreSQL database through docker, it will create a projectsDB.
*To create tables - note this will drop tables if they already exist*
```
NODE_ENV=development npm run sync
NODE_ENV=development npm run sync:db
```

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

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

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

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

Expand Down
4 changes: 3 additions & 1 deletion config/custom-environment-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@
},
"analyticsKey": "ANALYTICS_KEY",
"validIssuers": "VALID_ISSUERS",
"jwksUri": "JWKS_URI"
"jwksUri": "JWKS_URI",
"busApiUrl": "BUS_API_URL",
"busApiToken": "BUS_API_TOKEN"
}
4 changes: 3 additions & 1 deletion config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,7 @@
},
"analyticsKey": "",
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
"jwksUri": ""
"jwksUri": "",
"busApiUrl": "http://api.topcoder-dev.com",
"busApiToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoicHJvamVjdC1zZXJ2aWNlIiwiaWF0IjoxNTEyNzQ3MDgyLCJleHAiOjE1MjEzODcwODJ9.PHuNcFDaotGAL8RhQXQMdpL8yOKXxjB5DbBIodmt7RE"
}
2 changes: 1 addition & 1 deletion config/sample.local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (process.env.NODE_ENV === 'test') {
projectIdFieldId: '00N2C000000Vxxx',
},
dbConfig: {
masterUrl: 'postgres://coder:mysecretpassword@dockerhost:5432/projectsdb',
masterUrl: 'postgres://coder:mysecretpassword@dockerhost:54321/projectsdb',
maxPoolSize: 50,
minPoolSize: 4,
idleTimeout: 1000,
Expand Down
106 changes: 71 additions & 35 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"migrate:es": "./node_modules/.bin/babel-node migrations/seedElasticsearchIndex.js",
"prestart": "npm run -s build",
"start": "node dist",
"start:dev": "NODE_ENV=local PORT=8001 nodemon -w src --exec \"babel-node src --presets es2015\" | ./node_modules/.bin/bunyan",
"start:dev": "NODE_ENV=development PORT=8001 nodemon -w src --exec \"babel-node src --presets es2015\" | ./node_modules/.bin/bunyan",
"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*')",
"test:watch": "NODE_ENV=test ./node_modules/.bin/mocha -w --compilers js:babel-core/register $(find src -path '*spec.js*')",
"seed": "babel-node src/tests/seed.js --presets es2015"
Expand All @@ -35,11 +35,13 @@
"analytics-node": "^2.1.1",
"app-module-path": "^1.0.7",
"aws-sdk": "^2.33.0",
"axios": "^0.17.1",
"bluebird": "^3.4.1",
"body-parser": "^1.15.0",
"co": "^4.6.0",
"config": "^1.20.1",
"continuation-local-storage": "^3.1.7",
"cors": "^2.8.4",
"elasticsearch": "^11.0.1",
"express": "^4.13.4",
"express-list-routes": "^0.1.4",
Expand Down
Loading