Skip to content
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

feat: migrate stfc users service to rest #897

Merged
merged 69 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f4c107b
Rest changes
William-Edwards-STFC Dec 17, 2024
ab87c25
Revert cypress config change
William-Edwards-STFC Dec 17, 2024
284861d
Revert cypress config
William-Edwards-STFC Dec 17, 2024
f90bd34
Test
William-Edwards-STFC Dec 17, 2024
7035a69
Merge branch 'develop' of https://github.com/UserOfficeProject/user-o…
William-Edwards-STFC Dec 17, 2024
d96e896
Changed dockerfile
William-Edwards-STFC Dec 17, 2024
dfc4aac
Remove accidental import
William-Edwards-STFC Dec 17, 2024
4169f39
Fix lint and add to workflow
William-Edwards-STFC Dec 17, 2024
2df83a2
Add generated files to avoid workflow issues
William-Edwards-STFC Dec 17, 2024
f437313
remove lint issue
William-Edwards-STFC Dec 17, 2024
94af88a
revert read me
William-Edwards-STFC Dec 17, 2024
5f421d0
Fixed lint
William-Edwards-STFC Jan 2, 2025
f748da1
Try again
William-Edwards-STFC Jan 2, 2025
822d4c9
Testing changes against github actions
William-Edwards-STFC Jan 10, 2025
210e615
Merge branch 'migrate-rest-new' of https://github.com/UserOfficeProje…
William-Edwards-STFC Jan 10, 2025
4c0e045
Merge branch 'develop' of https://github.com/UserOfficeProject/user-o…
William-Edwards-STFC Jan 10, 2025
a1df6b4
Change BASE_URL to a different env variable name
William-Edwards-STFC Jan 10, 2025
65d2ffb
Lint changes
William-Edwards-STFC Jan 13, 2025
ebc2f93
remove generated files
William-Edwards-STFC Jan 14, 2025
6db292c
Revert launch.json back
William-Edwards-STFC Jan 14, 2025
2bfae58
revert e2e docker file and unused soap mocks
William-Edwards-STFC Jan 14, 2025
cbdcd48
Add file generator to lint
William-Edwards-STFC Jan 14, 2025
0a12a41
Lint change
William-Edwards-STFC Jan 14, 2025
a8657c3
Add required changes and lint fix
William-Edwards-STFC Jan 19, 2025
a7f32e5
Add uows generation to build
William-Edwards-STFC Jan 19, 2025
b611ea9
Add uows generator to lint checker
William-Edwards-STFC Jan 19, 2025
cb83653
Test adding generating uows to dev test
William-Edwards-STFC Jan 19, 2025
39968f5
Test generating library before tests
William-Edwards-STFC Jan 20, 2025
ae318e3
Move the uows generator to workflows
William-Edwards-STFC Jan 20, 2025
1a8270f
Move uows generation to the correct place in work flows
William-Edwards-STFC Jan 20, 2025
4ab67f7
Add generated files to docker ignore
William-Edwards-STFC Jan 20, 2025
11cda80
Merge branch 'develop' of https://github.com/UserOfficeProject/user-o…
William-Edwards-STFC Jan 20, 2025
8323de3
Change work flow file
William-Edwards-STFC Jan 20, 2025
4e31ad9
Test adding generator to tests
William-Edwards-STFC Jan 20, 2025
645ba9a
test another change to work flow
William-Edwards-STFC Jan 20, 2025
3fcf2ea
Add backend install for openapi
William-Edwards-STFC Jan 20, 2025
304258f
Change generate scripts
William-Edwards-STFC Jan 20, 2025
232756e
Remove generator
William-Edwards-STFC Jan 20, 2025
3013a6f
Test adding uows generator the same way the sdk generator is done
William-Edwards-STFC Jan 20, 2025
a8c49e6
Change cp to cd
William-Edwards-STFC Jan 20, 2025
fa77a3d
Add cached uows generation to work flows
William-Edwards-STFC Jan 21, 2025
9981d59
Remove backend installation from e2e test build
William-Edwards-STFC Jan 21, 2025
74fd619
Change target branch to test new mock-uows changes
William-Edwards-STFC Jan 21, 2025
075d380
test
William-Edwards-STFC Jan 21, 2025
6fbeeb7
Change branch back
William-Edwards-STFC Jan 21, 2025
92d8261
Change back for test
William-Edwards-STFC Jan 21, 2025
c0ee341
Test changes
William-Edwards-STFC Jan 22, 2025
7b9387d
Change back for test
William-Edwards-STFC Jan 22, 2025
9ba29e0
Test to see if mock server is working
William-Edwards-STFC Jan 23, 2025
d45d450
Test changes
William-Edwards-STFC Jan 23, 2025
4c36846
change for tests
William-Edwards-STFC Jan 23, 2025
0954cd1
Change to test new mock uows changes
William-Edwards-STFC Jan 23, 2025
fd5920b
Change to test
William-Edwards-STFC Jan 23, 2025
e4a9b7c
restart tests with updated mock server
William-Edwards-STFC Jan 23, 2025
eb3eb39
Change api key env variable
William-Edwards-STFC Jan 27, 2025
ae6f86f
Move generated outside of src
William-Edwards-STFC Jan 29, 2025
48bedf5
Made a mistake in the workflow file
William-Edwards-STFC Jan 29, 2025
e869170
lint fix
William-Edwards-STFC Jan 29, 2025
8e4753e
Change file permissions for shell script
William-Edwards-STFC Jan 29, 2025
a688a8d
Change the permissions for the rest of the e2e files
William-Edwards-STFC Jan 29, 2025
fdfef87
Change e2e docker file back to mockserver master
William-Edwards-STFC Jan 29, 2025
66ca2fc
Merge branch 'develop' into migrate-rest-new
mutambaraf Jan 29, 2025
71f3b48
Revert launch json back to normal
William-Edwards-STFC Jan 30, 2025
a3f4c81
Add missing bracket
William-Edwards-STFC Jan 30, 2025
6ab1edd
Merge branch 'develop' of https://github.com/UserOfficeProject/user-o…
William-Edwards-STFC Jan 30, 2025
6e88de0
Merge branch 'migrate-rest-new' of https://github.com/UserOfficeProje…
William-Edwards-STFC Jan 30, 2025
9e3c80c
Fix line spacing
William-Edwards-STFC Jan 30, 2025
ae5b090
Add if statement for uows generation in workflow file
William-Edwards-STFC Jan 30, 2025
89b746c
Merge branch 'develop' of https://github.com/UserOfficeProject/user-o…
William-Edwards-STFC Jan 31, 2025
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/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ jobs:
sdk-frontend-

