Skip to content

[PROD] Release 1.6.0 #222

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 55 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
26ba0c1
implement the `GET /taas-teams/me` endpoint without enrich parameter
imcaizheng Mar 3, 2021
a131404
Create script for migrating `isApplicationPageActive` from CSV file
imcaizheng Mar 9, 2021
f6abe98
Merge pull request #174 from imcaizheng/recruit-crm-job-sync
maxceem Mar 10, 2021
a753c27
Merge pull request #172 from imcaizheng/new-endpoint-taas-team-me-update
maxceem Mar 10, 2021
4113b0b
Update MigrationMeta table when running init-db
imcaizheng Mar 10, 2021
de8b164
fix: don't namespace script env variables by default
maxceem Mar 10, 2021
47d3521
Merge pull request #176 from imcaizheng/init-db-with-existing-migration
maxceem Mar 11, 2021
c00520f
docs: update readme
maxceem Mar 31, 2021
3dec6c1
docs: updated readme
maxceem Mar 31, 2021
74a610d
work period endpoint added
eisbilir Apr 3, 2021
5e02e35
Merge pull request #177 from eisbilir/challenge-work-period
maxceem Apr 4, 2021
ebda913
fix: migration script
maxceem Apr 4, 2021
8837193
fix workperiodService reusable method and unnecessary conversion
eisbilir Apr 4, 2021
ffa0833
Merge pull request #179 from eisbilir/feature/work-periods
maxceem Apr 4, 2021
1375d90
fix: remove redundant async
maxceem Apr 4, 2021
c311d0e
docs: improve readability
maxceem Apr 4, 2021
3f1d9b0
Merge pull request #178 from topcoder-platform/feature/work-periods
nkumar-topcoder Apr 5, 2021
de71a22
demo-payment script
eisbilir Apr 7, 2021
57ddfa4
Merge branch 'dev' into hotfix/patch-1.5.3.1-dev
maxceem Apr 9, 2021
1c5f502
Merge pull request #187 from topcoder-platform/hotfix/patch-1.5.3.1-dev
nkumar-topcoder Apr 9, 2021
d9dc49f
Add work period payments.
narekcat Apr 9, 2021
4410565
Merge pull request #183 from eisbilir/demo-payment
maxceem Apr 14, 2021
f4c562f
Work Period Automation and Constraints
eisbilir Apr 14, 2021
667ed1b
Update ResourceBookingEventHandler.js
eisbilir Apr 15, 2021
028bd2f
Merge pull request #189 from eisbilir/work-period-automation
maxceem Apr 15, 2021
b0508e9
fix: allow startDate be same as endDate for RB
maxceem Apr 16, 2021
2c16aff
fix: routes "/workPeriods" to "/work-periods"
maxceem Apr 16, 2021
d2f669a
chore: move MAX dates to migration script from common config
maxceem Apr 16, 2021
8e2d31c
Merge branch 'master' into dev
maxceem Apr 16, 2021
b203eab
Merge pull request #190 from topcoder-platform/feature/work-periods-a…
nkumar-topcoder Apr 16, 2021
2c62417
fix: migration script
maxceem Apr 16, 2021
d24bfd8
Merge pull request #193 from narekcat/feature/work-periods
maxceem Apr 17, 2021
de60cbb
Merge branch 'feature/payment-processing' into feature/work-periods
maxceem Apr 17, 2021
4af2193
Merge branch 'dev' into feature/work-periods
narekcat Apr 18, 2021
9513b37
Final fixes for adding work period payments.
narekcat Apr 18, 2021
cf0c19c
Merge pull request #195 from narekcat/feature/work-periods
maxceem Apr 19, 2021
1ab9260
fix: postman tests for payment permissions
maxceem Apr 19, 2021
61cfade
fix: payment name/description
maxceem Apr 19, 2021
439d020
Merge pull request #198 from topcoder-platform/feature/work-periods
nkumar-topcoder Apr 19, 2021
f31721e
fix: WorkPeriodPayments migration script
maxceem Apr 19, 2021
ab78d6f
fix: migration script
maxceem Apr 20, 2021
3e9f92b
Add ability to switch on/off actual payments via config
imcaizheng Apr 21, 2021
700b68e
fix: initialize eventHandlers only once during test
imcaizheng Apr 21, 2021
04fe63d
Merge pull request #211 from imcaizheng/feature/allow-toggle-actual-p…
maxceem Apr 21, 2021
a7fbbac
make Resource Booking model to not store time, only dates
eisbilir Apr 21, 2021
93c1b50
Merge pull request #214 from eisbilir/dev
nkumar-topcoder Apr 22, 2021
06216d2
fix: rename migration scripts
maxceem Apr 22, 2021
12ed3c5
Use billing account for payments
imcaizheng Apr 22, 2021
9beb3a7
Merge pull request #217 from imcaizheng/feature/use-billing-account-f…
nkumar-topcoder Apr 22, 2021
34a7776
feat: use 0 markup for payments
maxceem Apr 22, 2021
321ce76
docs: update readme
maxceem Apr 22, 2021
a12f747
fix daysWorked calculation during automatic WP creation/updates
eisbilir Apr 22, 2021
a1e52d4
fix typo
eisbilir Apr 22, 2021
a377dab
Merge pull request #220 from eisbilir/calculation-of-daysWorked
maxceem Apr 23, 2021
9ac2bdc
fix: migration order
maxceem Apr 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ web_modules/
# Optional eslint cache
.eslintcache

