Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
./tasks test_coverage-github-action

- name: SonarCloud Scan
uses: SonarSource/sonarqube-scan-action@v4
uses: SonarSource/sonarqube-scan-action@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
34,024 changes: 8,418 additions & 25,606 deletions services/ehr-out-service/package-lock.json

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions services/ehr-out-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"start:local": "babel-node src/server.js",
"start:nodemon": "nodemon --exec npm run start:local",
"test": "npm run lint:fix && npm run test:unit",
"test:unit": "jest \"src/(?!(.*\\integration.test\\.js))\" --setupFiles",
"test:integration": "jest \"src/.*\\integration.test\\.js\" --detectOpenHandles --forceExit --setupFiles dotenv/config",
"test:unit": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js \"src/(?!(.*\\integration.test\\.js))\" --setupFiles",
"test:integration": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js \"src/.*\\\\integration.test\\\\.js\" --runInBand --no-cache --detectOpenHandles --forceExit --setupFiles dotenv/config",
"test:health": "jest test/functional/health.test.js",
"test:docker": "npm run test:health",
"test:functional": "jest test/functional/*",
"test:e2e": "jest test/e2e/*",
"test:coverage": "jest src/ --maxWorkers=1 --coverage --detectOpenHandles --forceExit --setupFiles dotenv/config",
"test:coverage-unit-test-only": "jest \"src/(?!(.*\\integration.test\\.js))\" --maxWorkers=1 --coverage --detectOpenHandles --forceExit --setupFiles dotenv/config"
"test:coverage": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js src/ --maxWorkers=1 --coverage --detectOpenHandles --forceExit --setupFiles dotenv/config",
"test:coverage-unit-test-only": ".node --experimental-vm-modules ./node_modules/jest/bin/jest.js \"src/(?!(.*\\integration.test\\.js))\" --maxWorkers=1 --coverage --detectOpenHandles --forceExit --setupFiles dotenv/config"
},
"dependencies": {
"@aws-sdk/client-dynamodb": "^3.529.1",
Expand All @@ -28,10 +28,8 @@
"@babel/runtime": "^7.17.8",
"axios": "^1.7.2",
"dotenv": "^16.0.0",
"expect": "^29.3.1",
"express": "^4.19.2",
"express-validator": "^6.14.0",
"fast-xml-parser": "^4.2.5",
"lodash.chunk": "^4.2.0",
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0",
Expand All @@ -58,7 +56,7 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.2",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^28.1.3",
"jest": "^29.7.0",
"nock": "^13.2.4",
"nodemon": "^2.0.19",
"prettier": "2.6.0",
Expand All @@ -67,6 +65,7 @@
},
"overrides": {
"json5": "2.2.2",
"fast-xml-parser": "^5.3.4",
"superagent": "8.0.8",
"semver": ">=7.5.2"
},
Expand Down
2 changes: 1 addition & 1 deletion services/ehr-out-service/src/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const portNumber = 3000;
export const config = () => ({
nhsEnvironment: process.env.NHS_ENVIRONMENT || 'local',
repoToGpServiceUrl: process.env.SERVICE_URL || `http://127.0.0.1:${portNumber}`,
gp2gpMessengerServiceUrl: process.env.GP2GP_MESSENGER_SERVICE_URL,
gp2gpMessengerServiceUrl: process.env.GP2GP_MESSENGER_SERVICE_URL || 'http://www.notreal.com',
gp2gpMessengerAuthKeys: process.env.GP2GP_MESSENGER_AUTHORIZATION_KEYS,
ehrRepoServiceUrl: process.env.EHR_REPO_SERVICE_URL,
ehrRepoAuthKeys: process.env.EHR_REPO_AUTHORIZATION_KEYS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const INBOUND_FRAGMENT_IDS = [uuid().toUpperCase(), uuid().toUpperCase(), uuid()
const ODS_CODE = 'B12345';

describe('ehr-core-repository', () => {
afterAll(async () => {
afterEach(async () => {
await cleanupRecordsForTest(INBOUND_CONVERSATION_ID);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('outbound-conversation-repository', () => {
const ODS_CODE = 'B12345';
const db = EhrTransferTracker.getInstance();

afterAll(async () => {
afterEach(async () => {
await cleanupRecordsForTest(INBOUND_CONVERSATION_ID);
});

Expand Down
2 changes: 1 addition & 1 deletion services/ehr-out-service/test/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const SQS_EHR_OUT_INCOMING_QUEUE_NAME = 'test-ehr-out-service-incoming';
const AWS_ACCOUNT_NO = '000000000000';
let localstackEndpointUrl = process.env.LOCALSTACK_URL;
let localstackEndpointUrl = process.env.LOCALSTACK_URL || 'http://localhost:4566';
export const config = {
nhsEnvironment: process.env.NHS_ENVIRONMENT,
serviceUrl: process.env.SERVICE_URL,
Expand Down
Loading
Loading