Skip to content

Commit 6f116e8

Browse files
committed
[PRM-659] GitHub Org migration changes (nhsconnect -> NHSDigital)
1 parent 9ad9416 commit 6f116e8

File tree

18 files changed

+74
-53
lines changed

18 files changed

+74
-53
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @NHSDigital/patient-record-management

.github/workflows/base-java-service-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
deploy_infra:
138138
name: Deploy Infrastructure
139139
needs: [build_and_publish]
140-
uses: nhsconnect/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
140+
uses: NHSDigital/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
141141

142142
with:
143143
stack: ${{ inputs.service }}

.github/workflows/base-node-service-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
deploy_infra:
170170
name: Deploy Infrastructure
171171
needs: [build_and_publish]
172-
uses: nhsconnect/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
172+
uses: NHSDigital/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
173173
with:
174174
stack: ${{ inputs.service }}
175175
environment: ${{ inputs.environment }}

.github/workflows/base-python-service-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
if: ${{ inputs.deploy_infra && inputs.is_deployment }}
121121
name: Deploy Infrastructure
122122
needs: [build-and-publish-service]
123-
uses: nhsconnect/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
123+
uses: NHSDigital/orphaned-record-continuity-infrastructure/.github/workflows/deploy-stack.yml@v3
124124
with:
125125
stack: ${{ inputs.service }}
126126
environment: ${{ inputs.environment }}

.github/workflows/service-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
- name: Get Changes
4848
id: get_changes
4949
run: |
50-
git fetch origin ${{ github.event.pull_request.base.ref }}
51-
changed=$(git diff --name-only origin/${{ github.event.pull_request.base.ref }}...HEAD | tr '\n' ' ')
50+
git fetch origin main
51+
changed=$(git diff --name-only origin/main... | tr '\n' ' ')
5252
echo "changed=$changed" >> $GITHUB_OUTPUT
5353
5454
ehr-repo:

