diff --git a/.circleci/config.yml b/.circleci/config.yml index fe6ea2d..0b90766 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,7 +119,7 @@ workflows: only: - develop - hotfix/deploy - - pm-2456 + - pm-2539 # Production builds are exectuted only on tagged commits to the testing # master branch. diff --git a/config/default.js b/config/default.js index 8351d29..391db55 100644 --- a/config/default.js +++ b/config/default.js @@ -59,5 +59,6 @@ module.exports = { }, AUTOMATED_TESTING_NAME_PREFIX: process.env.AUTOMATED_TESTING_NAME_PREFIX || 'POSTMANE2E-', - TOPCROWD_CHALLENGE_TEMPLATE_ID: process.env.TOPCROWD_CHALLENGE_TEMPLATE_ID || '517e76b0-8824-4e72-9b48-a1ebde1793a8' + TOPCROWD_CHALLENGE_TEMPLATE_ID: process.env.TOPCROWD_CHALLENGE_TEMPLATE_ID || '517e76b0-8824-4e72-9b48-a1ebde1793a8', + RESOURCE_SERVICE_PRISMA_TIMEOUT: process.env.RESOURCE_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.RESOURCE_SERVICE_PRISMA_TIMEOUT, 10) : 10000 } diff --git a/config/test.js b/config/test.js index f6d3a56..151afff 100644 --- a/config/test.js +++ b/config/test.js @@ -21,5 +21,6 @@ module.exports = { COPILOT_CREDENTIALS_PASSWORD: process.env.COPILOT_CREDENTIALS_PASSWORD || '', USER_CREDENTIALS_USERNAME: process.env.USER_CREDENTIALS_USERNAME || '', USER_CREDENTIALS_PASSWORD: process.env.USER_CREDENTIALS_PASSWORD || '', - AUTOMATED_TESTING_REPORTERS_FORMAT: process.env.AUTOMATED_TESTING_REPORTERS_FORMAT || ['cli', 'html'] + AUTOMATED_TESTING_REPORTERS_FORMAT: process.env.AUTOMATED_TESTING_REPORTERS_FORMAT || ['cli', 'html'], + RESOURCE_SERVICE_PRISMA_TIMEOUT: process.env.RESOURCE_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.RESOURCE_SERVICE_PRISMA_TIMEOUT, 10) : 10000 } diff --git a/env.sh b/env.sh index 5f31e5e..0d56087 100644 --- a/env.sh +++ b/env.sh @@ -31,3 +31,5 @@ export DATABASE_URL="postgresql://johndoe:mypassword@localhost:5532/resourceapi? export MEMBER_DB_URL="postgresql://johndoe:mypassword@localhost:5632/memberdb" export CHALLENGE_DB_URL="postgresql://johndoe:mypassword@localhost:5732/challengedb" + +export RESOURCE_SERVICE_PRISMA_TIMEOUT=10000 \ No newline at end of file diff --git a/migrator/src/clients/prismaClient.js b/migrator/src/clients/prismaClient.js index b2cb036..3c3290e 100644 --- a/migrator/src/clients/prismaClient.js +++ b/migrator/src/clients/prismaClient.js @@ -1,6 +1,11 @@ const { PrismaClient } = require('@prisma/client'); +const config = require('config') -const prisma = new PrismaClient(); +const prisma = new PrismaClient({ + transactionOptions: { + timeout: config.MEMBER_SERVICE_PRISMA_TIMEOUT, + }, +}); module.exports = prisma;