Skip to content

Commit 4f0cb9e

Browse files
eisbilireisbilir
committed
resolve conflicts
2 parents 9732e1e + 9dd817c commit 4f0cb9e

32 files changed

+5731
-277
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
tc-taas-es-processor | [2021-04-09T21:20:19.035Z] app INFO : Starting kafka consumer
8888
tc-taas-es-processor | 2021-04-09T21:20:21.292Z INFO no-kafka-client Joined group taas-es-processor generationId 1 as no-kafka-client-076538fc-60dd-4ca4-a2b9-520bdf73bc9e
8989
tc-taas-es-processor | 2021-04-09T21:20:21.293Z INFO no-kafka-client Elected as group leader
90+
tc-taas-es-processor | 2021-04-09T21:20:21.449Z DEBUG no-kafka-client Subscribed to taas.role.update:0 offset 0 leader kafka:9093
91+
tc-taas-es-processor | 2021-04-09T21:20:21.450Z DEBUG no-kafka-client Subscribed to taas.role.delete:0 offset 0 leader kafka:9093
92+
tc-taas-es-processor | 2021-04-09T21:20:21.451Z DEBUG no-kafka-client Subscribed to taas.role.requested:0 offset 0 leader kafka:9093
9093
tc-taas-es-processor | 2021-04-09T21:20:21.452Z DEBUG no-kafka-client Subscribed to taas.jobcandidate.create:0 offset 0 leader kafka:9093
9194
tc-taas-es-processor | 2021-04-09T21:20:21.455Z DEBUG no-kafka-client Subscribed to taas.job.create:0 offset 0 leader kafka:9093
9295
tc-taas-es-processor | 2021-04-09T21:20:21.456Z DEBUG no-kafka-client Subscribed to taas.resourcebooking.delete:0 offset 0 leader kafka:9093
@@ -103,7 +106,7 @@
103106
tc-taas-es-processor | 2021-04-09T21:20:21.473Z DEBUG no-kafka-client Subscribed to taas.job.update:0 offset 0 leader kafka:9093
104107
tc-taas-es-processor | 2021-04-09T21:20:21.474Z DEBUG no-kafka-client Subscribed to taas.resourcebooking.update:0 offset 0 leader kafka:9093
105108
tc-taas-es-processor | [2021-04-09T21:20:21.475Z] app INFO : Initialized.......
106-
tc-taas-es-processor | [2021-04-09T21:20:21.479Z] app INFO : taas.job.create,taas.job.update,taas.job.delete,taas.jobcandidate.create,taas.jobcandidate.update,taas.jobcandidate.delete,taas.resourcebooking.create,taas.resourcebooking.update,taas.resourcebooking.delete,taas.workperiod.create,taas.workperiod.update,taas.workperiod.delete,taas.workperiodpayment.create,taas.workperiodpayment.update,taas.workperiodpayment.delete
109+
tc-taas-es-processor | [2021-04-09T21:20:21.479Z] app INFO : taas.job.create,taas.job.update,taas.job.delete,taas.jobcandidate.create,taas.jobcandidate.update,taas.jobcandidate.delete,taas.resourcebooking.create,taas.resourcebooking.update,taas.resourcebooking.delete,taas.workperiod.create,taas.workperiod.update,taas.workperiod.delete,taas.workperiodpayment.create,taas.workperiodpayment.update,taas.interview.requested,taas.interview.update,taas.interview.bulkUpdate,taas.role.requested,taas.role.update,taas.role.delete
107110
tc-taas-es-processor | [2021-04-09T21:20:21.480Z] app INFO : Kick Start.......
108111
tc-taas-es-processor | ********** Topcoder Health Check DropIn listening on port 3001
109112
tc-taas-es-processor | Topcoder Health Check DropIn started and ready to roll
@@ -194,6 +197,7 @@ To be able to change and test `taas-es-processor` locally you can follow the nex
194197
| `npm run index:jobs <jobId>` | Indexes job data from db into ES, if jobId is not given all data is indexed. Use `-- --force` flag to skip confirmation |
195198
| `npm run index:job-candidates <jobCandidateId>` | Indexes job candidate data from db into ES, if jobCandidateId is not given all data is indexed. Use `-- --force` flag to skip confirmation |
196199
| `npm run index:resource-bookings <resourceBookingsId>` | Indexes resource bookings data from db into ES, if resourceBookingsId is not given all data is indexed. Use `-- --force` flag to skip confirmation |
200+
| `npm run index:roles <roleId>` | Indexes roles data from db into ES, if roleId is not given all data is indexed. Use `-- --force` flag to skip confirmation |
197201
| `npm run services:up` | Start services via docker-compose for local development. |
198202
| `npm run services:down` | Stop services via docker-compose for local development. |
199203
| `npm run services:logs -- -f <service_name>` | View logs of some service inside docker-compose. |

