Skip to content

Commit 06469ea

Browse files
committed
Merge branch 'dev' into feature/weekly-surveys
# Conflicts: # src/services/WorkPeriodService.js
2 parents 6a6d435 + e5d8118 commit 06469ea

17 files changed

+714
-208
lines changed

README.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,7 @@
4949
BUSAPI_URL=http://dockerhost:8002/v5
5050
```
5151

52-
1. In the `./local` folder create `taas-es-processor.env` file with the next environment variables.<br>
53-
54-
```bash
55-
# Auth0 config
56-
AUTH0_URL=
57-
AUTH0_AUDIENCE=
58-
AUTH0_CLIENT_ID=
59-
AUTH0_CLIENT_SECRET=
60-
# Locally deployed services (via docker-compose)
61-
KAFKA_URL=kafka:9093
62-
ES_HOST=http://elasticsearch:9200
63-
BUSAPI_URL=http://tc-bus-api:8002/v5
64-
```
65-
66-
- Values from these file would be automatically used by many `npm` commands.
52+
- Values from this file would be automatically used by many `npm` commands.
6753
- ⚠️ Never commit this file or its copy to the repository!
6854

6955
1. Set `dockerhost` to point the IP address of Docker. Docker IP address depends on your system. For example if docker is run on IP `127.0.0.1` add a the next line to your `/etc/hosts` file:
@@ -229,13 +215,14 @@ To be able to change and test `taas-es-processor` locally you can follow the nex
229215
| `npm run services:up` | Start services via docker-compose for local development. |
230216
| `npm run services:down` | Stop services via docker-compose for local development. |
231217
| `npm run services:logs -- -f <service_name>` | View logs of some service inside docker-compose. |
218+
| `npm run services:rebuild -- -f <service_name>` | Rebuild service container ignoring cache (useful when pushed something to the Git repository of service) |
232219
| `npm run local:init` | Recreate Database and Elasticsearch indexes and populate demo data for local development (removes any existent data). |
233220
| `npm run local:reset` | Recreate Database and Elasticsearch indexes (removes any existent data). |
234221
| `npm run cov` | Code Coverage Report. |
235222
| `npm run migrate` | Run any migration files which haven't run yet. |
236223
| `npm run migrate:undo` | Revert most recent migration. |
237-
| `npm run demo-payment-scheduler` | Create 1000 Work Periods Payment records in with status "scheduled" and various "amount" |
238-
| `npm run emsi-mapping` | mapping EMSI tags to topcoder skills |
224+
| `npm run demo-payment-scheduler` | Create 1000 Work Periods Payment records in with status "scheduled" and various "amount" |
225+
| `npm run emsi-mapping` | mapping EMSI tags to topcoder skills |
239226
240227
## Import and Export data
241228
@@ -351,6 +338,6 @@ When we add, update or delete models and/or endpoints we have to make sure that
351338
- Test, that when we migrate DB from the previous state using `npm run migrate`, we get exactly the same DB schema as if we create DB from scratch using command `npm run init-db force`.
352339
353340
## EMSI mapping
354-
mapping EMSI tags to topcoder skills
355-
Run `npm run emsi-mapping` to create the mapping file
341+
mapping EMSI tags to topcoder skills
342+
Run `npm run emsi-mapping` to create the mapping file
356343
It will take about 15 minutes to create the mapping file `script/emsi-mapping/emsi-skils-mapping.js`

0 commit comments

Comments
 (0)