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(DTFS-7052): added GET /geospatial/addresses/postcode endpoint for Ordnance Survey API data #804

Merged
merged 61 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2cdd0de
feat(DTFS2-7052): new API modules and endpoint /api/v1/geospatial/add…
avaitonis Apr 10, 2024
14a6a08
feat(DTFS2-7052): new module geospatial
avaitonis Apr 10, 2024
17fea54
feat(DTFS2-7052): fixed lint errors
avaitonis Apr 10, 2024
a3d5433
feat(DTFS2-7052): adding constants and examples
avaitonis Apr 10, 2024
0b79772
feat(DTFS2-7052): adding typescript include for json files, to satify…
avaitonis Apr 10, 2024
1b6cf30
feat(DTFS2-7052): trying to automate husky run on commit
avaitonis Apr 10, 2024
5fbf3d7
feat(DTFS2-7052): trying to automate husky run on commit
avaitonis Apr 10, 2024
889fe1b
feat(DTFS2-7052): change husky install to same way as in DTFS project
avaitonis Apr 10, 2024
21f8006
feat(DTFS2-7052): work in progress of geospatial-get-address api tests
avaitonis Apr 11, 2024
3259347
feat(DTFS2-7052): package update
avaitonis Apr 11, 2024
c8cb1bc
feat(DTFS2-7052): api-tests for geospatial/get-address-by-postcode
avaitonis Apr 11, 2024
c91144d
feat(DTFS2-7052): refactor api tests to match TFS and solve type issues
avaitonis Apr 11, 2024
837a482
feat(DTFS2-7052): tests for ordnance survey API endpoint
avaitonis Apr 15, 2024
db50210
feat(DTFS2-7052): fix address line 1 formating
avaitonis Apr 15, 2024
0d86a35
Merge remote-tracking branch 'origin/main' into feat/DTFS2-7052/new-e…
avaitonis Apr 15, 2024
4c503ca
feat(DTFS2-7052): spelling fix
avaitonis Apr 15, 2024
252b5a1
feat(DTFS2-7052): renaming enums/geospatial.ts to enums/geospatialCou…
avaitonis Apr 18, 2024
e9750f4
Merge remote-tracking branch 'origin/main' into feat/DTFS2-7052/new-e…
avaitonis Apr 18, 2024
f33edc5
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 23, 2024
b673376
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 23, 2024
fb2d4bc
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 23, 2024
b7a727c
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 23, 2024
841268f
Update src/modules/geospatial/geospatial.service.test.ts
avaitonis Apr 23, 2024
7f1110d
Update src/modules/geospatial/geospatial.service.test.ts
avaitonis Apr 23, 2024
ff5ac7b
feat(DTFS2-7052): improve address test data
avaitonis Apr 23, 2024
df90b33
Merge branch 'feat/DTFS2-7052/new-external-ordnance-survey-api' of ht…
avaitonis Apr 23, 2024
f68ac66
feat(DTFS2-7052): applying Oscars suggestions on my PR
avaitonis Apr 24, 2024
75b34ac
feat(DTFS2-7052): moving uk postcode regex to constants and doc impro…
avaitonis Apr 25, 2024
5a0ee93
feat(DTFS2-7052): comments copy and variable name improvements
avaitonis Apr 25, 2024
6bf5a4d
feat(DTFS2-7052): typescript type improvement in api-test helper
avaitonis Apr 25, 2024
de7a0e5
feat(DTFS2-7052): moving address examples to constants
avaitonis Apr 25, 2024
c7ac787
feat(DTFS2-7052): updating spec snapshot
avaitonis Apr 25, 2024
14ea1e6
Update src/modules/geospatial/dto/get-addresses-response.dto.ts
avaitonis Apr 25, 2024
1c0bf2c
Update src/modules/geospatial/dto/get-addresses-response.dto.ts
avaitonis Apr 25, 2024
129b364
Update src/modules/geospatial/dto/get-addresses-response.dto.ts
avaitonis Apr 25, 2024
2733003
Update src/modules/geospatial/dto/get-addresses-response.dto.ts
avaitonis Apr 25, 2024
fa73657
feat(DTFS2-7052): updating api spec definition
avaitonis Apr 25, 2024
3e215d7
feat(DTFS2-7052): updating api spec snapshot
avaitonis Apr 25, 2024
70e5861
Update src/modules/geospatial/geospatial.controller.ts
avaitonis Apr 25, 2024
021bdd4
Update src/modules/geospatial/geospatial.controller.ts
avaitonis Apr 25, 2024
d546834
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 25, 2024
5cc2412
Update src/modules/geospatial/geospatial.controller.test.ts
avaitonis Apr 25, 2024
ad617e2
Update test/geospatial/get-address-by-postcode.api-test.ts
avaitonis Apr 25, 2024
67d682e
Update src/modules/geospatial/geospatial.service.test.ts
avaitonis Apr 25, 2024
708533b
Update test/geospatial/get-address-by-postcode.api-test.ts
avaitonis Apr 25, 2024
7d15b07
feat(DTFS2-7052): actioning PR comments
avaitonis Apr 25, 2024
e012eb4
feat(DTFS2-7052): actioning PR comments
avaitonis Apr 25, 2024
15743c0
feat(DTFS2-7052): updating API spec
avaitonis Apr 25, 2024
c020867
feat(DTFS2-7052): changing variables to use plural
avaitonis Apr 25, 2024
e1ecd0d
Update test/support/generator/get-geospatial-addresses-generator.ts
avaitonis Apr 25, 2024
a6f33b4
Update src/helper-modules/ordnance-survey/ordnance-survey.service.tes…
avaitonis Apr 25, 2024
370c342
Update src/helper-modules/ordnance-survey/ordnance-survey.service.tes…
avaitonis Apr 25, 2024
90eb4d3
Update src/helper-modules/ordnance-survey/ordnance-survey.service.tes…
avaitonis Apr 25, 2024
3ca57f0
feat(DTFS2-7049): adding new env variables to docker-compose.yml
avaitonis Apr 25, 2024
132d179
feat(DTFS2-7052): downgrade @commitlint/cli from 19.3.0 to 18.6.0
avaitonis Apr 29, 2024
32aa1ef
feat(DTFS2-7052): removing unused class GetSearchPostcodeOrdnanceSurv…
avaitonis Apr 29, 2024
38939db
feat(DTFS2-7052): code style improvements based on PR feedback
avaitonis May 13, 2024
33c9e65
feat(DTFS2-7052): change GET /geospatial/addresses/postcode?postcode=…
avaitonis May 13, 2024
3751992
feat(DTFS2-7052): changed numeric status code 200 to HttpStatus.OK, b…
avaitonis May 13, 2024
18fdf4a
feat(DTFS2-7052): changed documentation for .env setting ORDNANCE_SUR…
avaitonis May 13, 2024
0da25c3
feat(DTFS2-7052): tidying up map function
avaitonis May 13, 2024
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
14 changes: 13 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,19 @@
"ukef",
"venv",
"VNET",
"CICD"
"CICD",
"DPA",
"UPRN",
"UDPRN",
"BLPU",
"TOID",
"EPSG",
"WOGAN",
"osgb",
"HJLNP",
"Zabd",
"hjlnp",
"BLPUs"
],
"dictionaries": [
"en-gb",
Expand Down
8 changes: 7 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ APIM_INFORMATICA_URL=
APIM_INFORMATICA_USERNAME=
APIM_INFORMATICA_PASSWORD=
APIM_INFORMATICA_MAX_REDIRECTS=
APIM_INFORMATICA_TIMEOUT=
APIM_INFORMATICA_TIMEOUT= # in milliseconds

# ORDNANCE SURVEY
ORDNANCE_SURVEY_URL=https://api.os.uk
ORDNANCE_SURVEY_KEY=
ORDNANCE_SURVEY_MAX_REDIRECTS=
ORDNANCE_SURVEY_TIMEOUT= # in milliseconds
9 changes: 6 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"plugin:eslint-comments/recommended",
"plugin:optimize-regex/recommended",
"plugin:switch-case/recommended",
"plugin:security/recommended",
"plugin:security/recommended-legacy",
"plugin:import/recommended",
"plugin:import/typescript",
"prettier"
],
"parserOptions": {
"project": "tsconfig.json",
"ecmaVersion": 2020,
"ecmaVersion": "latest",
"sourceType": "module"
},
"env": {
Expand Down Expand Up @@ -110,7 +110,10 @@
"consistent-return": "off",
"no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": "error",
"unused-imports/no-unused-vars": [
"error",
{ "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
],
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "off",
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,7 @@
1. `fix:` which represents bug fixes, and correlates to a [SemVer](https://semver.org/) **patch**.
2. `feat:` which represents a new feature, and correlates to a [SemVer](https://semver.org/) **minor**.
3. `feat!:`, `fix!:` or `refactor!:`, etc., which represent a breaking change (indicated by the `!`) and will result in a [SemVer](https://semver.org/) **major**.

### Special notes for .env settings

- ORDNANCE_SURVEY_URL - Domain [https://api.os.co.uk](https://api.os.co.uk) redirects to [https://api.os.uk](https://api.os.uk), so please use [https://api.os.uk](https://api.os.uk).

Check notice on line 161 in README.md

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

README.md#L161

Expected: 80; Actual: 182
4 changes: 4 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ services:
APIM_INFORMATICA_PASSWORD:
APIM_INFORMATICA_MAX_REDIRECTS:
APIM_INFORMATICA_TIMEOUT:
ORDNANCE_SURVEY_URL:
ORDNANCE_SURVEY_KEY:
ORDNANCE_SURVEY_MAX_REDIRECTS:
ORDNANCE_SURVEY_TIMEOUT:
API_KEY:
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${PORT}"]
Expand Down
1 change: 1 addition & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const defaultSettings = {
'@ukef/config/(.*)': '<rootDir>/../src/config/$1',
'@ukef/database/(.*)': '<rootDir>/../src/modules/database/$1',
'@ukef/helpers/(.*)': '<rootDir>/../src/helpers/$1',
'@ukef/helper-modules/(.*)': '<rootDir>/../src/helper-modules/$1',
'@ukef/modules/(.*)': '<rootDir>/../src/modules/$1',
'@ukef/auth/(.*)': '<rootDir>/../src/modules/auth/$1',
'@ukef/(.*)': '<rootDir>/../src/$1',
Expand Down
Loading
Loading