‎app-constants.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ const Scopes = {
4949
READ_INTERVIEW: 'read:taas-interviews',
5050
CREATE_INTERVIEW: 'create:taas-interviews',
5151
UPDATE_INTERVIEW: 'update:taas-interviews',
52-
ALL_INTERVIEW: 'all:taas-interviews'
52+
ALL_INTERVIEW: 'all:taas-interviews',
53+
// role
54+
READ_ROLE: 'read:taas-roles',
55+
CREATE_ROLE: 'create:taas-roles',
56+
UPDATE_ROLE: 'update:taas-roles',
57+
DELETE_ROLE: 'delete:taas-roles',
58+
ALL_ROLE: 'all:taas-roles'
5359
}
5460

5561
// Interview related constants

‎config/default.js

Lines changed: 9 additions & 0 deletions
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 role index
80+
ES_INDEX_ROLE: process.env.ES_INDEX_ROLE || 'role',
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,
@@ -131,6 +133,13 @@ module.exports = {
131133
TAAS_INTERVIEW_UPDATE_TOPIC: process.env.TAAS_INTERVIEW_UPDATE_TOPIC || 'taas.interview.update',
132134
// the interview bulk update Kafka message topic
133135
TAAS_INTERVIEW_BULK_UPDATE_TOPIC: process.env.TAAS_INTERVIEW_BULK_UPDATE_TOPIC || 'taas.interview.bulkUpdate',
136+
// topics for role service
137+
// the create role entity Kafka message topic
138+
TAAS_ROLE_CREATE_TOPIC: process.env.TAAS_ROLE_CREATE_TOPIC || 'taas.role.requested',
139+
// the update role entity Kafka message topic
140+
TAAS_ROLE_UPDATE_TOPIC: process.env.TAAS_ROLE_UPDATE_TOPIC || 'taas.role.update',
141+
// the delete role entity Kafka message topic
142+
TAAS_ROLE_DELETE_TOPIC: process.env.TAAS_ROLE_DELETE_TOPIC || 'taas.role.delete',
134143

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

‎data/demo-data.json

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
],
2121
"status": "in-review",
2222
"isApplicationPageActive": false,
23+
"roleIds": null,
2324
"createdBy": "57646ff9-1cd3-4d3c-88ba-eb09a395366c",
2425
"updatedBy": "00000000-0000-0000-0000-000000000000",
2526
"createdAt": "2021-05-09T21:21:10.394Z",
@@ -45,6 +46,7 @@
4546
],
4647
"status": "in-review",
4748
"isApplicationPageActive": false,
49+
"roleIds": null,
4850
"createdBy": "57646ff9-1cd3-4d3c-88ba-eb09a395366c",
4951
"updatedBy": "00000000-0000-0000-0000-000000000000",
5052
"createdAt": "2021-05-09T21:11:26.934Z",
@@ -70,6 +72,7 @@
7072
],
7173
"status": "in-review",
7274
"isApplicationPageActive": false,
75+
"roleIds": null,
7376
"createdBy": "57646ff9-1cd3-4d3c-88ba-eb09a395366c",
7477
"updatedBy": "00000000-0000-0000-0000-000000000000",
7578
"createdAt": "2021-05-09T21:23:18.595Z",
@@ -95,6 +98,7 @@
9598
],
9699
"status": "in-review",
97100
"isApplicationPageActive": false,
101+
"roleIds": null,
98102
"createdBy": "00000000-0000-0000-0000-000000000000",
99103
"updatedBy": "00000000-0000-0000-0000-000000000000",
100104
"createdAt": "2021-05-09T21:12:09.293Z",
@@ -7197,5 +7201,127 @@
71977201
"updatedAt": "2021-05-30T11:48:16.870Z",
71987202
"workPeriods": []
71997203
}
7204+
],
7205+
"Role": [
7206+
{
7207+
"id": "c145247d-5757-463d-9317-ff9e7026d403",
7208+
"name": "Angular Developer",
7209+
"description": "Angular is an open-source, client-side framework based on TypeScript and designed for building web applications.",
7210+
"listOfSkills": [
7211+
"database",
7212+
"winforms",
7213+
"user interface (ui)",
7214+
"photoshop"
7215+
],
7216+
"rates": [
7217+
{
7218+
"global": 50,
7219+
"offShore": 10,
7220+
"inCountry": 20
7221+
},
7222+
{
7223+
"global": 25,
7224+
"offShore": 5,
7225+
"inCountry": 15
7226+
}
7227+
],
7228+
"numberOfMembers": "10",
7229+
"numberOfMembersAvailable": 8,
7230+
"imageUrl": "http://images.topcoder.com/member",
7231+
"timeToCandidate": 105,
7232+
"timeToInterview": 100,
7233+
"createdBy": "57646ff9-1cd3-4d3c-88ba-eb09a395366c",
7234+
"updatedBy": null,
7235+
"createdAt": "2021-05-27T21:43:08.201Z",
7236+
"updatedAt": "2021-05-27T21:43:08.201Z"
7237+
},
7238+
{
7239+
"id": "d7ff0289-d3ea-44d8-b39a-53bba5b5b309",
7240+
"name": "Dev Ops Engineer",
7241+
"description": "A DevOps engineer introduces processes, tools, and methodologies to balance needs throughout the software development life cycle, from coding and deployment, to maintenance and updates.",
7242+
"listOfSkills": [
7243+
"dropwizard",
7244+
"nginx",
7245+
"machine learning",
7246+
"force.com"
7247+
],
7248+
"rates": [
7249+
{
7250+
"global": 50,
7251+
"offShore": 10,
7252+
"inCountry": 20,
7253+
"rate20Global": 20,
7254+
"rate30Global": 20,
7255+
"rate20OffShore": 35,
7256+
"rate30OffShore": 35,
7257+
"rate20InCountry": 15,
7258+
"rate30InCountry": 15
7259+
},
7260+
{
7261+
"global": 25,
7262+
"offShore": 5,
7263+
"inCountry": 15,
7264+
"rate20Global": 20,
7265+
"rate30Global": 20,
7266+
"rate20OffShore": 35,
7267+
"rate30OffShore": 35,
7268+
"rate20InCountry": 15,
7269+
"rate30InCountry": 15
7270+
}
7271+
],
7272+
"numberOfMembers": "10",
7273+
"numberOfMembersAvailable": 8,
7274+
"imageUrl": "http://images.topcoder.com/member",
7275+
"timeToCandidate": 105,
7276+
"timeToInterview": 100,
7277+
"createdBy": "57646ff9-1cd3-4d3c-88ba-eb09a395366c",
7278+
"updatedBy": null,
7279+
"createdAt": "2021-05-27T21:43:04.717Z",
7280+
"updatedAt": "2021-05-27T21:43:04.717Z"
7281+
},
7282+
{
7283+
"id": "e7b7e818-40d4-4102-b486-09bdd21400b8",
7284+
"name": "Salesforce Developer",
7285+
"description": "A Salesforce developer is a programmer who builds Salesforce applications across various PaaS (Platform as a Service) platforms.",
7286+
"listOfSkills": [
7287+
"docker",
7288+
".net",
7289+
"appcelerator",
7290+
"flux"
7291+
],
7292+
"rates": [
7293+
{
7294+
"global": 50,
7295+
"offShore": 10,
7296+
"inCountry": 20,
7297+
"rate20Global": 20,
7298+
"rate30Global": 20,
7299+
"rate20OffShore": 35,
7300+
"rate30OffShore": 35,
7301+
"rate20InCountry": 15,
7302+
"rate30InCountry": 15
7303+
},
7304+
{
7305+
"global": 25,
7306+
"offShore": 5,
7307+
"inCountry": 15,
7308+
"rate20Global": 20,
7309+
"rate30Global": 20,
7310+
"rate20OffShore": 35,
7311+
"rate30OffShore": 35,
7312+
"rate20InCountry": 15,
7313+
"rate30InCountry": 15
7314+
}
7315+
],
7316+
"numberOfMembers": "10",
7317+
"numberOfMembersAvailable": 6,
7318+
"imageUrl": "http://images.topcoder.com/member",
7319+
"timeToCandidate": 105,
7320+
"timeToInterview": 100,
7321+
"createdBy": "00000000-0000-0000-0000-000000000000",
7322+
"updatedBy": null,
7323+
"createdAt": "2021-05-27T21:43:09.342Z",
7324+
"updatedAt": "2021-05-27T21:43:09.342Z"
7325+
}
72007326
]
72017327
}

0 commit comments

Comments
 (0)