# Optional eslint options
.eslintrc.y*ml

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
Expand Down
175 changes: 131 additions & 44 deletions README.md

Large diffs are not rendered by default.

28 changes: 26 additions & 2 deletions app-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,35 @@ const Scopes = {
DELETE_RESOURCE_BOOKING: 'delete:taas-resourceBookings',
ALL_RESOURCE_BOOKING: 'all:taas-resourceBookings',
// taas-team
READ_TAAS_TEAM: 'read:taas-teams'
READ_TAAS_TEAM: 'read:taas-teams',
// work period
READ_WORK_PERIOD: 'read:taas-workPeriods',
CREATE_WORK_PERIOD: 'create:taas-workPeriods',
UPDATE_WORK_PERIOD: 'update:taas-workPeriods',
DELETE_WORK_PERIOD: 'delete:taas-workPeriods',
ALL_WORK_PERIOD: 'all:taas-workPeriods',
// work period payment
READ_WORK_PERIOD_PAYMENT: 'read:taas-workPeriodPayments',
CREATE_WORK_PERIOD_PAYMENT: 'create:taas-workPeriodPayments',
UPDATE_WORK_PERIOD_PAYMENT: 'update:taas-workPeriodPayments',
ALL_WORK_PERIOD_PAYMENT: 'all:taas-workPeriodPayments'
}

const ChallengeStatus = {
DRAFT: 'Draft',
ACTIVE: 'Active',
COMPLETED: 'Completed'
}

const PaymentProcessingSwitch = {
ON: 'ON',
OFF: 'OFF'
}

