Skip to content

Commit 57ddfa4

Browse files
committed
Merge branch 'dev' into hotfix/patch-1.5.3.1-dev
# Conflicts: # docs/swagger.yaml
2 parents 7769867 + 3f1d9b0 commit 57ddfa4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+9829
-2687
lines changed

README.md

+110-35
Large diffs are not rendered by default.

app-constants.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ const Scopes = {
3333
DELETE_RESOURCE_BOOKING: 'delete:taas-resourceBookings',
3434
ALL_RESOURCE_BOOKING: 'all:taas-resourceBookings',
3535
// taas-team
36-
READ_TAAS_TEAM: 'read:taas-teams'
36+
READ_TAAS_TEAM: 'read:taas-teams',
37+
// work period
38+
READ_WORK_PERIOD: 'read:taas-workPeriods',
39+
CREATE_WORK_PERIOD: 'create:taas-workPeriods',
40+
UPDATE_WORK_PERIOD: 'update:taas-workPeriods',
41+
DELETE_WORK_PERIOD: 'delete:taas-workPeriods',
42+
ALL_WORK_PERIOD: 'all:taas-workPeriods'
3743
}
3844

3945
module.exports = {

config/default.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ module.exports = {
7676
ES_INDEX_JOB_CANDIDATE: process.env.ES_INDEX_JOB_CANDIDATE || 'job_candidate',
7777
// the resource booking index
7878
ES_INDEX_RESOURCE_BOOKING: process.env.ES_INDEX_RESOURCE_BOOKING || 'resource_booking',
79+
// the work period index
80+
ES_INDEX_WORK_PERIOD: process.env.ES_INDEX_WORK_PERIOD || 'work_period',
7981

8082
// the max bulk size in MB for ES indexing
8183
MAX_BULK_REQUEST_SIZE_MB: process.env.MAX_BULK_REQUEST_SIZE_MB || 20,
@@ -103,13 +105,20 @@ module.exports = {
103105
TAAS_JOB_CANDIDATE_UPDATE_TOPIC: process.env.TAAS_JOB_CANDIDATE_UPDATE_TOPIC || 'taas.jobcandidate.update',
104106
// the delete job candidate entity Kafka message topic
105107
TAAS_JOB_CANDIDATE_DELETE_TOPIC: process.env.TAAS_JOB_CANDIDATE_DELETE_TOPIC || 'taas.jobcandidate.delete',
106-
// topics for job service
108+
// topics for resource booking service
107109
// the create resource booking entity Kafka message topic
108110
TAAS_RESOURCE_BOOKING_CREATE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_CREATE_TOPIC || 'taas.resourcebooking.create',
109111
// the update resource booking entity Kafka message topic
110112
TAAS_RESOURCE_BOOKING_UPDATE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_UPDATE_TOPIC || 'taas.resourcebooking.update',
111113
// the delete resource booking entity Kafka message topic
112114
TAAS_RESOURCE_BOOKING_DELETE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_DELETE_TOPIC || 'taas.resourcebooking.delete',
115+
// topics for work period service
116+
// the create rwork period entity Kafka message topic
117+
TAAS_WORK_PERIOD_CREATE_TOPIC: process.env.TAAS_WORK_PERIOD_CREATE_TOPIC || 'taas.workperiod.create',
118+
// the update work period entity Kafka message topic
119+
TAAS_WORK_PERIOD_UPDATE_TOPIC: process.env.TAAS_WORK_PERIOD_UPDATE_TOPIC || 'taas.workperiod.update',
120+
// the delete work period entity Kafka message topic
121+
TAAS_WORK_PERIOD_DELETE_TOPIC: process.env.TAAS_WORK_PERIOD_DELETE_TOPIC || 'taas.workperiod.delete',
113122

114123
// the Kafka message topic for sending email
115124
EMAIL_TOPIC: process.env.EMAIL_TOPIC || 'external.action.email',

data/demo-data.json

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)