Skip to content

[PROD] Next Release #407

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.

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 48 commits into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4f96a8f
fix: taas-app issue #364
yoution Jul 15, 2021
1a6ebff
Merge pull request #396 from yoution/issue-364
nikolay83 Jul 15, 2021
fee829a
Merge pull request #397 from topcoder-platform/roles-milestone18
nikolay83 Jul 15, 2021
a7a9dea
fix: Make job description length up to 100K characters
mbaghel Jul 15, 2021
697d332
feat: Add ref code to createTeam and pass to createProject. Resolves:…
mbaghel Jul 15, 2021
f9c0466
Add refCode to swagger.yaml
mbaghel Jul 15, 2021
a252544
search candidates API
Jul 15, 2021
9ffb35c
Merge branch 'dev' into taas-api-multi-status
Jul 15, 2021
e53b46d
Merge pull request #398 from mbaghel/roles-milestone18
nikolay83 Jul 15, 2021
ae2b990
Merge pull request #401 from topcoder-platform/roles-milestone18
nikolay83 Jul 15, 2021
42261e9
update swagger
Jul 16, 2021
77b415e
Merge pull request #400 from topcoder-platform/taas-api-multi-status
LieutenantRoger Jul 17, 2021
d603038
rb jobIds added
Jul 17, 2021
10dd266
Merge pull request #403 from topcoder-platform/feature/rb-jobIds
LieutenantRoger Jul 17, 2021
7a012ce
fix: issue-370 add nichrate for update api
yoution Jul 19, 2021
c8d5c50
fix:fields param in RB
Jul 19, 2021
836f366
Merge branch 'dev' into feature/rb-jobIds
Jul 19, 2021
e5d7945
Merge pull request #408 from topcoder-platform/feature/rb-jobIds
maxceem Jul 19, 2021
0c858ca
new filter for RB
eisbilir Jul 19, 2021
b5942be
add withdrawn status
LieutenantRoger Jul 20, 2021
f7e81eb
rephrase validation messages
eisbilir Jul 20, 2021
4fc818b
Merge pull request #411 from eisbilir/new-rb-filter
maxceem Jul 20, 2021
05e64dc
deny process payment for future WP
eisbilir Jul 20, 2021
4c8d268
fix: taas issue #402
yoution Jul 21, 2021
46b4203
add two new jc status
LieutenantRoger Jul 21, 2021
5676b65
Merge branch 'dev' into feature/jc-withdrawn
LieutenantRoger Jul 21, 2021
d5c3105
update swagger
LieutenantRoger Jul 21, 2021
16b6747
Merge pull request #417 from topcoder-platform/feature/jc-withdrawn
LieutenantRoger Jul 21, 2021
92aeba8
Merge pull request #406 from yoution/issue-364
nikolay83 Jul 21, 2021
f167f08
Merge pull request #414 from yoution/isssue-taas-402
nikolay83 Jul 21, 2021
5bdd97e
Merge pull request #418 from topcoder-platform/roles-milestone18
nikolay83 Jul 21, 2021
740bde7
allow filter for both isFirstWeek and isLastWeek
eisbilir Jul 21, 2021
43c0fa2
Merge pull request #413 from eisbilir/update/process-payment
maxceem Jul 21, 2021
791ae33
add automation script feature
LieutenantRoger Jul 21, 2021
719f024
Merge branch 'dev' into feature/jc-withdrawn
LieutenantRoger Jul 21, 2021
3bd9d5a
adjust code comments
LieutenantRoger Jul 21, 2021
0398167
fix: local config
eisbilir Jul 21, 2021
77c1eeb
update naming
LieutenantRoger Jul 21, 2021
d1ee884
add futher logic
LieutenantRoger Jul 21, 2021
0695367
Merge pull request #419 from topcoder-platform/feature/jc-withdrawn
LieutenantRoger Jul 21, 2021
bca7f60
fix: issue #370 mapping emsi tags
yoution Jul 22, 2021
c38ce83
Merge pull request #423 from yoution/issue-370
nikolay83 Jul 22, 2021
29ee949
Merge branch 'dev' into fix/local-deploy
maxceem Jul 22, 2021
07082f4
Merge pull request #422 from eisbilir/fix/local-deploy
maxceem Jul 22, 2021
3d66ee1
fix: issue #370
yoution Jul 22, 2021
721609d
use single env file
eisbilir Jul 22, 2021
0d52605
Merge pull request #424 from yoution/issue-370
nikolay83 Jul 22, 2021
1c1ab57
Merge pull request #425 from eisbilir/fix/local-deploy-one-file
maxceem Jul 23, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ web_modules/
# dotenv environment variables file
.env
.env.test
taas-es-processor.env

# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ To be able to change and test `taas-es-processor` locally you can follow the nex
| `npm run cov` | Code Coverage Report. |
| `npm run migrate` | Run any migration files which haven't run yet. |
| `npm run migrate:undo` | Revert most recent migration. |
| `npm run demo-payment-scheduler` | Create 1000 Work Periods Payment records in with status "scheduled" and various "amount" |
| `npm run demo-payment-scheduler` | Create 1000 Work Periods Payment records in with status "scheduled" and various "amount" |
| `npm run emsi-mapping` | mapping EMSI tags to topcoder skills |

## Import and Export data

Expand Down Expand Up @@ -334,3 +335,8 @@ When we add, update or delete models and/or endpoints we have to make sure that
- **DB Migration**
- If there are any updates in DB schemas, create a DB migration script inside `migrations` folder which would make any necessary updates to the DB schema.
- 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`.

## EMSI mapping
mapping EMSI tags to topcoder skills
Run `npm run emsi-mapping` to create the mapping file
It will take about 15 minutes to create the mapping file `script/emsi-mapping/emsi-skils-mapping.js`
12 changes: 12 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,5 +214,17 @@ module.exports = {
FIX_DELAY_STEP_ASSIGN_MEMBER: parseInt(process.env.PAYMENT_PROCESSING_FIX_DELAY_STEP_ASSIGN_MEMBER || process.env.PAYMENT_PROCESSING_FIX_DELAY_STEP || 500),
// the fix delay after step of activate challenge, unit: ms
FIX_DELAY_STEP_ACTIVATE_CHALLENGE: parseInt(process.env.PAYMENT_PROCESSING_FIX_DELAY_STEP_ACTIVATE_CHALLENGE || process.env.PAYMENT_PROCESSING_FIX_DELAY_STEP || 500)
},
// if a job reach this critier, system will automatically withdrawn other job applications.
JOBS_HOUR_PER_WEEK: 20,
// the mapping includes the status transformation when auto-withdrawn feature is performed on job candidates.
WITHDRAWN_STATUS_CHANGE_MAPPING: {
applied: 'withdrawn-prescreen',
'skills-test': 'withdrawn-prescreen',
'phone-screen': 'withdrawn-prescreen',
open: 'withdrawn',
interview: 'withdrawn',
selected: 'withdrawn',
offered: 'withdrawn'
}
}
8 changes: 7 additions & 1 deletion data/demo-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -7732,6 +7732,9 @@
"global": 50,
"offShore": 10,
"inCountry": 20,
"niche": 50,
"rate20Niche": 20,
"rate30Niche": 10,
"rate20Global": 20,
"rate30Global": 20,
"rate20OffShore": 35,
Expand All @@ -7743,6 +7746,9 @@
"global": 25,
"offShore": 5,
"inCountry": 15,
"niche": 50,
"rate20Niche": 20,
"rate30Niche": 10,
"rate20Global": 20,
"rate30Global": 20,
"rate20OffShore": 35,
Expand All @@ -7762,4 +7768,4 @@
"updatedAt": "2021-05-27T21:43:09.342Z"
}
]
}
}
234 changes: 233 additions & 1 deletion docs/Topcoder-bookings-api.postman_collection.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info": {
"_postman_id": "87477d86-2d08-40b6-93c6-99a394193e28",
"_postman_id": "0bd597ba-4bc2-4ea1-be33-45776b80c1ce",
"name": "Topcoder-bookings-api",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
},
Expand Down Expand Up @@ -11647,6 +11647,11 @@
"key": "projectIds",
"value": "111, 16705",
"disabled": true
},
{
"key": "billingAccountId",
"value": "0",
"disabled": true
}
]
}
Expand Down Expand Up @@ -11725,6 +11730,11 @@
"key": "status",
"value": "assigned",
"disabled": true
},
{
"key": "billingAccountId",
"value": "0",
"disabled": true
}
]
}
Expand Down Expand Up @@ -11797,6 +11807,11 @@
{
"key": "sortOrder",
"value": "desc"
},
{
"key": "billingAccountId",
"value": "0",
"disabled": true
}
]
}
Expand Down Expand Up @@ -11867,6 +11882,11 @@
{
"key": "sortOrder",
"value": "desc"
},
{
"key": "billingAccountId",
"value": "0",
"disabled": true
}
]
}
Expand Down Expand Up @@ -12537,6 +12557,218 @@
},
"response": []
},
{
"name": "search resource bookings with parameters 13",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "Authorization",
"type": "text",
"value": "Bearer {{token_bookingManager}}"
}
],
"url": {
"raw": "{{URL}}/resourceBookings?fields=id,startDate,endDate,billingAccountId,workPeriods&billingAccountId=80000071&workPeriods.startDate=2021-01-03&workPeriods.isFirstWeek=true",
"host": [
"{{URL}}"
],
"path": [
"resourceBookings"
],
"query": [
{
"key": "fields",
"value": "id,startDate,endDate,billingAccountId,workPeriods"
},
{
"key": "billingAccountId",
"value": "80000071"
},
{
"key": "workPeriods.startDate",
"value": "2021-01-03"
},
{
"key": "workPeriods.isFirstWeek",
"value": "true"
}
]
}
},
"response": []
},
{
"name": "search resource bookings with parameters 14",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 200', function () {\r",
" pm.response.to.have.status(200);\r",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "Authorization",
"type": "text",
"value": "Bearer {{token_bookingManager}}"
}
],
"url": {
"raw": "{{URL}}/resourceBookings?fields=id,startDate,endDate,billingAccountId,workPeriods&billingAccountId=80000071&workPeriods.startDate=2021-02-07&workPeriods.isLastWeek=true",
"host": [
"{{URL}}"
],
"path": [
"resourceBookings"
],
"query": [
{
"key": "fields",
"value": "id,startDate,endDate,billingAccountId,workPeriods"
},
{
"key": "billingAccountId",
"value": "80000071"
},
{
"key": "workPeriods.startDate",
"value": "2021-02-07"
},
{
"key": "workPeriods.isLastWeek",
"value": "true"
}
]
}
},
"response": []
},
{
"name": "search resource bookings with parameters 15",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 400', function () {\r",
" pm.response.to.have.status(400);\r",
" const response = pm.response.json()\r",
" pm.expect(response.message).to.eq(\"Cannot filter by \\\"isLastWeek\\\" without \\\"startDate\\\"\")\r",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "Authorization",
"type": "text",
"value": "Bearer {{token_bookingManager}}"
}
],
"url": {
"raw": "{{URL}}/resourceBookings?fields=id,startDate,endDate,billingAccountId,workPeriods&billingAccountId=80000071&workPeriods.isLastWeek=true",
"host": [
"{{URL}}"
],
"path": [
"resourceBookings"
],
"query": [
{
"key": "fields",
"value": "id,startDate,endDate,billingAccountId,workPeriods"
},
{
"key": "billingAccountId",
"value": "80000071"
},
{
"key": "workPeriods.isLastWeek",
"value": "true"
}
]
}
},
"response": []
},
{
"name": "search resource bookings with parameters 16",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test('Status code is 400', function () {\r",
" pm.response.to.have.status(400);\r",
" const response = pm.response.json()\r",
" pm.expect(response.message).to.eq(\"Cannot filter by \\\"isFirstWeek\\\" without \\\"startDate\\\"\")\r",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "Authorization",
"type": "text",
"value": "Bearer {{token_bookingManager}}"
}
],
"url": {
"raw": "{{URL}}/resourceBookings?fields=id,startDate,endDate,billingAccountId,workPeriods&billingAccountId=80000071&workPeriods.isFirstWeek=true",
"host": [
"{{URL}}"
],
"path": [
"resourceBookings"
],
"query": [
{
"key": "fields",
"value": "id,startDate,endDate,billingAccountId,workPeriods"
},
{
"key": "billingAccountId",
"value": "80000071"
},
{
"key": "workPeriods.isFirstWeek",
"value": "true"
}
]
}
},
"response": []
},
{
"name": "put resource booking with booking manager",
"event": [
Expand Down
Loading