Merge pull request #119 from topcoder-platform/dev

DEV -> Master V6

Author: kkartunov

.circleci/config.yml

@@ -51,7 +51,7 @@ jobs:
         environment:
             DEPLOY_ENV: 'DEV'
             LOGICAL_ENV: 'dev'
-            APPNAME: 'tc-finance-api'
+            APPNAME: 'finance-api-v6'
             DEPLOYMENT_ENVIRONMENT: 'dev'
         steps: *build_and_deploy_steps
 
@@ -60,7 +60,7 @@ jobs:
         environment:
             DEPLOY_ENV: 'PROD'
             LOGICAL_ENV: 'prod'
-            APPNAME: 'tc-finance-api'
+            APPNAME: 'finance-api-v6'
             DEPLOYMENT_ENVIRONMENT: 'prod'
         steps: *build_and_deploy_steps
 
@@ -74,7 +74,6 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - fix-nan-for-release-date
             - 'build-prod':
                   context: org-global
                   filters:

.env.sample

@@ -1,4 +1,5 @@
-TOPCODER_API_BASE_URL="https://api.topcoder-dev.com/v5"
+TOPCODER_API_V5_BASE_URL="https://api.topcoder-dev.com/v5"
+TOPCODER_API_V6_BASE_URL="https://api.topcoder-dev.com/v6"
 AUTH0_CERT="-----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEArAV0dmDkedFdlaQ6KQiqUv+UGshfMXx/4jJCLZ9802ynJqAvIt+Z
 V7EiPqjc2J1xVfJJEvQ9ZS5A2TFWAk16NUTU4LN+TkjEnqeg+LlUPWY3Y4RXa2OU
@@ -15,4 +16,4 @@ DB_PASSWORD=randompassword
 DB_HOST=127.0.0.1
 DB_PORT=5434
 DB_NAME=walletdb
-DATABASE_URL="postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"
+DATABASE_URL="postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"