module.exports = {
UserRoles,
FullManagePermissionRoles,
Scopes
Scopes,
ChallengeStatus,
PaymentProcessingSwitch
}
27 changes: 25 additions & 2 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ module.exports = {
ES_INDEX_JOB_CANDIDATE: process.env.ES_INDEX_JOB_CANDIDATE || 'job_candidate',
// the resource booking index
ES_INDEX_RESOURCE_BOOKING: process.env.ES_INDEX_RESOURCE_BOOKING || 'resource_booking',
// the work period index
ES_INDEX_WORK_PERIOD: process.env.ES_INDEX_WORK_PERIOD || 'work_period',

// the max bulk size in MB for ES indexing
MAX_BULK_REQUEST_SIZE_MB: process.env.MAX_BULK_REQUEST_SIZE_MB || 20,
Expand Down Expand Up @@ -103,13 +105,27 @@ module.exports = {
TAAS_JOB_CANDIDATE_UPDATE_TOPIC: process.env.TAAS_JOB_CANDIDATE_UPDATE_TOPIC || 'taas.jobcandidate.update',
// the delete job candidate entity Kafka message topic
TAAS_JOB_CANDIDATE_DELETE_TOPIC: process.env.TAAS_JOB_CANDIDATE_DELETE_TOPIC || 'taas.jobcandidate.delete',
// topics for job service
// topics for resource booking service
// the create resource booking entity Kafka message topic
TAAS_RESOURCE_BOOKING_CREATE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_CREATE_TOPIC || 'taas.resourcebooking.create',
// the update resource booking entity Kafka message topic
TAAS_RESOURCE_BOOKING_UPDATE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_UPDATE_TOPIC || 'taas.resourcebooking.update',
// the delete resource booking entity Kafka message topic
TAAS_RESOURCE_BOOKING_DELETE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_DELETE_TOPIC || 'taas.resourcebooking.delete',
// topics for work period service
// the create work period entity Kafka message topic
TAAS_WORK_PERIOD_CREATE_TOPIC: process.env.TAAS_WORK_PERIOD_CREATE_TOPIC || 'taas.workperiod.create',
// the update work period entity Kafka message topic
TAAS_WORK_PERIOD_UPDATE_TOPIC: process.env.TAAS_WORK_PERIOD_UPDATE_TOPIC || 'taas.workperiod.update',
// the delete work period entity Kafka message topic
TAAS_WORK_PERIOD_DELETE_TOPIC: process.env.TAAS_WORK_PERIOD_DELETE_TOPIC || 'taas.workperiod.delete',
// topics for work period payment service
// the create work period payment entity Kafka message topic
TAAS_WORK_PERIOD_PAYMENT_CREATE_TOPIC: process.env.TAAS_WORK_PERIOD_PAYMENT_CREATE_TOPIC || 'taas.workperiodpayment.create',
// the update work period payment entity Kafka message topic
TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC: process.env.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC || 'taas.workperiodpayment.update',
// the delete work period payment entity Kafka message topic
TAAS_WORK_PERIOD_PAYMENT_DELETE_TOPIC: process.env.TAAS_WORK_PERIOD_PAYMENT_DELETE_TOPIC || 'taas.workperiodpayment.delete',

// the Kafka message topic for sending email
EMAIL_TOPIC: process.env.EMAIL_TOPIC || 'external.action.email',
Expand All @@ -124,5 +140,12 @@ module.exports = {
// SendGrid email template ID for requesting extension
REQUEST_EXTENSION_SENDGRID_TEMPLATE_ID: process.env.REQUEST_EXTENSION_SENDGRID_TEMPLATE_ID,
// the URL where TaaS App is hosted
TAAS_APP_URL: process.env.TAAS_APP_URL || 'https://platform.topcoder-dev.com/taas/myteams'
TAAS_APP_URL: process.env.TAAS_APP_URL || 'https://platform.topcoder-dev.com/taas/myteams',
// environment variables for Payment Service
ROLE_ID_SUBMITTER: process.env.ROLE_ID_SUBMITTER || '732339e7-8e30-49d7-9198-cccf9451e221',
TYPE_ID_TASK: process.env.TYPE_ID_TASK || 'ecd58c69-238f-43a4-a4bb-d172719b9f31',
DEFAULT_TIMELINE_TEMPLATE_ID: process.env.DEFAULT_TIMELINE_TEMPLATE_ID || '53a307ce-b4b3-4d6f-b9a1-3741a58f77e6',
DEFAULT_TRACK_ID: process.env.DEFAULT_TRACK_ID || '9b6fc876-f4d9-4ccb-9dfd-419247628825',

PAYMENT_PROCESSING_SWITCH: process.env.PAYMENT_PROCESSING_SWITCH || 'OFF'
}
2 changes: 1 addition & 1 deletion data/demo-data.json

Large diffs are not rendered by default.

Loading