- run: npm ci

- run: npm run build
env:
NODE_ENV: development
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# backend
/apps/backend/src/datasources/stfc/UOWSSoapInterface.ts
/apps/backend/docker-compose-stfc.e2e.yml
/apps/backend/openapi.yaml

# e2e
/apps/e2e/cypress/fixtures/
30 changes: 10 additions & 20 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Debug on chrome",
"request": "launch",
"type": "pwa-chrome",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
},
{
"name": "Attach to Windows Docker container",
"type": "node",
"request": "attach",
"port": 9229,
"protocol": "inspector",
"localRoot": "${workspaceFolder}",
"remoteRoot": "C:\\app"
}
{
"name": "Attach to Docker container",
"type": "node",
"request": "attach",
"port": 9229,
"protocol": "inspector",
"localRoot": "${workspaceFolder}/apps/backend",
"remoteRoot": "/app"
}
]
}
}
4 changes: 2 additions & 2 deletions apps/backend/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ coverage/*
/src/public/
# custom definition files
/src/types/
# auto-generated SOAP client for the STFC UserOfficeWebService
/src/datasources/stfc/UOWSSoapInterface.ts
# auto-generated REST client for the STFC UserOfficeWebService
openapi.yaml
2 changes: 2 additions & 0 deletions apps/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ RUN mkdir -p /home/node/app
WORKDIR /home/node/app

COPY --chown=node:node package*.json ./
COPY openapi.yaml openapi.yaml

RUN npm ci --loglevel error --no-fund
RUN npm run generate:uows

COPY --chown=node:node . .

Expand Down
2 changes: 1 addition & 1 deletion apps/backend/docker-compose-stfc.e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
- 1080:1080

mockserver-client:
image: "ghcr.io/userofficeproject/stfc-mockserver-client:master"
image: "ghcr.io/userofficeproject/stfc-mockserver-client:rest-migration"
command: sh -c "sleep 5 && node src/mockserver.js"
depends_on:
- mockServer
Loading
Loading