CONTRIBUTING.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Welcome to the Orphaned Record Continuity contributors guide
2+
3+
Thank you for your interest in improving the codebase.
4+
5+
In this guide you will get an overview of the contribution workflow from creating a PR, reviewing, and merging the PR.
6+
7+
The codebase covers:
8+
9+
- The [Orphaned Record Continuity service](https://digital.nhs.uk/services/orphaned-record-continuity).
10+
11+
To raise an issue, please contact one of the [CODEOWNERS](.github/CODEOWNERS) directly, or raise a PR.
12+
13+
If you're new to GitHub and/or Markdown, GitHub's own [contributor's guide](https://github.com/github/docs/blob/main/.github/CONTRIBUTING.md) provides good signposting on these topics.
14+
15+
## Pull requests and merging
16+
17+
You can't push to the main branch. Therefore, for all changes you will need to create a new branch, and then a pull request to merge said branch into `main`. The [CODEOWNERS](.github/CODEOWNERS) will be nominated as reviewers of your PR by default, but feel free to add other people as well if you think they will have valuable input.
18+
19+
## Contributing guidelines and etiquette
20+
21+
- Preview your Markdown code to make sure the format is not broken.
22+
- Check grammar, spelling and punctuation - no-one wants to look pedantic by requesting changes due to typos or inconsistent grammar/syntax, but it's only fair to keep this tidy.
23+
- The codebase is open to the world. This has a few implications:
24+
- Nothing in it should be confidential, private to NHSE or include any personal data.
25+
- All links should be public.
26+
- Consider comments and README.md text: comments in open source repos such as this are not official communications and don't go through the normal approval process for public communication. They can however still be interpreted as official communication, even if not intended as such.
27+
- Use [inclusive language](https://github.com/NHSDigital/software-engineering-quality-framework/blob/main/inclusive-language.md): avoid terms which cause hurt and offence, including if they have historically been considered industry-standard terms.

services/ehr-out-service/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
"superagent": "8.0.8",
7171
"semver": ">=7.5.2"
7272
},
73-
"repository": {
74-
"type": "git",
75-
"url": "git+https://github.com/nhsconnect/prm-repo-ehr-out-service.git"
76-
},
7773
"jest": {
7874
"resetModules": true,
7975
"clearMocks": true,

services/ehr-out-service/sonar-project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
sonar.projectKey=prm-orphaned-record-continuity_prm-repo-ehr-out-service
2-
sonar.organization=prm-orphaned-record-continuity
1+
sonar.projectKey=NHSDigital_orphaned-record-continuity
2+
sonar.organization=nhsdigital
33

44
# This is the name and version displayed in the SonarCloud UI.
55
sonar.projectName=prm-repo-ehr-out-service

services/ehr-transfer-service/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ spotbugsIntegration {
169169

170170
sonar {
171171
properties {
172-
property 'sonar.projectKey', 'prm-orphaned-record-continuity_prm-repo-ehr-transfer-service'
173-
property 'sonar.organization', 'prm-orphaned-record-continuity'
172+
property 'sonar.projectKey', 'NHSDigital_orphaned-record-continuity'
173+
property 'sonar.organization', 'nhsdigital'
174174
property 'sonar.host.url', 'https://sonarcloud.io'
175175
}
176176
}

services/gp2gp-messenger/README.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
This is an implementation of a component to handle the sending of the GP2GP message set used to transfer a patient's Electronic Health Record between GP Practices.
44
It uses the GP2GP message format to transfer orphaned and stranded records out of a secure NHS repository.
55

6-
This component will communicate with the Message Handler Service (MHS) [GitHub nhsconnect/integration-adaptors](https://github.com/nhsconnect/integration-adaptors) and other components being developed by the Orphaned and Stranded Record programme.
6+
This component will communicate with the Message Handler Service (MHS) using the [NIA MHS Adaptor](https://github.com/NHSDigital/integration-adaptor-mhs) and other components being developed by the Orphaned Record Continuity programme.
77

88
The initial version will send health records that are encoded in the HL7 format. A subsequent enhancement will be access to the components of the Health Record so that other services can use this component to send and receive Health Records with the need to implement the encoding and fragmentation strategies of the [GP2GP v2.2a](https://data.developer.nhs.uk/dms/mim/6.3.01/Domains/GP2GP/Document%20files/GP2GP%20IM.htm) message specification.
99

1010
## Prerequisites
1111

1212
- [Node](https://nodejs.org/en/download/package-manager/#nvm) - version 14.x
1313
- [Docker](https://docs.docker.com/install/)
14-
14+
1515
### AWS helpers
1616

1717
This repository imports shared AWS helpers from [prm-deductions-support-infra](https://github.com/nhsconnect/prm-deductions-support-infra/).
@@ -20,22 +20,26 @@ They can be found `utils` directory after running any task from `tasks` file.
2020
## Set up
2121

2222
If you would like to run the app locally, you need to:
23+
2324
1. Run `npm install` to install all node dependencies as per `package.json`.
24-
2. Set up the env variables and/or copy them into your IDE configurations (`Run -> Edit Configurations ->Environment Variables` in IntelliJ):
25-
```
26-
export E2E_TEST_AUTHORIZATION_KEYS_FOR_GP2GP_MESSENGER=auth-key-2
27-
export REPOSITORY_URI=$IMAGE_REPO_NAME
28-
export NHS_SERVICE=gp2gp-messenger
29-
export SERVICE_URL=http://${NHS_SERVICE}:3000
30-
export NHS_ENVIRONMENT=local
31-
export GP2GP_MESSENGER_REPOSITORY_ASID=deduction-asid
32-
export GP2GP_MESSENGER_REPOSITORY_ODS_CODE=deduction-ods
33-
```
34-
- Locally, the variables `GP2GP_MESSENGER_REPOSITORY_ASID`, `GP2GP_MESSENGER_REPOSITORY_ODS_CODE` can be set
35-
to any value
25+
26+
1. Set up the env variables and/or copy them into your IDE configurations (`Run -> Edit Configurations ->Environment Variables` in IntelliJ):
27+
28+
```bash
29+
export E2E_TEST_AUTHORIZATION_KEYS_FOR_GP2GP_MESSENGER=auth-key-2
30+
export REPOSITORY_URI=$IMAGE_REPO_NAME
31+
export NHS_SERVICE=gp2gp-messenger
32+
export SERVICE_URL=http://${NHS_SERVICE}:3000
33+
export NHS_ENVIRONMENT=local
34+
export GP2GP_MESSENGER_REPOSITORY_ASID=deduction-asid
35+
export GP2GP_MESSENGER_REPOSITORY_ODS_CODE=deduction-ods
36+
```
37+
38+
> Locally, the variables `GP2GP_MESSENGER_REPOSITORY_ASID`, `GP2GP_MESSENGER_REPOSITORY_ODS_CODE` can be set
39+
to any value
3640

37-
3. The app will use a fake MHS when `NHS_ENVIRONMENT` is set to `local` or `dev`.
38-
41+
1. The app will use a fake MHS when `NHS_ENVIRONMENT` is set to `local` or `dev`.
42+
3943
## Running the tests
4044

4145
Run the unit tests by running `./tasks test_unit`
@@ -46,14 +50,12 @@ Run the integration tests with:
4650

4751
You can also run them with `npm run test:integration` but that will require some additional manual set-up
4852

49-
5053
Run the coverage tests (unit test and integration test)
5154

5255
By running `./tasks test_coverage`
5356

5457
or run `npm run test:coverage` on your machine
5558

56-
5759
## Start the app locally
5860

5961
1. Run a development server with `npm run start:local`
@@ -65,7 +67,7 @@ The swagger documentation for the app can be found at `http://localhost:3000/swa
6567

6668
### Example request
6769

68-
```
70+
```bash
6971
curl -X POST "http://localhost:3000/ehr-request" -H "accept: application/json" -H "Authorization: auth-key-1" -H "Content-Type: application/json" -d "{ \"nhsNumber\": \"some-nhs-number\", \"odsCode\": \"some-ods-code\"}"
7072
```
7173

@@ -75,8 +77,7 @@ Compile the code with `npm run build`, and then start the server with `npm start
7577

7678
## Config
7779

78-
Ensure you have VPN connection set up to both `dev` and `test` environments:
79-
[CLICK HERE](https://gpitbjss.atlassian.net/wiki/spaces/TW/pages/1832779966/VPN+for+Deductions+Services)
80+
Ensure you have VPN connection set up to both `dev` and `test` environments ([see this Confluence page](https://gpitbjss.atlassian.net/wiki/spaces/TW/pages/1832779966/VPN+for+Deductions+Services)).
8081

8182
## Access to AWS from CLI
8283

@@ -89,4 +90,4 @@ As a note, this set-up is based on the README of assume-role [tool](https://gith
8990

9091
## Assume role with elevated permissions
9192

92-
In order to get sufficient access to work with terraform or AWS CLI, please export secrets from the AWS Access Portal for the environment you are using
93+
In order to get sufficient access to work with terraform or AWS CLI, please export secrets from the AWS Access Portal for the environment you are using

0 commit comments

Comments
 (0)