From 4fe849781aab41602a90f45387dbb86a6a8f8d1f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Oct 2024 07:14:34 +0000 Subject: [PATCH] 9.1.0 Automatically generated by python-semantic-release --- CHANGELOG.md | 1119 ++++++++++++++++++++++++++---------------------- pyproject.toml | 2 +- 2 files changed, 614 insertions(+), 507 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7f0b81..9bb2677e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,69 @@ # CHANGELOG + +## v9.1.0 (2024-10-08) + +### Build System + +* build: Fix installation issues in modern Python 3.8+ ([`88d6390`](https://github.com/ral-facilities/datagateway-api/commit/88d63909a92a34d52fabfd5ad233440a38c58ce4)) + +### Features + +* feat: Implement `ReaderQueryHandler` for entity and count endpoints ([`60c5254`](https://github.com/ral-facilities/datagateway-api/commit/60c5254dd6006d213934c4cb48f4ac37fab32ea3)) + +### Unknown + +* Merge pull request #488 from ral-facilities/reader-performance-query + +Implement Reader Performance Queries for /datafiles and /datasets ([`7fba647`](https://github.com/ral-facilities/datagateway-api/commit/7fba64795481bdbf60e88d7976fb741dca720f3b)) + +* Add tests for reader performance queries ([`e361e2b`](https://github.com/ral-facilities/datagateway-api/commit/e361e2bc7bfa6d3ca72f3e8285c349911df451f4)) + +* Add columns to drop list for SQL dump diff + +- The final diff in the CI will still fail because `main` doesn't contain these dropped columns, but the initial diff to check that two runs produce identical data should pass ([`b7b2b07`](https://github.com/ral-facilities/datagateway-api/commit/b7b2b072947a0f2e62790bbbb6530eff86855482)) + +* Upgrade dependencies and ignore vulnerabilities + +- As ever, the vulnerabilities that are being ignored are because we cannot upgrade due to being tied to 3.6 ([`642ea8b`](https://github.com/ral-facilities/datagateway-api/commit/642ea8b766eb2640bf8602a9ec9bb3afbe96f0a0)) + +* Code cleanup + +- Add docstrings +- Remove client_pool kwargs +- Add type hints +- Fix any outstanding linting issues ([`a36b607`](https://github.com/ral-facilities/datagateway-api/commit/a36b607626829d800fcdac8fae36a7e9a7aa491a)) + +* Improve exception handling on reader account login + +- If there's an issue when logging in (e.g. due to invalid credentials), the user will now return a 500, not a 403 ([`74185f9`](https://github.com/ral-facilities/datagateway-api/commit/74185f971ec4a9addf9914744c61fceda8a1714c)) + +* Move import and remove whitespace ([`c5325b0`](https://github.com/ral-facilities/datagateway-api/commit/c5325b01b82014b82e104432c53c4fb43f613759)) + +* Do config check before ReaderQueryHandler creation ([`dca658f`](https://github.com/ral-facilities/datagateway-api/commit/dca658f56bac66a715c6920ef7566186f4ae5ba7)) + +* Ensure reader client only initialised once ([`7b4d5af`](https://github.com/ral-facilities/datagateway-api/commit/7b4d5afe34be3f740c803f33ebbbfe63d063eb1e)) + +* Remove unused imports ([`11f4a7b`](https://github.com/ral-facilities/datagateway-api/commit/11f4a7b778788b4e0365357dd4ff3e0112086872)) + +* Move reader_client into ReaderQueryHandler ([`6a5d1e5`](https://github.com/ral-facilities/datagateway-api/commit/6a5d1e5a0715f04697f680b168b961d8bbd264d4)) + +* Add entity type lookup when checking user access ([`6eed052`](https://github.com/ral-facilities/datagateway-api/commit/6eed052f01d0bdfde8065748a6a5ac6660680692)) + +* Use clients from the pool for reader queries ([`b47391a`](https://github.com/ral-facilities/datagateway-api/commit/b47391adf891549c809be6cd0c629198cc4bc007)) + +* Ensure API works when reader config isn't present in config file ([`292cfef`](https://github.com/ral-facilities/datagateway-api/commit/292cfef83aa472e1555d1688aaeac801245fb744)) + +* Add repr for WHERE filter to make logging them more readable ([`350480b`](https://github.com/ral-facilities/datagateway-api/commit/350480ba7ea4fdfa86035b3a96770bbc2c2ffbcd)) + +* Add class to handle queries which should be done by reader account ([`c9449f4`](https://github.com/ral-facilities/datagateway-api/commit/c9449f4088f8b2403dbddde4d48aab5772a66d56)) + +* Add config section for reader performance query option ([`720dbf4`](https://github.com/ral-facilities/datagateway-api/commit/720dbf4b77e0ab7332d09b18c78e896a79b0675f)) + + ## v9.0.3 (2024-08-01) -### Build +### Build System * build(deps): bump python-semantic-release/python-semantic-release @@ -18,27 +79,27 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`55061c3`](https://github.com/ral-facilities/datagateway-api/commit/55061c39e8b504e6b52319a5912ebe8b06ccce7d)) +Signed-off-by: dependabot[bot] ([`55061c3`](https://github.com/ral-facilities/datagateway-api/commit/55061c39e8b504e6b52319a5912ebe8b06ccce7d)) -### Ci +### Code Style -* ci: Add more ignores on Safety session ([`a72af44`](https://github.com/ral-facilities/datagateway-api/commit/a72af4496c946850666d858d1f2e17214e466777)) +* style: Fix whitespace issues #486 ([`1b4cfc1`](https://github.com/ral-facilities/datagateway-api/commit/1b4cfc10497d67f37bd8e15d2bb55db90f97c7bb)) -### Fix +### Continuous Integration -* fix: Upgrade dependencies and ignore further vulnerabilities ([`303529d`](https://github.com/ral-facilities/datagateway-api/commit/303529de6cdcc5f3244a784336d4d375d82b4744)) +* ci: Add more ignores on Safety session ([`a72af44`](https://github.com/ral-facilities/datagateway-api/commit/a72af4496c946850666d858d1f2e17214e466777)) -* fix: Update icat_db_generator.py to properly set datafileCreateTime & datafileModTime #486 ([`23ac563`](https://github.com/ral-facilities/datagateway-api/commit/23ac56381a0d69eb2d707ca7edae0a2e1297711a)) +### Fixes -### Style +* fix: Upgrade dependencies and ignore further vulnerabilities ([`303529d`](https://github.com/ral-facilities/datagateway-api/commit/303529de6cdcc5f3244a784336d4d375d82b4744)) -* style: Fix whitespace issues #486 ([`1b4cfc1`](https://github.com/ral-facilities/datagateway-api/commit/1b4cfc10497d67f37bd8e15d2bb55db90f97c7bb)) +* fix: Update icat_db_generator.py to properly set datafileCreateTime & datafileModTime #486 ([`23ac563`](https://github.com/ral-facilities/datagateway-api/commit/23ac56381a0d69eb2d707ca7edae0a2e1297711a)) ### Unknown * Merge pull request #487 from ral-facilities/#486-fix-datafileCreateTime-datafileModTime -Update icat_db_generator.py to properly set datafileCreateTime & datafileModTime ([`7ecf5d9`](https://github.com/ral-facilities/datagateway-api/commit/7ecf5d99fb32254cfbd0f21910d33a51fab69156)) +Update icat_db_generator.py to properly set datafileCreateTime & datafileModTime ([`7ecf5d9`](https://github.com/ral-facilities/datagateway-api/commit/7ecf5d99fb32254cfbd0f21910d33a51fab69156)) * Merge pull request #469 from ral-facilities/safety-ignore @@ -48,17 +109,18 @@ Add more ignores on Safety session ([`a9f336c`](https://github.com/ral-facilitie build(deps): bump python-semantic-release/python-semantic-release from 8.0.8 to 8.3.0 ([`5ac810a`](https://github.com/ral-facilities/datagateway-api/commit/5ac810a2d99965bce4ffea685641432a542a0a07)) + ## v9.0.2 (2024-01-04) -### Ci +### Continuous Integration * ci: Ignore Safety vulnerabilities #467 -- As normal, we can't upgrade because all patched versions have dropped support for Python 3.6 ([`05b3e13`](https://github.com/ral-facilities/datagateway-api/commit/05b3e13c64fef1913b5cc15ba9d32fe112f322a6)) +- As normal, we can't upgrade because all patched versions have dropped support for Python 3.6 ([`05b3e13`](https://github.com/ral-facilities/datagateway-api/commit/05b3e13c64fef1913b5cc15ba9d32fe112f322a6)) * ci: Add job to test that the API can be installed via Pip #467 ([`8c2258d`](https://github.com/ral-facilities/datagateway-api/commit/8c2258d3c9abe2ba149a893b335465efa67cb6e5)) -### Fix +### Fixes * fix: Pin Flask to 2.0.3 in `pyproject.toml` #467 @@ -70,15 +132,16 @@ build(deps): bump python-semantic-release/python-semantic-release from 8.0.8 to Fix Pip Install Issues ([`2d7736f`](https://github.com/ral-facilities/datagateway-api/commit/2d7736f7300ae0640772b57333638a2d3a962e34)) + ## v9.0.1 (2023-09-07) -### Ci +### Continuous Integration * ci: fix Safety CI job -- As ever, we're having to ignore these vulnerabilities as patched versions don't support Python 3.6 ([`04c3eaf`](https://github.com/ral-facilities/datagateway-api/commit/04c3eaf6a35466ad77d2b0551ca2b994be8ea040)) +- As ever, we're having to ignore these vulnerabilities as patched versions don't support Python 3.6 ([`04c3eaf`](https://github.com/ral-facilities/datagateway-api/commit/04c3eaf6a35466ad77d2b0551ca2b994be8ea040)) -### Fix +### Fixes * fix: Make `DataPublicationDate.date` to be different to `DataPublication.publicationDate` #444 ([`312c466`](https://github.com/ral-facilities/datagateway-api/commit/312c466030c0e12131fd575011da273c8b5a267c)) @@ -92,7 +155,8 @@ Fix Pip Install Issues ([`2d7736f`](https://github.com/ral-facilities/datagatewa fix: #444 Generate publication dates between two specific dates ([`b21002e`](https://github.com/ral-facilities/datagateway-api/commit/b21002ee55d869a69f178267ff12368f428776c0)) -* Merge branch 'main' into bugfix/data-publication-dates-#444 ([`9916813`](https://github.com/ral-facilities/datagateway-api/commit/99168139fe01959740247abbfb26b88f0d82688e)) +* Merge branch 'main' into bugfix/data-publication-dates-#444 ([`9916813`](https://github.com/ral-facilities/datagateway-api/commit/99168139fe01959740247abbfb26b88f0d82688e)) + ## v9.0.0 (2023-09-01) @@ -100,7 +164,7 @@ Fix Pip Install Issues ([`2d7736f`](https://github.com/ral-facilities/datagatewa * feat!: Remove code and references to ISIS specific table endpoints #432 ([`12e0304`](https://github.com/ral-facilities/datagateway-api/commit/12e030494c1fc658b36c23c55bd73be780079dba)) -### Build +### Build System * build(deps): bump python-semantic-release/python-semantic-release @@ -116,7 +180,7 @@ updated-dependencies: update-type: version-update:semver-major ... -Signed-off-by: dependabot[bot] <support@github.com> ([`7216beb`](https://github.com/ral-facilities/datagateway-api/commit/7216beb0dc6fd43de41bf37d9163b4c14f85fd3e)) +Signed-off-by: dependabot[bot] ([`7216beb`](https://github.com/ral-facilities/datagateway-api/commit/7216beb0dc6fd43de41bf37d9163b4c14f85fd3e)) * build(deps): bump actions/checkout from 3.5.2 to 3.6.0 @@ -132,7 +196,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`806367d`](https://github.com/ral-facilities/datagateway-api/commit/806367df1cb0a2cd7cfe84eaaa25a62aecd9215c)) +Signed-off-by: dependabot[bot] ([`806367d`](https://github.com/ral-facilities/datagateway-api/commit/806367df1cb0a2cd7cfe84eaaa25a62aecd9215c)) * build(deps): bump actions/setup-java from 3.11.0 to 3.12.0 @@ -147,7 +211,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`291abff`](https://github.com/ral-facilities/datagateway-api/commit/291abff791bd4f6388d7e6e1e2721eaa681d8876)) +Signed-off-by: dependabot[bot] ([`291abff`](https://github.com/ral-facilities/datagateway-api/commit/291abff791bd4f6388d7e6e1e2721eaa681d8876)) * build(deps): bump actions/setup-python from 4.6.0 to 4.7.0 @@ -162,7 +226,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`5d0f4eb`](https://github.com/ral-facilities/datagateway-api/commit/5d0f4eba36c6d4dc078e54a6d7b40549ded28084)) +Signed-off-by: dependabot[bot] ([`5d0f4eb`](https://github.com/ral-facilities/datagateway-api/commit/5d0f4eba36c6d4dc078e54a6d7b40549ded28084)) * build(deps): bump codecov/codecov-action from 3.1.3 to 3.1.4 @@ -178,7 +242,7 @@ updated-dependencies: update-type: version-update:semver-patch ... -Signed-off-by: dependabot[bot] <support@github.com> ([`52683d6`](https://github.com/ral-facilities/datagateway-api/commit/52683d6baa399d4781af1cac056e7b616c5da173)) +Signed-off-by: dependabot[bot] ([`52683d6`](https://github.com/ral-facilities/datagateway-api/commit/52683d6baa399d4781af1cac056e7b616c5da173)) * build: Update PyYAML to fix 3.10 CI tests ([`82c3495`](https://github.com/ral-facilities/datagateway-api/commit/82c3495a9e883e2119d658f18b5bf976151ef007)) @@ -196,9 +260,9 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`c07bf92`](https://github.com/ral-facilities/datagateway-api/commit/c07bf9296fe4242e49b0104f05cec40dfcaafac8)) +Signed-off-by: dependabot[bot] ([`c07bf92`](https://github.com/ral-facilities/datagateway-api/commit/c07bf9296fe4242e49b0104f05cec40dfcaafac8)) -### Ci +### Continuous Integration * ci: Ignore new vulernabilties that cannot be fixed ([`97cb59e`](https://github.com/ral-facilities/datagateway-api/commit/97cb59e15dadeb3fc225f07d2b7d9f0fa7b42f1e)) @@ -210,7 +274,7 @@ Signed-off-by: dependabot[bot] <support@github.com> ([`c07bf92`](https://g * ci: remove reference to setuptools issue across CI -- This is no longer needed as Python ICAT 1.0 is now used, which doesn't require an older version of setuptools ([`bd0a1ad`](https://github.com/ral-facilities/datagateway-api/commit/bd0a1adec903326daa187204e0893b4f29220764)) +- This is no longer needed as Python ICAT 1.0 is now used, which doesn't require an older version of setuptools ([`bd0a1ad`](https://github.com/ral-facilities/datagateway-api/commit/bd0a1adec903326daa187204e0893b4f29220764)) ### Unknown @@ -218,7 +282,7 @@ Signed-off-by: dependabot[bot] <support@github.com> ([`c07bf92`](https://g feat!: Remove code and references to ISIS specific table endpoints ([`2825ea2`](https://github.com/ral-facilities/datagateway-api/commit/2825ea2fb3f3061dfe0ab7d6f02ed730691a4c32)) -* Merge branch 'main' into remove-isis-endpoints-#432 ([`e667c78`](https://github.com/ral-facilities/datagateway-api/commit/e667c78508e9a4532a3b4654aa15aa94d0947e61)) +* Merge branch 'main' into remove-isis-endpoints-#432 ([`e667c78`](https://github.com/ral-facilities/datagateway-api/commit/e667c78508e9a4532a3b4654aa15aa94d0947e61)) * Merge pull request #445 from ral-facilities/dependabot/github_actions/python-semantic-release/python-semantic-release-8.0.8 @@ -312,7 +376,7 @@ build(deps): bump codecov/codecov-action from 3.1.3 to 3.1.4 ([`ea38bbc`](https: --------- -Co-authored-by: Alan Kyffin <alan.kyffin@stfc.ac.uk> ([`176417b`](https://github.com/ral-facilities/datagateway-api/commit/176417b84571f02f24aeae4afb8642a0700c771e)) +Co-authored-by: Alan Kyffin ([`176417b`](https://github.com/ral-facilities/datagateway-api/commit/176417b84571f02f24aeae4afb8642a0700c771e)) * Merge pull request #449 from ral-facilities/ci-failures @@ -356,7 +420,7 @@ updated-dependencies: update-type: version-update:semver-patch ... -Signed-off-by: dependabot[bot] <support@github.com> ([`f2b3e1d`](https://github.com/ral-facilities/datagateway-api/commit/f2b3e1d357e722fe13e8bddb3ce00b55c4f35dce)) +Signed-off-by: dependabot[bot] ([`f2b3e1d`](https://github.com/ral-facilities/datagateway-api/commit/f2b3e1d357e722fe13e8bddb3ce00b55c4f35dce)) * Merge pull request #417 from ral-facilities/dependabot/github_actions/actions/setup-python-4.6.0 @@ -375,7 +439,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`457cb3c`](https://github.com/ral-facilities/datagateway-api/commit/457cb3c3aca67ba122113b11bb11c6aa6115f698)) +Signed-off-by: dependabot[bot] ([`457cb3c`](https://github.com/ral-facilities/datagateway-api/commit/457cb3c3aca67ba122113b11bb11c6aa6115f698)) * Merge pull request #418 from ral-facilities/dependabot/github_actions/codecov/codecov-action-3.1.3 @@ -395,7 +459,8 @@ updated-dependencies: update-type: version-update:semver-patch ... -Signed-off-by: dependabot[bot] <support@github.com> ([`ea6cd29`](https://github.com/ral-facilities/datagateway-api/commit/ea6cd2933ef6a790d24b03e86422246189f69650)) +Signed-off-by: dependabot[bot] ([`ea6cd29`](https://github.com/ral-facilities/datagateway-api/commit/ea6cd2933ef6a790d24b03e86422246189f69650)) + ## v8.0.0 (2023-04-25) @@ -403,7 +468,7 @@ Signed-off-by: dependabot[bot] <support@github.com> ([`ea6cd29`](https://g * fix!: add url_prefix param to fix swagger docs at non-root paths #408 ([`49632ea`](https://github.com/ral-facilities/datagateway-api/commit/49632ea19f6dc24e0174c2dfa47ffc253261db3d)) -### Ci +### Continuous Integration * ci: pin Python Semantic Release action to commit SHA #397 ([`53a6993`](https://github.com/ral-facilities/datagateway-api/commit/53a6993211d58c7c3327fdfccdca18bb31f03929)) @@ -419,7 +484,7 @@ Fix swagger docs at non-root paths #408 ([`d557d04`](https://github.com/ral-faci * Add url_prefix to paths in OpenAPI definition ([`0ed0078`](https://github.com/ral-facilities/datagateway-api/commit/0ed0078e88a2dec7eb43f6452fb63d6d24674ab9)) -* Merge branch 'main' into bugfix/improve-url-prefix-handling-408 ([`d88d295`](https://github.com/ral-facilities/datagateway-api/commit/d88d2959605d1cece26bd2502f6c74f67709fae4)) +* Merge branch 'main' into bugfix/improve-url-prefix-handling-408 ([`d88d295`](https://github.com/ral-facilities/datagateway-api/commit/d88d2959605d1cece26bd2502f6c74f67709fae4)) * Merge pull request #413 from ral-facilities/dependabot/github_actions/actions/setup-java-3.11.0 ([`5258698`](https://github.com/ral-facilities/datagateway-api/commit/52586989b9990a62f42eabc11635d0323f64bd56)) @@ -436,7 +501,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`db27fff`](https://github.com/ral-facilities/datagateway-api/commit/db27fff081b967987dd4057b7c9bc852d2e861e5)) +Signed-off-by: dependabot[bot] ([`db27fff`](https://github.com/ral-facilities/datagateway-api/commit/db27fff081b967987dd4057b7c9bc852d2e861e5)) * Merge pull request #412 from ral-facilities/dependabot/github_actions/actions/checkout-3.5.0 ([`b072c5c`](https://github.com/ral-facilities/datagateway-api/commit/b072c5cef759c5fef68456276a13d33dec975241)) @@ -454,7 +519,7 @@ updated-dependencies: update-type: version-update:semver-minor ... -Signed-off-by: dependabot[bot] <support@github.com> ([`b31d769`](https://github.com/ral-facilities/datagateway-api/commit/b31d769d08a6f7954f44275b228c2fdffd0d15f4)) +Signed-off-by: dependabot[bot] ([`b31d769`](https://github.com/ral-facilities/datagateway-api/commit/b31d769d08a6f7954f44275b228c2fdffd0d15f4)) * Merge pull request #406 from ral-facilities/fix/address-github-actions-warnings-#397 @@ -466,15 +531,16 @@ Address GitHub Actions warnings ([`5807986`](https://github.com/ral-facilities/d * Add integration test for Swagger UI ([`1daa60d`](https://github.com/ral-facilities/datagateway-api/commit/1daa60d49d8eabbcc129d48a23afc64d509f3260)) -* Fix linting errors & update existing unit tests ([`fb3d05a`](https://github.com/ral-facilities/datagateway-api/commit/fb3d05a06ef5197e03d673d2e392ea72e62adfe0)) +* Fix linting errors & update existing unit tests ([`fb3d05a`](https://github.com/ral-facilities/datagateway-api/commit/fb3d05a06ef5197e03d673d2e392ea72e62adfe0)) + ## v7.1.0 (2023-03-23) -### Build +### Build System * build: deal with Safety errors #405 ([`1f528bd`](https://github.com/ral-facilities/datagateway-api/commit/1f528bdbdce295190ca8037c05e2a415d85edd76)) -### Feature +### Features * feat: Add icat 5 entity generation to the data generator script ([`579e321`](https://github.com/ral-facilities/datagateway-api/commit/579e321d9ae368d5840e602154bdb155e902478b)) @@ -486,7 +552,7 @@ Feature/icat 5 entity generation ([`194afcc`](https://github.com/ral-facilities/ * Change entity name to camelCase -- The previous version works for Python ICAT 1.0, but this is how all the other entities are cased and it means the script is compatible with Python ICAT < 1.0 ([`07a4e23`](https://github.com/ral-facilities/datagateway-api/commit/07a4e235e8007222a9975459b0255de4719c3a6d)) +- The previous version works for Python ICAT 1.0, but this is how all the other entities are cased and it means the script is compatible with Python ICAT < 1.0 ([`07a4e23`](https://github.com/ral-facilities/datagateway-api/commit/07a4e235e8007222a9975459b0255de4719c3a6d)) * fix DataPublciation ([`12975aa`](https://github.com/ral-facilities/datagateway-api/commit/12975aa1f83821bdb940f3d1b5da475bf2789474)) @@ -494,6 +560,7 @@ Feature/icat 5 entity generation ([`194afcc`](https://github.com/ral-facilities/ * Datapublications and Datasets ([`768f9d9`](https://github.com/ral-facilities/datagateway-api/commit/768f9d9bff31485cb98cdc6d95e4680e8d15d70e)) + ## v7.0.0 (2023-02-24) ### Documentation @@ -506,11 +573,12 @@ Feature/icat 5 entity generation ([`194afcc`](https://github.com/ral-facilities/ Query filter and scoring ([`a09748c`](https://github.com/ral-facilities/datagateway-api/commit/a09748c78ae2b88054071b719d3a9cd9f2a5ba50)) -* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`d47a45d`](https://github.com/ral-facilities/datagateway-api/commit/d47a45dd675b4a31ff6dfc1bfbf70560571e93aa)) +* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`d47a45d`](https://github.com/ral-facilities/datagateway-api/commit/d47a45dd675b4a31ff6dfc1bfbf70560571e93aa)) + ## v6.3.2 (2023-02-24) -### Fix +### Fixes * fix: add triggers for later stages of consistency test ([`2d7d677`](https://github.com/ral-facilities/datagateway-api/commit/2d7d677fbab85a93fb36fc12afb434ba74dbfc27)) @@ -530,13 +598,14 @@ fix: add triggers for later stages of consistency test ([`390ec3c`](https://gith * Change user to be root ([`65fa5c4`](https://github.com/ral-facilities/datagateway-api/commit/65fa5c4a17a5580d7cca1531d1ad457cee93793e)) + ## v6.3.1 (2023-02-23) -### Fix +### Fixes * fix: Remove dataset filesize generator ([`fb466dd`](https://github.com/ral-facilities/datagateway-api/commit/fb466dd6012088fb25f575f3c7198a9d7d28e070)) -### Refactor +### Refactoring * refactor: remove `str_conditions` param from `get_search` method #398 ([`79fe589`](https://github.com/ral-facilities/datagateway-api/commit/79fe589c4ed18114286fa7dd1ad0e6990a0d2f2a)) @@ -550,7 +619,8 @@ Fix/remove dataset filesize ([`d530145`](https://github.com/ral-facilities/datag * remove commented line #398 ([`5b9db5e`](https://github.com/ral-facilities/datagateway-api/commit/5b9db5ecb6c6952a3cb225654fba57d4d65a1220)) -* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`52e1343`](https://github.com/ral-facilities/datagateway-api/commit/52e1343dbac04f4e2dfefff21660cde3ccf80198)) +* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`52e1343`](https://github.com/ral-facilities/datagateway-api/commit/52e1343dbac04f4e2dfefff21660cde3ccf80198)) + ## v6.3.0 (2023-02-17) @@ -571,13 +641,13 @@ BREAKING CHANGE: modify Search API endpoint URL paths ([`1dc815b`](https://githu BREAKING CHANGE: add scoring related values to config ([`0472d96`](https://github.com/ral-facilities/datagateway-api/commit/0472d9617b6771c6b64ebbaa49953b5583d1d3c9)) -### Feature +### Features * feat: Refactor icat generator to use python-icat ([`ae6ae0b`](https://github.com/ral-facilities/datagateway-api/commit/ae6ae0b2a2ce375fb0d47851b3091c952735f5c6)) * feat: add support for scoring results #398 ([`dd58a8b`](https://github.com/ral-facilities/datagateway-api/commit/dd58a8b4bef706b343144ab8fe14a8b4737b3781)) -### Refactor +### Refactoring * refactor: move search scoring logic to a separate module #398 ([`70cd754`](https://github.com/ral-facilities/datagateway-api/commit/70cd7544892e9c1b38df49a780bf310a7a69acc4)) @@ -589,7 +659,7 @@ BREAKING CHANGE: add scoring related values to config ([`0472d96`](https://githu * refactor: refactor implementation of `SearchAPIScoringFilter` #398 ([`9277dd3`](https://github.com/ral-facilities/datagateway-api/commit/9277dd3e45ba096d5d88f7f848b98295b49897aa)) -### Test +### Testing * test: fix tests following the changes to endpoint URLs #398 ([`5be35cd`](https://github.com/ral-facilities/datagateway-api/commit/5be35cd699cf8c6df3490a196c1acee45a6275f9)) @@ -617,7 +687,7 @@ Feature/icat backend generator#369 ([`31aad3e`](https://github.com/ral-facilitie * Fix lock file ([`b060ffe`](https://github.com/ral-facilities/datagateway-api/commit/b060ffe865d4396450484b98fc811b25ca56ac54)) -* Merge branch 'main' into feature/icat-backend-generator#369 +* Merge branch 'main' into feature/icat-backend-generator#369 Conflicts: poetry.lock ([`9616219`](https://github.com/ral-facilities/datagateway-api/commit/9616219ec2088370032573633f836195190fb936)) @@ -652,7 +722,7 @@ Conflicts: * raise an error if query filter value is not string #398 ([`83a3222`](https://github.com/ral-facilities/datagateway-api/commit/83a32220910929ab9b12ba6cc89327b56b950ad0)) -* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`4ac42b0`](https://github.com/ral-facilities/datagateway-api/commit/4ac42b057e814b588a922e29299544eacd20cef5)) +* Merge branch 'main' into 398-adapt-search-query-filter-and-scoring-to-v5 ([`4ac42b0`](https://github.com/ral-facilities/datagateway-api/commit/4ac42b057e814b588a922e29299544eacd20cef5)) * Merge pull request #393 from ral-facilities/tests/reorganise-tests#375 @@ -664,7 +734,7 @@ Tests/reorganise tests#375 ([`b08022a`](https://github.com/ral-facilities/dataga Tests/python icatv1 ([`8627dbb`](https://github.com/ral-facilities/datagateway-api/commit/8627dbb5c8a21da6ecddfbdc1c2fa1186de83a6c)) -* Merge branch 'tests/reorganise-tests#375' into tests/python_icatv1 ([`fe6b137`](https://github.com/ral-facilities/datagateway-api/commit/fe6b137ca89bcb2fb5542782270f9730c28e9f6f)) +* Merge branch 'tests/reorganise-tests#375' into tests/python_icatv1 ([`fe6b137`](https://github.com/ral-facilities/datagateway-api/commit/fe6b137ca89bcb2fb5542782270f9730c28e9f6f)) * Add prep for api for integration tests ([`35780bb`](https://github.com/ral-facilities/datagateway-api/commit/35780bbb066662b2751c5312c14a6b125539082f)) @@ -708,7 +778,7 @@ Tests/python icatv1 ([`8627dbb`](https://github.com/ral-facilities/datagateway-a * Initial reorganisation -Tests have been organised into ones that immediately work with no icat stack and ones that don't. ([`185e304`](https://github.com/ral-facilities/datagateway-api/commit/185e3048c62bffe127419df137e249145d473f08)) +Tests have been organised into ones that immediately work with no icat stack and ones that don't. ([`185e304`](https://github.com/ral-facilities/datagateway-api/commit/185e3048c62bffe127419df137e249145d473f08)) * add scoring related values to config #398 @@ -716,7 +786,7 @@ BREAKING CHANGE: add scoring related values to config ([`b3fffc2`](https://githu * Run black ([`0a3c166`](https://github.com/ral-facilities/datagateway-api/commit/0a3c1669f68e0b66a13b9f95cdf5a6663a21c534)) -* Merge branch '398-adapt-search-query-filter-and-scoring-to-v5' of https://github.com/ral-facilities/datagateway-api into 398-adapt-search-query-filter-and-scoring-to-v5 ([`ca94487`](https://github.com/ral-facilities/datagateway-api/commit/ca94487e2c463b2f61d8ada093f6d81f12f911a3)) +* Merge branch '398-adapt-search-query-filter-and-scoring-to-v5' of https://github.com/ral-facilities/datagateway-api into 398-adapt-search-query-filter-and-scoring-to-v5 ([`ca94487`](https://github.com/ral-facilities/datagateway-api/commit/ca94487e2c463b2f61d8ada093f6d81f12f911a3)) * Fixing confTest with the mising values ([`7eac557`](https://github.com/ral-facilities/datagateway-api/commit/7eac55786486b6c63e9fcf03a724257cd25a373f)) @@ -726,7 +796,7 @@ BREAKING CHANGE: add scoring related values to config ([`b3fffc2`](https://githu * Fix import error for ScoringQueryFilter #398 ([`d5d5dba`](https://github.com/ral-facilities/datagateway-api/commit/d5d5dbacc0b5a54d75813fb9526ff683bcbafad5)) -* Merge branch '398-adapt-search-query-filter-and-scoring-to-v5' of https://github.com/ral-facilities/datagateway-api into 398-adapt-search-query-filter-and-scoring-to-v5 ([`27c301f`](https://github.com/ral-facilities/datagateway-api/commit/27c301fd3a4402e41854df0b74f06ed1463fa7fa)) +* Merge branch '398-adapt-search-query-filter-and-scoring-to-v5' of https://github.com/ral-facilities/datagateway-api into 398-adapt-search-query-filter-and-scoring-to-v5 ([`27c301f`](https://github.com/ral-facilities/datagateway-api/commit/27c301fd3a4402e41854df0b74f06ed1463fa7fa)) * Fixed linting errors ([`bef75ca`](https://github.com/ral-facilities/datagateway-api/commit/bef75cae2b21c6633c1aff13dd53e3f5fc2ac177)) @@ -734,7 +804,7 @@ BREAKING CHANGE: add scoring related values to config ([`b3fffc2`](https://githu This allows to search by a keyword. Example: ``` -/search-api/documents?filter={"query":"diffraction"} +/search-api/documents?filter={"query":"diffraction"} ``` This should returns the document that are related to diffraction ([`1fee761`](https://github.com/ral-facilities/datagateway-api/commit/1fee7610cd518b463325710a6cdc11d1c4a78c92)) @@ -747,6 +817,7 @@ This should returns the document that are related to diffraction ([`1fee761`](ht * Added scoring configuration parameters ([`2f6a120`](https://github.com/ral-facilities/datagateway-api/commit/2f6a1200d03e5c94f1fb56052b6e6b2273124d75)) + ## v6.2.0 (2022-11-23) ### Unknown @@ -755,15 +826,16 @@ This should returns the document that are related to diffraction ([`1fee761`](ht Tests/db backend tests #370 ([`41c1586`](https://github.com/ral-facilities/datagateway-api/commit/41c1586ed256a499064bef5b4906f8979fbd52ff)) -* Merge branch 'main' into tests/db-backend-tests-#370 ([`b9831bd`](https://github.com/ral-facilities/datagateway-api/commit/b9831bd701f1b43b9f3a36e110c28eafb3e5d926)) +* Merge branch 'main' into tests/db-backend-tests-#370 ([`b9831bd`](https://github.com/ral-facilities/datagateway-api/commit/b9831bd701f1b43b9f3a36e110c28eafb3e5d926)) + ## v6.1.1 (2022-11-23) -### Fix +### Fixes * fix: do not attempt to create related entities if not included #387 ([`819e7a1`](https://github.com/ral-facilities/datagateway-api/commit/819e7a1582d8d108fe5f18b210c08d67cd0a3845)) -### Test +### Testing * test: fix failing tests #387 ([`fcbfb0f`](https://github.com/ral-facilities/datagateway-api/commit/fcbfb0ff8bb58b676d7ba4ea83f8d480b5c6c910)) @@ -773,9 +845,10 @@ Tests/db backend tests #370 ([`41c1586`](https://github.com/ral-facilities/datag Creation of related entities attempted when not specified to be included ([`1e6c600`](https://github.com/ral-facilities/datagateway-api/commit/1e6c6008fd0bfcf8e18f381d7b9af3fb31ea161e)) + ## v6.1.0 (2022-11-23) -### Ci +### Continuous Integration * ci: Main branch uses yaml config not json ([`0b6151b`](https://github.com/ral-facilities/datagateway-api/commit/0b6151babd1c111c70c8c9755f5abdbedcbdad57)) @@ -783,7 +856,7 @@ Creation of related entities attempted when not specified to be included ([`1e6c * docs: Updated postman collection with new entities ([`c4b850f`](https://github.com/ral-facilities/datagateway-api/commit/c4b850f913dbded35e6b1a88c8f8d8e1b36cbdec)) -### Feature +### Features * feat: Add new entity endpoints for icat5 ([`dc14f9f`](https://github.com/ral-facilities/datagateway-api/commit/dc14f9f8aeb5a9849bc69cf647bf068b04a63d81)) @@ -809,6 +882,7 @@ Add icat5 endpoints ([`3943ec4`](https://github.com/ral-facilities/datagateway-a ci: Main branch uses yaml config not json ([`849a4aa`](https://github.com/ral-facilities/datagateway-api/commit/849a4aa3bf0c444560775cd8641ea28453a8726d)) + ## v6.0.0 (2022-11-22) ### Unknown @@ -827,7 +901,8 @@ Feature/use yaml config#372 ([`5060d5e`](https://github.com/ral-facilities/datag * Add exstension change ([`3e59c86`](https://github.com/ral-facilities/datagateway-api/commit/3e59c8618ba0106f1e240e6a1290f7a4c117c723)) -* Merge branch 'main' into feature/use-yaml-config#372 ([`8921643`](https://github.com/ral-facilities/datagateway-api/commit/89216434464c2cff46e06de5fda5c17b7fe7c06b)) +* Merge branch 'main' into feature/use-yaml-config#372 ([`8921643`](https://github.com/ral-facilities/datagateway-api/commit/89216434464c2cff46e06de5fda5c17b7fe7c06b)) + ## v5.3.0 (2022-11-16) @@ -841,7 +916,7 @@ BREAKING CHANGE: Remove support for json configuration files ([`46723de`](https: * docs: Updated postman collection with new entities ([`4dd4895`](https://github.com/ral-facilities/datagateway-api/commit/4dd489574245f4f6020c490d5cddeb3fc3c65c91)) -### Feature +### Features * feat: Add warning for no api ([`3c91635`](https://github.com/ral-facilities/datagateway-api/commit/3c91635bc0c3465d456a4a85c8d6c8793df408c2)) @@ -935,13 +1010,14 @@ feat: Add warning for no api ([`962dd80`](https://github.com/ral-facilities/data * Fix linting ([`49f31b3`](https://github.com/ral-facilities/datagateway-api/commit/49f31b335de3d76c8a2cc636483c9c8c7b1b028e)) + ## v5.2.0 (2022-11-03) ### Documentation * docs: Update the poetry installation documentation ([`68d4267`](https://github.com/ral-facilities/datagateway-api/commit/68d426722862613358b0b136188d2b61accdc56f)) -### Feature +### Features * feat: Add warning that tests only work with ICAT 5 ([`d8825fd`](https://github.com/ral-facilities/datagateway-api/commit/d8825fd71740e2b2d9b387dca175110cee1f9915)) @@ -961,7 +1037,7 @@ Changes to tests so they pass with icat 5 ([`9bb898d`](https://github.com/ral-fa * pin flake8-black to 0.2.4 -0.2.5 causes flake8 to fail due to unexpected keyword argument 'magic_trailing_comma'. +0.2.5 causes flake8 to fail due to unexpected keyword argument 'magic_trailing_comma'. 0.3 and greater require python 3.7 ([`4d6b066`](https://github.com/ral-facilities/datagateway-api/commit/4d6b06688dd3a5fde169de08ac41eb7c57f2df2b)) * Update for dparse ([`ab160a8`](https://github.com/ral-facilities/datagateway-api/commit/ab160a82751a30d5e6b02fa8667b8a150691cc12)) @@ -974,9 +1050,10 @@ Changes to tests so they pass with icat 5 ([`9bb898d`](https://github.com/ral-fa * use icat5 ansible ([`023e7c7`](https://github.com/ral-facilities/datagateway-api/commit/023e7c734e0a77d33d0d7088eb22665776824091)) + ## v5.1.1 (2022-09-22) -### Fix +### Fixes * fix: update to latest dependencies ([`11a0eeb`](https://github.com/ral-facilities/datagateway-api/commit/11a0eeb3cbc4b5db2a0fa8dcd825dbeceb6ac111)) @@ -988,9 +1065,10 @@ fix: update dparse to 0.5.2 ([`71625f8`](https://github.com/ral-facilities/datag * Minimise dependencies changed ([`75646db`](https://github.com/ral-facilities/datagateway-api/commit/75646dbe88acf78bf4c20b8f4487617af9492e80)) + ## v5.1.0 (2022-05-25) -### Feature +### Features * feat: support skip and limit string parameters on search-api ([`db94b37`](https://github.com/ral-facilities/datagateway-api/commit/db94b375438873969db2d05621d9860a304ca8bd)) @@ -1000,7 +1078,7 @@ fix: update dparse to 0.5.2 ([`71625f8`](https://github.com/ral-facilities/datag * feat: support skip/limit string parameters on search-api and added testing ([`8c3dde1`](https://github.com/ral-facilities/datagateway-api/commit/8c3dde11deb7614dfd22e6433c24727eeff2f800)) -### Test +### Testing * test: check for a different exception for invalid values ([`ab3839a`](https://github.com/ral-facilities/datagateway-api/commit/ab3839aba863756b0cdbd5e266d8d4e25576923e)) @@ -1014,17 +1092,18 @@ This fixes the problem with limit when it is not a number ([`076e805`](https://g * This fixes the problem with limit when it is not a number ([`562e458`](https://github.com/ral-facilities/datagateway-api/commit/562e45860430d4753b75db0076d2bafd687a6728)) + ## v5.0.1 (2022-05-16) -### Build +### Build System * build: add Python 3.10 to tests nox session ([`9fa0b60`](https://github.com/ral-facilities/datagateway-api/commit/9fa0b605cc66b91a15f62fbdf551a392c109312b)) * build: upgrade `pycparser` version for Python 3.10 support ([`e07e6df`](https://github.com/ral-facilities/datagateway-api/commit/e07e6dfea7821f3f68a53df8be2e42dbaa8b2e1f)) -### Ci +### Continuous Integration -* ci: disable Poetry's new installer for Poetry 1.1.x ([`caf1861`](https://github.com/ral-facilities/datagateway-api/commit/caf186144e1d96d91ca2209b8aa434ef12de589c)) +* ci: disable Poetry's new installer for Poetry 1.1.x ([`caf1861`](https://github.com/ral-facilities/datagateway-api/commit/caf186144e1d96d91ca2209b8aa434ef12de589c)) * ci: add Python 3.10 to GitHub Actions ([`9eb4526`](https://github.com/ral-facilities/datagateway-api/commit/9eb4526d18fb4d4f1c835ad09ac201b5675da0ad)) @@ -1038,7 +1117,7 @@ This fixes the problem with limit when it is not a number ([`076e805`](https://g * docs: update README to include note for issue in Python 3.10 ([`72181f6`](https://github.com/ral-facilities/datagateway-api/commit/72181f61677a0fdfb7e5ac9a23a731f55ab4c421)) -### Fix +### Fixes * fix: fix internal server error when running DG API on its own #359 ([`b0d3e06`](https://github.com/ral-facilities/datagateway-api/commit/b0d3e064dc842143de7f7f0a31b947122fae9f88)) @@ -1050,9 +1129,9 @@ This fixes the problem with limit when it is not a number ([`076e805`](https://g * Merge pull request #253 from ral-facilities/rename-master-#252 -Rename instances of "master" to "main" ([`c674205`](https://github.com/ral-facilities/datagateway-api/commit/c67420548dd4cf951c31195362557496880ce7bb)) +Rename instances of "master" to "main" ([`c674205`](https://github.com/ral-facilities/datagateway-api/commit/c67420548dd4cf951c31195362557496880ce7bb)) -* Merge branch 'master' into rename-master-#252 ([`ad0176e`](https://github.com/ral-facilities/datagateway-api/commit/ad0176e86162d269479096df0b71096ede93a351)) +* Merge branch 'master' into rename-master-#252 ([`ad0176e`](https://github.com/ral-facilities/datagateway-api/commit/ad0176e86162d269479096df0b71096ede93a351)) * #252: Find and replace `master` for default branch change ([`f2f7794`](https://github.com/ral-facilities/datagateway-api/commit/f2f77947f7af7fa3ed55c5f46b3c81072c1396d0)) @@ -1064,23 +1143,24 @@ Update Swagger Interface README ([`29eabfd`](https://github.com/ral-facilities/d Add Python 3.10 to CI Testing ([`c737a44`](https://github.com/ral-facilities/datagateway-api/commit/c737a44f29fb95293ec6548fd1293cce83c25782)) + ## v5.0.0 (2022-03-29) -### Ci +### Code Style -* ci: remove existing mysql install on GitHub Actions ([`5c1aa98`](https://github.com/ral-facilities/datagateway-api/commit/5c1aa98206e6d8ac94ba94247b89e37b0f7ce642)) +* style: fix linting as per CI results #350 ([`78d76c1`](https://github.com/ral-facilities/datagateway-api/commit/78d76c105a4fb1bba72187f9407ed9e9ea0b52fa)) -### Refactor +### Continuous Integration -* refactor: change terminology from 'plugin' to 'mechanism' #350 +* ci: remove existing mysql install on GitHub Actions ([`5c1aa98`](https://github.com/ral-facilities/datagateway-api/commit/5c1aa98206e6d8ac94ba94247b89e37b0f7ce642)) -- This just keeps the terminology in line with what we use in DataGateway API and more generally within ICAT ([`4a92ac0`](https://github.com/ral-facilities/datagateway-api/commit/4a92ac0d83c0129b2853fee9c8ffcada381518f3)) +### Refactoring -### Style +* refactor: change terminology from 'plugin' to 'mechanism' #350 -* style: fix linting as per CI results #350 ([`78d76c1`](https://github.com/ral-facilities/datagateway-api/commit/78d76c105a4fb1bba72187f9407ed9e9ea0b52fa)) +- This just keeps the terminology in line with what we use in DataGateway API and more generally within ICAT ([`4a92ac0`](https://github.com/ral-facilities/datagateway-api/commit/4a92ac0d83c0129b2853fee9c8ffcada381518f3)) -### Test +### Testing * test: add new config options to mocked config #350 @@ -1092,12 +1172,13 @@ Add Python 3.10 to CI Testing ([`c737a44`](https://github.com/ral-facilities/dat Allow configuration of the authentication for the search api ([`1a1ee12`](https://github.com/ral-facilities/datagateway-api/commit/1a1ee1249181c985d1a240809b25dbb2a8bd0456)) -* Merge branch 'master' into Allow-the-configuration-of-authentication-mechanisms-#350 ([`8761800`](https://github.com/ral-facilities/datagateway-api/commit/876180054c021ada2fcdef87b7cb2b35f13b9e78)) +* Merge branch 'master' into Allow-the-configuration-of-authentication-mechanisms-#350 ([`8761800`](https://github.com/ral-facilities/datagateway-api/commit/876180054c021ada2fcdef87b7cb2b35f13b9e78)) * Merge pull request #349 from ral-facilities/ci/remove-mysql-icat-ansible ci: remove existing mysql install on GitHub Actions ([`c6aa15e`](https://github.com/ral-facilities/datagateway-api/commit/c6aa15ea01545f7a8e58e656c569523c60f7e4ef)) + ## v4.3.0 (2022-03-18) ### Breaking @@ -1106,7 +1187,7 @@ ci: remove existing mysql install on GitHub Actions ([`c6aa15e`](https://github. BREAKING CHANGE: This commits adds a mandatory config option, so is a major change. ([`1c30f2f`](https://github.com/ral-facilities/datagateway-api/commit/1c30f2f17c5bdc9a206ce3a41c7da81ce4be3b23)) -### Ci +### Continuous Integration * ci: move back to ICAT Ansible master branch ([`b1f46cf`](https://github.com/ral-facilities/datagateway-api/commit/b1f46cf66d1113636667725cb2631c2de2a580ac)) @@ -1116,15 +1197,15 @@ BREAKING CHANGE: This commits adds a mandatory config option, so is a major chan * ci: change ICAT Ansible branch ([`32554f6`](https://github.com/ral-facilities/datagateway-api/commit/32554f6c8d00babd2397a2f5e11bf46f46862b2e)) -### Feature +### Features * feat: allow multiple datetime formats to be used when filtering in search API #338 ([`f20ad24`](https://github.com/ral-facilities/datagateway-api/commit/f20ad24886f85bb3ba70abfd29352b1a7e5c58ff)) -### Fix +### Fixes * fix: output datetime data in the same format as SciCat #338 ([`4596db9`](https://github.com/ral-facilities/datagateway-api/commit/4596db98808f35488aca86667aa26811d777b58e)) -### Test +### Testing * test: convert datetime formats on search endpoint tests #338 ([`939fc77`](https://github.com/ral-facilities/datagateway-api/commit/939fc77287f4c6bcbcae8c16a9a5e5a0627fe71d)) @@ -1136,7 +1217,7 @@ BREAKING CHANGE: This commits adds a mandatory config option, so is a major chan Search API Datetime Format ([`a5cc190`](https://github.com/ral-facilities/datagateway-api/commit/a5cc190c9c973e2b0975a5b82ddb388939e24690)) -* Merge branch 'master' into feature/search-api-datetime-format-#338 ([`0fd45d0`](https://github.com/ral-facilities/datagateway-api/commit/0fd45d0cb122a64c936ed80f5a22afc1db6d4e85)) +* Merge branch 'master' into feature/search-api-datetime-format-#338 ([`0fd45d0`](https://github.com/ral-facilities/datagateway-api/commit/0fd45d0cb122a64c936ed80f5a22afc1db6d4e85)) * Merge pull request #348 from ral-facilities/icat-ansible-dashes @@ -1144,6 +1225,7 @@ ICAT Ansible Dashes to Underscores ([`464d754`](https://github.com/ral-facilitie * Change ICAT Ansible branch ([`3c622d5`](https://github.com/ral-facilities/datagateway-api/commit/3c622d5c2753ad4e8e2d729e11f95441206e0870)) + ## v4.2.0 (2022-02-28) ### Documentation @@ -1160,7 +1242,7 @@ ICAT Ansible Dashes to Underscores ([`464d754`](https://github.com/ral-facilitie * docs: Add docs to `GET` Search API `Endpoint` #281 ([`d407f0a`](https://github.com/ral-facilities/datagateway-api/commit/d407f0ad98a72547333f1b1ccb3930c5c39b0926)) -### Feature +### Features * feat: create openapi endpoint for Search API #281 ([`412458c`](https://github.com/ral-facilities/datagateway-api/commit/412458cc4cc73230db0115bdbfdfe6ac815d42c1)) @@ -1174,9 +1256,10 @@ Add OpenAPI docs for Search API ([`aa98c51`](https://github.com/ral-facilities/d * create swaggerui blueprint for Search API #281 ([`d358d94`](https://github.com/ral-facilities/datagateway-api/commit/d358d941bd48f820d816327b96994a289ef25de5)) + ## v4.1.5 (2022-02-28) -### Fix +### Fixes * fix: fix `AttributeError` when running DG API on its own #345 ([`7479cc3`](https://github.com/ral-facilities/datagateway-api/commit/7479cc3e17ec046082e08b7e71e8e63eb7fa6e28)) @@ -1186,13 +1269,14 @@ Add OpenAPI docs for Search API ([`aa98c51`](https://github.com/ral-facilities/d Fix AttributeError when trying to run DG API on its own ([`9cc9cdb`](https://github.com/ral-facilities/datagateway-api/commit/9cc9cdb2614aa442e942667dce695ee7afb46978)) + ## v4.1.4 (2022-02-28) -### Fix +### Fixes * fix: improve error handling for search API exceptions #319 ([`935f22d`](https://github.com/ral-facilities/datagateway-api/commit/935f22d31d96c6810cf7938815b25c8822d892fb)) -### Test +### Testing * test: improve code coverage for search API error formatting #319 ([`1e42981`](https://github.com/ral-facilities/datagateway-api/commit/1e4298107c489f3927fd3b7b31cdaf10e37db0f4)) @@ -1202,13 +1286,14 @@ Fix AttributeError when trying to run DG API on its own ([`9cc9cdb`](https://git Improve Search API Error Handling ([`982518a`](https://github.com/ral-facilities/datagateway-api/commit/982518a6afa019a9a1544b7b45a78f7a9c389ae5)) + ## v4.1.3 (2022-02-28) -### Fix +### Fixes * fix: fix `parameters.value` WHERE filter with between operator #270 ([`3fe8dfe`](https://github.com/ral-facilities/datagateway-api/commit/3fe8dfe79ac7e070db369471859b1793e54a0852)) -### Test +### Testing * test: add missing endpoint tests for example implementation queries #270 @@ -1218,11 +1303,12 @@ Improve Search API Error Handling ([`982518a`](https://github.com/ral-facilities * Merge pull request #342 from ral-facilities/example-query-tests-#270 -Add Missing Endpoint Tests & Fix parameters.value bug ([`6d5edf5`](https://github.com/ral-facilities/datagateway-api/commit/6d5edf5e7f5b6b0fc5977d83c810b1fa58e919de)) +Add Missing Endpoint Tests & Fix parameters.value bug ([`6d5edf5`](https://github.com/ral-facilities/datagateway-api/commit/6d5edf5e7f5b6b0fc5977d83c810b1fa58e919de)) + ## v4.1.2 (2022-02-28) -### Build +### Build System * build: omit certain lines/files from code coverage #313 @@ -1230,7 +1316,7 @@ Add Missing Endpoint Tests & Fix parameters.value bug ([`6d5edf5`](https://g * build: set Python ICAT as default backend in example config file #318 ([`6d92917`](https://github.com/ral-facilities/datagateway-api/commit/6d92917ecd6fb29e7394cecdfe19996918f94082)) -### Chore +### Chores * chore: move Postman collection to `util/` #320 ([`4e17c6a`](https://github.com/ral-facilities/datagateway-api/commit/4e17c6abbb07a201638fcbcc83519a55e3c3d90f)) @@ -1240,25 +1326,25 @@ Add Missing Endpoint Tests & Fix parameters.value bug ([`6d5edf5`](https://g * docs: correct markdown URL #320 -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`0a9c05a`](https://github.com/ral-facilities/datagateway-api/commit/0a9c05a4e151e7bf6db5833dfa760d6de576663c)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`0a9c05a`](https://github.com/ral-facilities/datagateway-api/commit/0a9c05a4e151e7bf6db5833dfa760d6de576663c)) * docs: add remaining suggested changes to README #320 ([`d5d358c`](https://github.com/ral-facilities/datagateway-api/commit/d5d358c1f43573be7f0f443d4a20a9bd54a7c634)) * docs: make suggested changes #320 -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`d04447d`](https://github.com/ral-facilities/datagateway-api/commit/d04447d835e049127ba15ef981f69a63b85ff015)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`d04447d`](https://github.com/ral-facilities/datagateway-api/commit/d04447d835e049127ba15ef981f69a63b85ff015)) * docs: update docs for search API #320 ([`2daf395`](https://github.com/ral-facilities/datagateway-api/commit/2daf3956805dc0476e3d400d52b20a8b51f0e309)) -### Fix +### Fixes * fix: fix requests which include parameters and filter on them #319 ([`598bf9f`](https://github.com/ral-facilities/datagateway-api/commit/598bf9f5c9fbf71b87a3313680617b8addbe5cc9)) -### Refactor +### Refactoring * refactor: change `LRUCache` import #321 ([`e1fd0a4`](https://github.com/ral-facilities/datagateway-api/commit/e1fd0a40da16630215eae5176d925207c06420f3)) -### Test +### Testing * test: use original test data #313 ([`20c43b6`](https://github.com/ral-facilities/datagateway-api/commit/20c43b6ef6dffb1f8bf83e124cf53616dc06a7a2)) @@ -1286,15 +1372,15 @@ Search API Documentation ([`60a599e`](https://github.com/ral-facilities/datagate Increase Search API Code Coverage ([`e9deada`](https://github.com/ral-facilities/datagateway-api/commit/e9deada2306c5c3419378d4a27617b0fb3f7d918)) -* Merge branch 'master' into test-coverage-search-api ([`6a048c0`](https://github.com/ral-facilities/datagateway-api/commit/6a048c02db408ae29882d01028b4ed21601267b2)) +* Merge branch 'master' into test-coverage-search-api ([`6a048c0`](https://github.com/ral-facilities/datagateway-api/commit/6a048c02db408ae29882d01028b4ed21601267b2)) -* Merge branch 'bugfix/wrong-calculation-for-ispublic-fields-#329' into test-coverage-search-api ([`e1ee64c`](https://github.com/ral-facilities/datagateway-api/commit/e1ee64cdf77ee80704199e868e0f65cd24f12948)) +* Merge branch 'bugfix/wrong-calculation-for-ispublic-fields-#329' into test-coverage-search-api ([`e1ee64c`](https://github.com/ral-facilities/datagateway-api/commit/e1ee64cdf77ee80704199e868e0f65cd24f12948)) * Merge pull request #337 from ral-facilities/fix-nox-test-session-on-windows-#307 Fix failing Nox tests session on Windows ([`8b613da`](https://github.com/ral-facilities/datagateway-api/commit/8b613dacaf12b5f711a5362c6dc8d88a99fc8375)) -* Merge branch 'fix-nox-test-session-on-windows-#307' of github.com:ral-facilities/datagateway-api into fix-nox-test-session-on-windows-#307 ([`3416127`](https://github.com/ral-facilities/datagateway-api/commit/3416127382f462e4a861e39f9b1e46e707cf6ac2)) +* Merge branch 'fix-nox-test-session-on-windows-#307' of github.com:ral-facilities/datagateway-api into fix-nox-test-session-on-windows-#307 ([`3416127`](https://github.com/ral-facilities/datagateway-api/commit/3416127382f462e4a861e39f9b1e46e707cf6ac2)) * Merge pull request #336 from ral-facilities/fix-lrucache-deprecation-warning-#321 @@ -1304,23 +1390,24 @@ Fix cachetools.LRUCache DeprecationWarning ([`c8d7939`](https://github.com/ral-f Change Default DataGateway API Backend to Python ICAT ([`8d2264d`](https://github.com/ral-facilities/datagateway-api/commit/8d2264d160dc5a8d14c0f15b945bf21ec1f15569)) -* Merge branch 'change-default-dg-api-backend-#318' of github.com:ral-facilities/datagateway-api into change-default-dg-api-backend-#318 ([`f15522f`](https://github.com/ral-facilities/datagateway-api/commit/f15522f3fcbbb2b592d1c0e6317511323c81a8a4)) +* Merge branch 'change-default-dg-api-backend-#318' of github.com:ral-facilities/datagateway-api into change-default-dg-api-backend-#318 ([`f15522f`](https://github.com/ral-facilities/datagateway-api/commit/f15522f3fcbbb2b592d1c0e6317511323c81a8a4)) * set Python ICAT as default backend in example config file #318 ([`23dacb3`](https://github.com/ral-facilities/datagateway-api/commit/23dacb380685f732f82186f9bcf303fae4228dc2)) + ## v4.1.1 (2022-02-17) -### Fix +### Fixes * fix: ignore filters on `isPublic` fields #329 ([`d6c10d5`](https://github.com/ral-facilities/datagateway-api/commit/d6c10d56b788ff3c491feaf1fae3a6fadd634a9d)) * fix: hardcode `isPublic` value to `True` #329 ([`64f62c2`](https://github.com/ral-facilities/datagateway-api/commit/64f62c217de760d22afae3e15d4774173eddbb48)) -### Refactor +### Refactoring * refactor: return empty list when filtering for non-public data #329 ([`5f65725`](https://github.com/ral-facilities/datagateway-api/commit/5f65725dc73bcacbb54bd4bada3f8eec95303806)) -### Test +### Testing * test: test where filter on isPublic fields #329 ([`c70b9e9`](https://github.com/ral-facilities/datagateway-api/commit/c70b9e9fa1b7551243722dda93b9fbb70d8e4c10)) @@ -1344,13 +1431,14 @@ Wrong calculation for isPublic field values ([`41962c7`](https://github.com/ral- * remove `isPublic` field changes from bugfix/filters-on-ispublic-panosc-field-#308 #329 ([`8d0496d`](https://github.com/ral-facilities/datagateway-api/commit/8d0496dafc8b3ae2b2500ebca734c83a9b6ac05c)) + ## v4.1.0 (2022-02-16) -### Feature +### Features * feat: add search API error formatting as per specification #296 ([`3a5a3e8`](https://github.com/ral-facilities/datagateway-api/commit/3a5a3e83a1a2ce677a50a39b38d71133fea5121a)) -### Test +### Testing * test: improve tests for `@queries_records` #296 @@ -1364,9 +1452,10 @@ Wrong calculation for isPublic field values ([`41962c7`](https://github.com/ral- Search API Error Signalling/Formatting ([`aefafcc`](https://github.com/ral-facilities/datagateway-api/commit/aefafcc10cbcdc21cccceaa5883b02a5ef47161b)) + ## v4.0.1 (2022-02-11) -### Fix +### Fixes * fix: use alternative ICAT mapping for Technique pid when pid is None #314 ([`bf1c830`](https://github.com/ral-facilities/datagateway-api/commit/bf1c8305fc73630fbf1e6c4771664d974c72fd93)) @@ -1376,7 +1465,7 @@ Search API Error Signalling/Formatting ([`aefafcc`](https://github.com/ral-facil * fix: use alternative ICAT mapping for Dataset pid when doi is None #314 ([`b813f3d`](https://github.com/ral-facilities/datagateway-api/commit/b813f3d71d312b72c5a602b7520978208bd05754)) -### Test +### Testing * test: fix failing tests #314 ([`35569fb`](https://github.com/ral-facilities/datagateway-api/commit/35569fbce0d94e6b92b2480011cd5b9362af6453)) @@ -1410,7 +1499,8 @@ Validation error for Sample pid field when ICAT value is None ([`48c1e29`](https * add alternative ICAT mapping field to Dataset pid PaNOSC field #314 ([`faab544`](https://github.com/ral-facilities/datagateway-api/commit/faab5442b6914f5fd8ed938fc0ce1f51e7f2f43a)) -* Merge branch 'master' into bugfix/validation-error-sample-pid-panosc-field-#314 ([`bed6dec`](https://github.com/ral-facilities/datagateway-api/commit/bed6dec1090ba11e799defa500a087f123718bf4)) +* Merge branch 'master' into bugfix/validation-error-sample-pid-panosc-field-#314 ([`bed6dec`](https://github.com/ral-facilities/datagateway-api/commit/bed6dec1090ba11e799defa500a087f123718bf4)) + ## v4.0.0 (2022-02-10) @@ -1418,7 +1508,7 @@ Validation error for Sample pid field when ICAT value is None ([`48c1e29`](https * feat(config)!: add configuration option for determining public data #312 ([`58e777b`](https://github.com/ral-facilities/datagateway-api/commit/58e777b5c4a562f6945adcd1b55ce1d470f5d816)) -### Test +### Testing * test: fix failing count with `isPublic` condition tests #312 ([`20e3cb1`](https://github.com/ral-facilities/datagateway-api/commit/20e3cb1445e62a35a44e175ec578358ef3b5b769)) @@ -1430,15 +1520,16 @@ Make Number of Years to Determine Public Data Configurable ([`9e2fb9a`](https:// * determine public data based on config value #312 ([`1021c80`](https://github.com/ral-facilities/datagateway-api/commit/1021c802f84e298a8a61dc6563804ce8a6eade72)) + ## v3.6.1 (2022-02-07) -### Fix +### Fixes * fix: convert `isPublic` PaNOSC filter to appropriate ICAT filter #308 ([`6a40307`](https://github.com/ral-facilities/datagateway-api/commit/6a40307ba19d5818bdb6bf1acc79d98abd6a3f83)) * fix: make WHERE filter without operator work with int and bool #322 ([`6988a5a`](https://github.com/ral-facilities/datagateway-api/commit/6988a5aa5d6dfa71fd4b90a73b050864e8530955)) -### Test +### Testing * test: fix failing `isPublic` field endpoint tests #308 ([`c40639d`](https://github.com/ral-facilities/datagateway-api/commit/c40639dd0ee3234577ed806fb98c09119643bcd2)) @@ -1452,31 +1543,32 @@ Cannot Use Filters on isPublic Field ([`9ee06a4`](https://github.com/ral-facilit * raise `FilterError` when invalid operator is used with bool value #308 ([`184c894`](https://github.com/ral-facilities/datagateway-api/commit/184c8944d97f9899ad2d632eda1118fde325ea97)) + ## v3.6.0 (2022-02-07) -### Ci +### Continuous Integration * ci: add anon user to ICAT Server rootUserNames #268 ([`22a0ea8`](https://github.com/ral-facilities/datagateway-api/commit/22a0ea850435d0f4ca4326b7525c5a0fa1d1d8a5)) -### Fix +### Fixes * fix: use alternative ICAT mapping for Sample pid when pid is None #314 ([`7e211f7`](https://github.com/ral-facilities/datagateway-api/commit/7e211f74aa4fa81ab26c339b27806a64510f261c)) * fix: make get by pid endpoints return data in PaNOSC format #266 ([`0de2b5b`](https://github.com/ral-facilities/datagateway-api/commit/0de2b5b2b713699b66164ca5732888f997230aa5)) -### Refactor +### Refactoring * refactor: refactor entity relations code #268 ([`4343a2c`](https://github.com/ral-facilities/datagateway-api/commit/4343a2c67cdba63a0b21e552b7d630eaf0b46cd6)) * refactor: apply suggestions from PR review #314 -Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`e7fa1b1`](https://github.com/ral-facilities/datagateway-api/commit/e7fa1b12abd80fb783f0b5ced199cf9c274aea38)) +Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`e7fa1b1`](https://github.com/ral-facilities/datagateway-api/commit/e7fa1b12abd80fb783f0b5ced199cf9c274aea38)) * refactor: move ICAT relations call to filter handler #268 ([`8840a6c`](https://github.com/ral-facilities/datagateway-api/commit/8840a6cfe4134421d60fa2acdf329d4d737e151c)) * refactor: make `get_with_pid()` more efficient by calling `get_search()` #266 ([`73b70bd`](https://github.com/ral-facilities/datagateway-api/commit/73b70bd756949fc23b7d4e58d6cdf5c3038a219b)) -### Test +### Testing * test: correct order of actual and expected results in test #314 ([`5d6dab9`](https://github.com/ral-facilities/datagateway-api/commit/5d6dab9f394cf2d23a02d02a5aaa3834cc0d736d)) @@ -1498,15 +1590,16 @@ Implement Search API Endpoints ([`afad6de`](https://github.com/ral-facilities/da * add alternative ICAT mapping field to Sample pid PaNOSC field #314 ([`58b3850`](https://github.com/ral-facilities/datagateway-api/commit/58b385046f4d96d4940e7e2f678a337dd6b5acbd)) -* Merge branch 'master' into feature/search-endpoints-#268 ([`efdc2a6`](https://github.com/ral-facilities/datagateway-api/commit/efdc2a61fce57b44920f513dbb7f2c9d7dc8d3a5)) +* Merge branch 'master' into feature/search-endpoints-#268 ([`efdc2a6`](https://github.com/ral-facilities/datagateway-api/commit/efdc2a61fce57b44920f513dbb7f2c9d7dc8d3a5)) + ## v3.5.3 (2022-02-02) -### Fix +### Fixes * fix: retrieve non-related fields that have a list of ICAT relations #265 ([`2c5edc5`](https://github.com/ral-facilities/datagateway-api/commit/2c5edc50f9f713b0d15e137ad4a307a90a86b5aa)) -### Refactor +### Refactoring * refactor: move logic for including ICAT relations of non-related fields of related entities #265 ([`49cfe08`](https://github.com/ral-facilities/datagateway-api/commit/49cfe084426bfcf5b7f5e0620a708b3959367cbd)) @@ -1514,7 +1607,7 @@ Implement Search API Endpoints ([`afad6de`](https://github.com/ral-facilities/da * refactor: update PaNOSC `Parameter` mappings in example file #265 ([`524f8a9`](https://github.com/ral-facilities/datagateway-api/commit/524f8a953af0f3bf9a9b2e52289e245fea582589)) -### Test +### Testing * test: test logic for including ICAT relations of non-related fields of related entities #265 ([`8a33bf3`](https://github.com/ral-facilities/datagateway-api/commit/8a33bf38eac273b6e71edaf1adc0d51680e89d1d)) @@ -1532,19 +1625,20 @@ A Document cannot have parameters that have dataset ([`23200cd`](https://github. Include ICAT relations for non-related PaNOSC fields ([`fad4c3e`](https://github.com/ral-facilities/datagateway-api/commit/fad4c3e9748feeb7c2e529a72b15a3ba5142ec2a)) -* Merge branch 'master' into include-icat-relations-for-non-related-panosc-fields ([`1faba30`](https://github.com/ral-facilities/datagateway-api/commit/1faba3024b27844fdd0a5ff3d20e6fc0f42eb17e)) +* Merge branch 'master' into include-icat-relations-for-non-related-panosc-fields ([`1faba30`](https://github.com/ral-facilities/datagateway-api/commit/1faba3024b27844fdd0a5ff3d20e6fc0f42eb17e)) * add logging #265 ([`e1f199d`](https://github.com/ral-facilities/datagateway-api/commit/e1f199d5c62a317140c3c72f30d12e50a686b8cb)) -* Merge branch 'filter-input-conversion' into include-icat-relations-for-non-related-panosc-fields ([`2beb861`](https://github.com/ral-facilities/datagateway-api/commit/2beb8616f1efe66ec9981827bebda59d66e70ba7)) +* Merge branch 'filter-input-conversion' into include-icat-relations-for-non-related-panosc-fields ([`2beb861`](https://github.com/ral-facilities/datagateway-api/commit/2beb8616f1efe66ec9981827bebda59d66e70ba7)) + ## v3.5.2 (2022-02-02) -### Fix +### Fixes * fix: make `ne` and `neq` operators work with non-numeric values #315 ([`f5e3b4b`](https://github.com/ral-facilities/datagateway-api/commit/f5e3b4b1bfebd25c6d6fb288eb3f5a79daf87dac)) -### Test +### Testing * test: fix failing `ne` and `neq` operator tests #315 ([`f74efc0`](https://github.com/ral-facilities/datagateway-api/commit/f74efc0861fe0a5230a39444a640ad5f9084a0ba)) @@ -1554,23 +1648,24 @@ Include ICAT relations for non-related PaNOSC fields ([`fad4c3e`](https://github Make ne and neq operators work with non-numeric values ([`a13e699`](https://github.com/ral-facilities/datagateway-api/commit/a13e699f71ebca76deeb789f46584038a2c00553)) + ## v3.5.1 (2022-01-31) -### Fix +### Code Style -* fix: fix nested relations bug #261 ([`67fcbfe`](https://github.com/ral-facilities/datagateway-api/commit/67fcbfe2a35ca2b7e007a1a6d78105b2e46b0b5f)) +* style: remove unused import #261 ([`5da48f8`](https://github.com/ral-facilities/datagateway-api/commit/5da48f8393bf9c52de38bd2410d63dd85508a023)) -* fix: reference self instead of fixed instance #301 +### Fixes -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`40f5662`](https://github.com/ral-facilities/datagateway-api/commit/40f566279543871c5b7b1eab2c8b74050d8b3525)) +* fix: fix nested relations bug #261 ([`67fcbfe`](https://github.com/ral-facilities/datagateway-api/commit/67fcbfe2a35ca2b7e007a1a6d78105b2e46b0b5f)) -### Style +* fix: reference self instead of fixed instance #301 -* style: remove unused import #261 ([`5da48f8`](https://github.com/ral-facilities/datagateway-api/commit/5da48f8393bf9c52de38bd2410d63dd85508a023)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`40f5662`](https://github.com/ral-facilities/datagateway-api/commit/40f566279543871c5b7b1eab2c8b74050d8b3525)) -### Test +### Testing -* test: remove test that's no longer needed #261 ([`950b9aa`](https://github.com/ral-facilities/datagateway-api/commit/950b9aae6cec0aa8e2eabd04ffa0561ad74c1185)) +* test: remove test that's no longer needed #261 ([`950b9aa`](https://github.com/ral-facilities/datagateway-api/commit/950b9aae6cec0aa8e2eabd04ffa0561ad74c1185)) ### Unknown @@ -1578,13 +1673,14 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( Implement Include Filter for Search API ([`10d1ca8`](https://github.com/ral-facilities/datagateway-api/commit/10d1ca826d5d2a285aaec689a6a71052eef8f354)) -* Merge branch 'master' into feature/search-api-include-filter-#261 ([`e0b2d95`](https://github.com/ral-facilities/datagateway-api/commit/e0b2d95e8ab60aae1b50309456b754bd7488ce66)) +* Merge branch 'master' into feature/search-api-include-filter-#261 ([`e0b2d95`](https://github.com/ral-facilities/datagateway-api/commit/e0b2d95e8ab60aae1b50309456b754bd7488ce66)) + +* Merge branch 'master' into feature/search-api-include-filter-#261 ([`1af6e38`](https://github.com/ral-facilities/datagateway-api/commit/1af6e381d5623b24f835920a6993f4b377770b2a)) -* Merge branch 'master' into feature/search-api-include-filter-#261 ([`1af6e38`](https://github.com/ral-facilities/datagateway-api/commit/1af6e381d5623b24f835920a6993f4b377770b2a)) +* Merge branch 'filter-input-conversion' into feature/search-api-include-filter-#261 ([`80a5ca7`](https://github.com/ral-facilities/datagateway-api/commit/80a5ca7d5bef76cce70afc2f162fe01121ae786d)) -* Merge branch 'filter-input-conversion' into feature/search-api-include-filter-#261 ([`80a5ca7`](https://github.com/ral-facilities/datagateway-api/commit/80a5ca7d5bef76cce70afc2f162fe01121ae786d)) +* Merge branch 'master' into feature/search-endpoints-#268 ([`2fe980d`](https://github.com/ral-facilities/datagateway-api/commit/2fe980d05b8355ca93c0624588cea074d73ad257)) -* Merge branch 'master' into feature/search-endpoints-#268 ([`2fe980d`](https://github.com/ral-facilities/datagateway-api/commit/2fe980d05b8355ca93c0624588cea074d73ad257)) ## v3.5.0 (2022-01-31) @@ -1594,11 +1690,12 @@ Implement Include Filter for Search API ([`10d1ca8`](https://github.com/ral-faci ICAT to PaNOSC Data Model Conversion ([`2609aae`](https://github.com/ral-facilities/datagateway-api/commit/2609aaeec6ee5b7b34fbb23baa0a728afceadd43)) -* Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265 ([`f17038d`](https://github.com/ral-facilities/datagateway-api/commit/f17038dfef55ee95e6bc00b057ce781958edc172)) +* Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265 ([`f17038d`](https://github.com/ral-facilities/datagateway-api/commit/f17038dfef55ee95e6bc00b057ce781958edc172)) + ## v3.4.0 (2022-01-31) -### Feature +### Features * feat: implement `regexp` operator #297 ([`bf3fe0e`](https://github.com/ral-facilities/datagateway-api/commit/bf3fe0ef2ac582d55dbd881edf6a81a93625ce91)) @@ -1610,19 +1707,19 @@ ICAT to PaNOSC Data Model Conversion ([`2609aae`](https://github.com/ral-facilit * feat: implement `between` operator #297 ([`4736888`](https://github.com/ral-facilities/datagateway-api/commit/4736888bf76cda0dbc00f997443ed565f0f5e760)) -### Refactor +### Refactoring * refactor: merge logic for `in` and `inq` operators #297 ([`3211dfb`](https://github.com/ral-facilities/datagateway-api/commit/3211dfb277e4466895f89af70b770f262b2581c7)) * refactor: merge logic for `ne` and `neq` operators #297 -Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`8b344ef`](https://github.com/ral-facilities/datagateway-api/commit/8b344ef9d7bf04cbe55467c2b6eabcff325a8a33)) +Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`8b344ef`](https://github.com/ral-facilities/datagateway-api/commit/8b344ef9d7bf04cbe55467c2b6eabcff325a8a33)) * refactor: remove duplicated code for `between` operator validation #297 ([`bd15023`](https://github.com/ral-facilities/datagateway-api/commit/bd15023dc7ed56126540eab49fc34b454544b52c)) * refactor: update PaNOSC Parameter name mapping in example file #265 ([`358ac22`](https://github.com/ral-facilities/datagateway-api/commit/358ac22504b6869686c4caf6b47282fda916cb60)) -### Test +### Testing * test: test `regexp` operator #297 ([`f25333f`](https://github.com/ral-facilities/datagateway-api/commit/f25333f25791d927ab4601e942fa5e63bac3df6c)) @@ -1640,9 +1737,9 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c Implement Search API WHERE Filter Operators ([`4946d8e`](https://github.com/ral-facilities/datagateway-api/commit/4946d8ec7de9ae828fee266c996f221378d72eb3)) -* Merge branch 'master' into implement-search-api-where-filter-operators-#297 ([`92918ac`](https://github.com/ral-facilities/datagateway-api/commit/92918ac492ef3b50bbf499d7be0cb76b526c4621)) +* Merge branch 'master' into implement-search-api-where-filter-operators-#297 ([`92918ac`](https://github.com/ral-facilities/datagateway-api/commit/92918ac492ef3b50bbf499d7be0cb76b526c4621)) -* Merge branch 'implement-search-api-where-filter-operators-#297' of github.com:ral-facilities/datagateway-api into implement-search-api-where-filter-operators-#297 ([`b8ca890`](https://github.com/ral-facilities/datagateway-api/commit/b8ca890bcadebae5b8892cf5a29f06627ad10566)) +* Merge branch 'implement-search-api-where-filter-operators-#297' of github.com:ral-facilities/datagateway-api into implement-search-api-where-filter-operators-#297 ([`b8ca890`](https://github.com/ral-facilities/datagateway-api/commit/b8ca890bcadebae5b8892cf5a29f06627ad10566)) * validate values supplied with `nin` operator #297 ([`92b5f36`](https://github.com/ral-facilities/datagateway-api/commit/92b5f36389d16f5c79f0199d7dd1408eda688d7a)) @@ -1650,15 +1747,16 @@ Implement Search API WHERE Filter Operators ([`4946d8e`](https://github.com/ral- * validate values supplied with `between` operator #297 ([`d254642`](https://github.com/ral-facilities/datagateway-api/commit/d254642c4cf28168c47c8eacdc8fcbf90e1c1943)) -* Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265 ([`fca1a59`](https://github.com/ral-facilities/datagateway-api/commit/fca1a593f00f0ba9d5f3827d56ed3c3467578e06)) +* Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265 ([`fca1a59`](https://github.com/ral-facilities/datagateway-api/commit/fca1a593f00f0ba9d5f3827d56ed3c3467578e06)) + ## v3.3.0 (2022-01-31) -### Build +### Build System * build: update example mappings ([`f94d361`](https://github.com/ral-facilities/datagateway-api/commit/f94d361d3050dcfa62a2a600917cb59721715e3f)) -### Test +### Testing * test: update mappings on tests #260 ([`63d7c21`](https://github.com/ral-facilities/datagateway-api/commit/63d7c21e87f1a793b309f9c031d2a921d8f3ede8)) @@ -1668,17 +1766,44 @@ Implement Search API WHERE Filter Operators ([`4946d8e`](https://github.com/ral- Start Defining PaNOSC to ICAT Mapping and Implement WHERE Filter ([`942b3cf`](https://github.com/ral-facilities/datagateway-api/commit/942b3cf051658b69a0efc5a2348a938c43f893d9)) -* Merge branch 'master' into filter-input-conversion ([`a34786c`](https://github.com/ral-facilities/datagateway-api/commit/a34786c21447439d10ec991f634a06f9c9688f5b)) +* Merge branch 'master' into filter-input-conversion ([`a34786c`](https://github.com/ral-facilities/datagateway-api/commit/a34786c21447439d10ec991f634a06f9c9688f5b)) + ## v3.2.0 (2022-01-31) -### Build +### Build System * build: upgrade `python-icat` to 0.21.0 #305 ([`8e472cf`](https://github.com/ral-facilities/datagateway-api/commit/8e472cff813cd2b5953824c763909dd904276321)) * build: use older version of `setuptools` when running tests ([`2b66602`](https://github.com/ral-facilities/datagateway-api/commit/2b66602cbeae0d74aff77df33f810ff1188fe579)) -### Ci +### Code Style + +* style: fix typo #265 ([`3f1b2d6`](https://github.com/ral-facilities/datagateway-api/commit/3f1b2d6a1d216d9596e5cda2c261e0911324f541)) + +* style: address linting warnings #265 ([`a253422`](https://github.com/ral-facilities/datagateway-api/commit/a2534223af50b68c4195f843e8bac13d8d988bef)) + +* style: general linting fixes #268 ([`d14c327`](https://github.com/ral-facilities/datagateway-api/commit/d14c327cd40a665697b420747e113b44310dcd36)) + +* style: fix linting issues #260 ([`8267de0`](https://github.com/ral-facilities/datagateway-api/commit/8267de0435d88d0a34843a033b46ba95cfd95f1d)) + +* style: make suggested changes from PR review #260 ([`3afccd2`](https://github.com/ral-facilities/datagateway-api/commit/3afccd2e938b7d718bc9b8b5140ab9088f0268d8)) + +* style: add logging to WHERE filter work #260 ([`7dd4fd2`](https://github.com/ral-facilities/datagateway-api/commit/7dd4fd2839addd75af5ded11325544a735f3f808)) + +* style: fix linting issues #260 ([`bfad399`](https://github.com/ral-facilities/datagateway-api/commit/bfad39985757a23af500fd1c2643fad41190a0e8)) + +* style: remove unneeded code #260 ([`cba6482`](https://github.com/ral-facilities/datagateway-api/commit/cba6482519e112bba2ae21ff320728a5a631b184)) + +* style: fix linting issues #260 ([`9ee5395`](https://github.com/ral-facilities/datagateway-api/commit/9ee539563038c8af5bfe2b55ab252b23b3d5ac2a)) + +* style: change some variable names to increase code readability #259 + +- `filter_input` meant multiple things in that file so I've gone and given new names in places ([`d0b949b`](https://github.com/ral-facilities/datagateway-api/commit/d0b949bb10a2e47b976941fcb0678fca3f7f3c3f)) + +* style: add docstrings to functions #259 ([`ed72451`](https://github.com/ral-facilities/datagateway-api/commit/ed7245195bf2cde391c35693f80a789fb95c2290)) + +### Continuous Integration * ci: use older version of `setuptools` to solve Python ICAT build issue ([`e4cfb38`](https://github.com/ral-facilities/datagateway-api/commit/e4cfb383f846bdec3aed14d9a0837f5d3f629156)) @@ -1694,7 +1819,7 @@ Start Defining PaNOSC to ICAT Mapping and Implement WHERE Filter ([`942b3cf`](ht * docs: add docstring to static function #260 ([`618f6b9`](https://github.com/ral-facilities/datagateway-api/commit/618f6b9fead88f61a346b90cb2b85a90877b0410)) -### Feature +### Features * feat: implement search API endpoints #266, #267, #268 ([`dcc332e`](https://github.com/ral-facilities/datagateway-api/commit/dcc332e352ded8af25dce7dae635bd62417d2c13)) @@ -1702,7 +1827,7 @@ Start Defining PaNOSC to ICAT Mapping and Implement WHERE Filter ([`942b3cf`](ht * feat: add function to get PaNOSC to ICAT mapping for where filter #260 ([`34b1d81`](https://github.com/ral-facilities/datagateway-api/commit/34b1d819482aa3efdb4f8da321125d3e40d76617)) -### Fix +### Fixes * fix: fix example mapping file ([`3802cc9`](https://github.com/ral-facilities/datagateway-api/commit/3802cc9ee71a355d0ad87529f65112e8c3f8b881)) @@ -1714,11 +1839,11 @@ Start Defining PaNOSC to ICAT Mapping and Implement WHERE Filter ([`942b3cf`](ht * fix: update `__str__()` for WHERE filter to cope with applying filter #260 ([`8d259d7`](https://github.com/ral-facilities/datagateway-api/commit/8d259d75a28414f26cc569293720ef4e306e6844)) -### Refactor +### Refactoring * refactor: update PaNOSC mappings -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`c13c0db`](https://github.com/ral-facilities/datagateway-api/commit/c13c0db07a1a23a662d5ce32d7fb2f4709bc282d)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`c13c0db`](https://github.com/ral-facilities/datagateway-api/commit/c13c0db07a1a23a662d5ce32d7fb2f4709bc282d)) * refactor: refactor `from_icat` abstract method #265 ([`71765a5`](https://github.com/ral-facilities/datagateway-api/commit/71765a590d996b9935299ebfb3de305660542ca1)) @@ -1738,7 +1863,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * refactor: update PaNOSC mappings -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`80c066c`](https://github.com/ral-facilities/datagateway-api/commit/80c066cb1e5c70cedcd37aa8f598bbdf557692ac)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`80c066c`](https://github.com/ral-facilities/datagateway-api/commit/80c066cb1e5c70cedcd37aa8f598bbdf557692ac)) * refactor: deal with case when list of ICAT field values are found #265 ([`98f9157`](https://github.com/ral-facilities/datagateway-api/commit/98f9157938abc829493569e32672640b30645304)) @@ -1754,7 +1879,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * refactor: change method signatures of search API endpoint helpers #268 -- The endpoint name won't actually be used in the endpoint code, only the entity name will be +- The endpoint name won't actually be used in the endpoint code, only the entity name will be - Also changed `get_with_id()` to `get_with_pid()` as all use cases will be with a persistent identifier ([`b0f4b13`](https://github.com/ral-facilities/datagateway-api/commit/b0f4b1358abb309656eb7b206cc025b516254094)) * refactor: Pass kwargs into query class #268 @@ -1765,7 +1890,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * refactor: move `get_icat_mapping()` into `PaNOSCMappings` #261 -- I've moved the code which deals with the parameter value field name list away from this function to make the function more generic/reusable. That code has been moved to applying the WHERE filter, where it'll be used. The mapping will not be reached by an include filter (under a valid API request) because the parameter values are for a field name/attribute, not a related entity ([`00ee21d`](https://github.com/ral-facilities/datagateway-api/commit/00ee21d1bf0489b344fb58d092cc57154a3983e3)) +- I've moved the code which deals with the parameter value field name list away from this function to make the function more generic/reusable. That code has been moved to applying the WHERE filter, where it'll be used. The mapping will not be reached by an include filter (under a valid API request) because the parameter values are for a field name/attribute, not a related entity ([`00ee21d`](https://github.com/ral-facilities/datagateway-api/commit/00ee21d1bf0489b344fb58d092cc57154a3983e3)) * refactor: small refactors based on PR review comments #260 ([`d368778`](https://github.com/ral-facilities/datagateway-api/commit/d3687781fb880ce716618e9df94288ab2b45c25c)) @@ -1773,7 +1898,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * refactor: make mapping file the example file #265 -- Added filename of the 'actual' mapping file to git ignore ([`b20c9b4`](https://github.com/ral-facilities/datagateway-api/commit/b20c9b439bbae937c5f770b09546db3621c09992)) +- Added filename of the 'actual' mapping file to git ignore ([`b20c9b4`](https://github.com/ral-facilities/datagateway-api/commit/b20c9b439bbae937c5f770b09546db3621c09992)) * refactor: remove unused function and place functionality within `SearchAPIWhereFilter.apply_filter()` #260 @@ -1791,33 +1916,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * refactor: set `get_condition_values` to return `tuple` #259 ([`229a6c8`](https://github.com/ral-facilities/datagateway-api/commit/229a6c80b55e2806d0cf9a82c662392c522760af)) -### Style - -* style: fix typo #265 ([`3f1b2d6`](https://github.com/ral-facilities/datagateway-api/commit/3f1b2d6a1d216d9596e5cda2c261e0911324f541)) - -* style: address linting warnings #265 ([`a253422`](https://github.com/ral-facilities/datagateway-api/commit/a2534223af50b68c4195f843e8bac13d8d988bef)) - -* style: general linting fixes #268 ([`d14c327`](https://github.com/ral-facilities/datagateway-api/commit/d14c327cd40a665697b420747e113b44310dcd36)) - -* style: fix linting issues #260 ([`8267de0`](https://github.com/ral-facilities/datagateway-api/commit/8267de0435d88d0a34843a033b46ba95cfd95f1d)) - -* style: make suggested changes from PR review #260 ([`3afccd2`](https://github.com/ral-facilities/datagateway-api/commit/3afccd2e938b7d718bc9b8b5140ab9088f0268d8)) - -* style: add logging to WHERE filter work #260 ([`7dd4fd2`](https://github.com/ral-facilities/datagateway-api/commit/7dd4fd2839addd75af5ded11325544a735f3f808)) - -* style: fix linting issues #260 ([`bfad399`](https://github.com/ral-facilities/datagateway-api/commit/bfad39985757a23af500fd1c2643fad41190a0e8)) - -* style: remove unneeded code #260 ([`cba6482`](https://github.com/ral-facilities/datagateway-api/commit/cba6482519e112bba2ae21ff320728a5a631b184)) - -* style: fix linting issues #260 ([`9ee5395`](https://github.com/ral-facilities/datagateway-api/commit/9ee539563038c8af5bfe2b55ab252b23b3d5ac2a)) - -* style: change some variable names to increase code readability #259 - -- `filter_input` meant multiple things in that file so I've gone and given new names in places ([`d0b949b`](https://github.com/ral-facilities/datagateway-api/commit/d0b949bb10a2e47b976941fcb0678fca3f7f3c3f)) - -* style: add docstrings to functions #259 ([`ed72451`](https://github.com/ral-facilities/datagateway-api/commit/ed7245195bf2cde391c35693f80a789fb95c2290)) - -### Test +### Testing * test: tweak query params tests to avoid Parameter entity #259 ([`2f0afa0`](https://github.com/ral-facilities/datagateway-api/commit/2f0afa05101b411510bbb5f15c91c78fdc9db243)) @@ -1833,7 +1932,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * test: add search API endpoints #268 -- Lots of skips have been added for bugs I've found and need to be fixed ([`bc2aabd`](https://github.com/ral-facilities/datagateway-api/commit/bc2aabd0199766a883d25ba099aa5be98c511b2c)) +- Lots of skips have been added for bugs I've found and need to be fixed ([`bc2aabd`](https://github.com/ral-facilities/datagateway-api/commit/bc2aabd0199766a883d25ba099aa5be98c511b2c)) * test: fix existing endpoint test data #268 ([`7ba059c`](https://github.com/ral-facilities/datagateway-api/commit/7ba059cfe3b027be7ed003df58f7965addddd589)) @@ -1897,7 +1996,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * test: add tests to increase test coverage #259 -- `test_get_condition_values()` didn't resolve the partial branch coverage but I thought I'd commit it regardless because it might help us later on ([`e014af6`](https://github.com/ral-facilities/datagateway-api/commit/e014af6eee54f2e345a73ef29d4f310d4475c077)) +- `test_get_condition_values()` didn't resolve the partial branch coverage but I thought I'd commit it regardless because it might help us later on ([`e014af6`](https://github.com/ral-facilities/datagateway-api/commit/e014af6eee54f2e345a73ef29d4f310d4475c077)) * test: add limit and skip inside scope filter cases #259 ([`3f4eaa6`](https://github.com/ral-facilities/datagateway-api/commit/3f4eaa667a296a0e437b3da8a5a5bfa9b7500aa8)) @@ -1913,9 +2012,9 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( Query Parameters Inputs for Search API ([`d6506ac`](https://github.com/ral-facilities/datagateway-api/commit/d6506ac504b3761441e2ebde2586642747a66614)) -* Merge branch 'master' into feature/query-params-search-api-#259 ([`d913af1`](https://github.com/ral-facilities/datagateway-api/commit/d913af186aab87803a74b5e3ec99bb5a7a05020d)) +* Merge branch 'master' into feature/query-params-search-api-#259 ([`d913af1`](https://github.com/ral-facilities/datagateway-api/commit/d913af186aab87803a74b5e3ec99bb5a7a05020d)) -* Merge branch 'master' into filter-input-conversion ([`dbe684e`](https://github.com/ral-facilities/datagateway-api/commit/dbe684ea355ee1fbeda069359ca90e3220228853)) +* Merge branch 'master' into filter-input-conversion ([`dbe684e`](https://github.com/ral-facilities/datagateway-api/commit/dbe684ea355ee1fbeda069359ca90e3220228853)) * Merge pull request #306 from ral-facilities/upgrade-python-icat-#305 @@ -1925,15 +2024,15 @@ Upgrade Python ICAT to 0.21.0 ([`c4bd953`](https://github.com/ral-facilities/dat Fix CI for Python ICAT Build Issue ([`f3e5c20`](https://github.com/ral-facilities/datagateway-api/commit/f3e5c203fa96fec3ce673509457e0ef6b3221323)) -* Merge branch 'filter-input-conversion' of github.com:ral-facilities/datagateway-api into filter-input-conversion ([`7cc6c5a`](https://github.com/ral-facilities/datagateway-api/commit/7cc6c5a8d54d7cfdd195938e960757786b855605)) +* Merge branch 'filter-input-conversion' of github.com:ral-facilities/datagateway-api into filter-input-conversion ([`7cc6c5a`](https://github.com/ral-facilities/datagateway-api/commit/7cc6c5a8d54d7cfdd195938e960757786b855605)) -* Merge branch 'feature/icat-to-panosc-data-model-conversion-#265' of github.com:ral-facilities/datagateway-api into feature/icat-to-panosc-data-model-conversion-#265 ([`3f463fb`](https://github.com/ral-facilities/datagateway-api/commit/3f463fb51164b11a5b33d5c4b72736117d798b50)) +* Merge branch 'feature/icat-to-panosc-data-model-conversion-#265' of github.com:ral-facilities/datagateway-api into feature/icat-to-panosc-data-model-conversion-#265 ([`3f463fb`](https://github.com/ral-facilities/datagateway-api/commit/3f463fb51164b11a5b33d5c4b72736117d798b50)) * Apply suggestions from code review #265 -Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`299cbcd`](https://github.com/ral-facilities/datagateway-api/commit/299cbcdd46672eb4424066d44891e03fd7c41115)) +Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> ([`299cbcd`](https://github.com/ral-facilities/datagateway-api/commit/299cbcdd46672eb4424066d44891e03fd7c41115)) -* Merge branch 'include-icat-relations-for-non-related-panosc-fields' into feature/search-endpoints-#268 ([`003bf40`](https://github.com/ral-facilities/datagateway-api/commit/003bf405d46d8f7788a07d0240f0841c80c954bb)) +* Merge branch 'include-icat-relations-for-non-related-panosc-fields' into feature/search-endpoints-#268 ([`003bf40`](https://github.com/ral-facilities/datagateway-api/commit/003bf405d46d8f7788a07d0240f0841c80c954bb)) * include all ICAT relations of non-related fields when querying ICAT #265 ([`27866f9`](https://github.com/ral-facilities/datagateway-api/commit/27866f93a711742f0ab3e9ff38011171b59418e9)) @@ -1943,11 +2042,11 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * implement method for getting non related field names of PaNOSC entity #265 ([`4ced97a`](https://github.com/ral-facilities/datagateway-api/commit/4ced97a21a74ad18989621b8a22028ba40169796)) -* Merge branch 'feature/icat-to-panosc-data-model-conversion-#265' into feature/search-endpoints-#268 ([`4648c5a`](https://github.com/ral-facilities/datagateway-api/commit/4648c5af32279a459fbcf2630651c2a31345a266)) +* Merge branch 'feature/icat-to-panosc-data-model-conversion-#265' into feature/search-endpoints-#268 ([`4648c5a`](https://github.com/ral-facilities/datagateway-api/commit/4648c5af32279a459fbcf2630651c2a31345a266)) -* Merge branch 'filter-input-conversion' into feature/icat-to-panosc-data-model-conversion-#265 ([`7f4cd96`](https://github.com/ral-facilities/datagateway-api/commit/7f4cd96a3790ed559995df738f882d0ed8e138c3)) +* Merge branch 'filter-input-conversion' into feature/icat-to-panosc-data-model-conversion-#265 ([`7f4cd96`](https://github.com/ral-facilities/datagateway-api/commit/7f4cd96a3790ed559995df738f882d0ed8e138c3)) -* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`d7e2d81`](https://github.com/ral-facilities/datagateway-api/commit/d7e2d81532a17cc9159d755a6f88cfa3b10aea52)) +* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`d7e2d81`](https://github.com/ral-facilities/datagateway-api/commit/d7e2d81532a17cc9159d755a6f88cfa3b10aea52)) * add logic for dealing with nested required related fields #265 ([`d606d6b`](https://github.com/ral-facilities/datagateway-api/commit/d606d6b1514e95aecc423b9aa33fae3e0eb86136)) @@ -1965,11 +2064,11 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * set non-related optional entity fields to default to `None` #265 ([`c183a85`](https://github.com/ral-facilities/datagateway-api/commit/c183a850376b213ecce6379a854b4168573e7f99)) -* Merge branch 'feature/search-api-include-filter-#261' into feature/icat-to-panosc-data-model-conversion-#265 ([`3d8447e`](https://github.com/ral-facilities/datagateway-api/commit/3d8447ece89cd8eb901a089e6d49ee0c59b3d725)) +* Merge branch 'feature/search-api-include-filter-#261' into feature/icat-to-panosc-data-model-conversion-#265 ([`3d8447e`](https://github.com/ral-facilities/datagateway-api/commit/3d8447ece89cd8eb901a089e6d49ee0c59b3d725)) -* Merge branch 'feature/search-api-include-filter-#261' into feature/search-endpoints-#268 ([`e0b54ea`](https://github.com/ral-facilities/datagateway-api/commit/e0b54ea17c775aea256450ce788f85268ff2a02d)) +* Merge branch 'feature/search-api-include-filter-#261' into feature/search-endpoints-#268 ([`e0b54ea`](https://github.com/ral-facilities/datagateway-api/commit/e0b54ea17c775aea256450ce788f85268ff2a02d)) -* Merge branch 'filter-input-conversion' into feature/search-api-include-filter-#261 ([`95319a8`](https://github.com/ral-facilities/datagateway-api/commit/95319a8c81fb610fb4522955e54ca59d2f59664c)) +* Merge branch 'filter-input-conversion' into feature/search-api-include-filter-#261 ([`95319a8`](https://github.com/ral-facilities/datagateway-api/commit/95319a8c81fb610fb4522955e54ca59d2f59664c)) * conversion proof of concept #265 ([`85c4bfc`](https://github.com/ral-facilities/datagateway-api/commit/85c4bfc94cffc7c0c1664b78bb0824921aa286db)) @@ -1997,11 +2096,11 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * add related entity mappings #265 -- I've added TODOs where there are things I'm still slightly unsure about ([`29ddbf4`](https://github.com/ral-facilities/datagateway-api/commit/29ddbf4885aa6c59908d93f7292a9550985b168b)) +- I've added TODOs where there are things I'm still slightly unsure about ([`29ddbf4`](https://github.com/ral-facilities/datagateway-api/commit/29ddbf4885aa6c59908d93f7292a9550985b168b)) -* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`e1bd6cd`](https://github.com/ral-facilities/datagateway-api/commit/e1bd6cdfdadbfdc9f60cbc56d75f0d41b9475ea6)) +* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`e1bd6cd`](https://github.com/ral-facilities/datagateway-api/commit/e1bd6cdfdadbfdc9f60cbc56d75f0d41b9475ea6)) -* Merge branch 'master' into feature/query-params-search-api-#259 ([`cafabc5`](https://github.com/ral-facilities/datagateway-api/commit/cafabc5bd5e3a88ed3f4cd333c508e3229d17d3c)) +* Merge branch 'master' into feature/query-params-search-api-#259 ([`cafabc5`](https://github.com/ral-facilities/datagateway-api/commit/cafabc5bd5e3a88ed3f4cd333c508e3229d17d3c)) * raise `FilterError` if scope filter has a limit or skip filter #259 ([`bc4d3ba`](https://github.com/ral-facilities/datagateway-api/commit/bc4d3baa9be7fe277a5f600fd04e5cae4e2f58da)) @@ -2011,19 +2110,36 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * prefix all where filters inside include filter with entity name #259 ([`c6d7ab5`](https://github.com/ral-facilities/datagateway-api/commit/c6d7ab5d3e2e7b50a24d40c599d111b4b910a958)) -* Merge branch 'master' into feature/query-params-search-api-#259 ([`7ae6e77`](https://github.com/ral-facilities/datagateway-api/commit/7ae6e77d8372b37b14efd4fcc2ccb0c0af188540)) +* Merge branch 'master' into feature/query-params-search-api-#259 ([`7ae6e77`](https://github.com/ral-facilities/datagateway-api/commit/7ae6e77d8372b37b14efd4fcc2ccb0c0af188540)) + +* Merge branch 'master' into filter-input-conversion ([`8b4c216`](https://github.com/ral-facilities/datagateway-api/commit/8b4c21642b004a94742958b3b0c36c38eaf40986)) -* Merge branch 'master' into filter-input-conversion ([`8b4c216`](https://github.com/ral-facilities/datagateway-api/commit/8b4c21642b004a94742958b3b0c36c38eaf40986)) ## v3.1.1 (2021-12-15) -### Chore +### Chores * chore: add pattern to gitignore -- I've got a few different config files as I'm switching between the old and new config style, so this change keeps them from Git worrying about them ([`b851f96`](https://github.com/ral-facilities/datagateway-api/commit/b851f969b0e5503d341c6251e7057c1cb7856c0c)) +- I've got a few different config files as I'm switching between the old and new config style, so this change keeps them from Git worrying about them ([`b851f96`](https://github.com/ral-facilities/datagateway-api/commit/b851f969b0e5503d341c6251e7057c1cb7856c0c)) + +### Code Style + +* style: remove irrelevant comment #264 ([`b43db8a`](https://github.com/ral-facilities/datagateway-api/commit/b43db8a1369cda10c4b9d7dcc1ab33ff95992966)) + +* style: remove comments #264 ([`46c15cc`](https://github.com/ral-facilities/datagateway-api/commit/46c15cc35535332850fba3af528632f636b7f2f5)) + +* style: fix linting issues #259 ([`b0a4c47`](https://github.com/ral-facilities/datagateway-api/commit/b0a4c47416da78cbc093c4137f3f50c034abc518)) + +* style: make `get_query_filter()` less complex #259 + +- I've moved most of the functionality into separate functions, so flake8 doesn't complain that `get_query_filter()` is too complex ([`c09c982`](https://github.com/ral-facilities/datagateway-api/commit/c09c982977dcb70a8ed8a82a21be607b47cca19c)) + +* style: add logging to satisfy linter #259 ([`f7d9829`](https://github.com/ral-facilities/datagateway-api/commit/f7d98297c3b100dedffe0e68f3a3c40d65086042)) -### Feature +* style: clean up comments #259 ([`94af185`](https://github.com/ral-facilities/datagateway-api/commit/94af185d4f8cd1bc270e99354f2eb4c3105b29ad)) + +### Features * feat: convert PaNOSC to ICAT for where filter fields #260 ([`ff9595d`](https://github.com/ral-facilities/datagateway-api/commit/ff9595d2f571211db79dea02f702d4148b8879f3)) @@ -2031,11 +2147,11 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * feat: add first pass of query param implementation #259 ([`ee668e3`](https://github.com/ral-facilities/datagateway-api/commit/ee668e38cd43354851163616a93924ad84e14b90)) -### Fix +### Fixes * fix: correct reference to class name #264 ([`fc4c180`](https://github.com/ral-facilities/datagateway-api/commit/fc4c18085ab496d838e8d1e9e3f8c77f07826e9d)) -### Refactor +### Refactoring * refactor: correct models following updates to data model guide #264 ([`6b18d63`](https://github.com/ral-facilities/datagateway-api/commit/6b18d63b2f9b69aca5290d82dba044c58470b664)) @@ -2051,7 +2167,7 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * refactor: edit model to follow deliverable document more #264 -- Where the deliverable document hasn't given sufficient detail, we have fallen back on the data models markdown. ([`84116af`](https://github.com/ral-facilities/datagateway-api/commit/84116af3a78538682ecaaa71cf69af7e70293174)) +- Where the deliverable document hasn't given sufficient detail, we have fallen back on the data models markdown. ([`84116af`](https://github.com/ral-facilities/datagateway-api/commit/84116af3a78538682ecaaa71cf69af7e70293174)) * refactor: make use of pydantic in data models #264 ([`54196da`](https://github.com/ral-facilities/datagateway-api/commit/54196da6e6dbe4be81d2307965a75ad354112d0a)) @@ -2075,23 +2191,7 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c - This is in preparation to add a `SearchAPIQueryFilterFactory` where a single query parameter will have multiple filters - This commit also fixes the tests which impact this change ([`04d92f7`](https://github.com/ral-facilities/datagateway-api/commit/04d92f76001b107fc36452057106a0a13124d517)) -### Style - -* style: remove irrelevant comment #264 ([`b43db8a`](https://github.com/ral-facilities/datagateway-api/commit/b43db8a1369cda10c4b9d7dcc1ab33ff95992966)) - -* style: remove comments #264 ([`46c15cc`](https://github.com/ral-facilities/datagateway-api/commit/46c15cc35535332850fba3af528632f636b7f2f5)) - -* style: fix linting issues #259 ([`b0a4c47`](https://github.com/ral-facilities/datagateway-api/commit/b0a4c47416da78cbc093c4137f3f50c034abc518)) - -* style: make `get_query_filter()` less complex #259 - -- I've moved most of the functionality into separate functions, so flake8 doesn't complain that `get_query_filter()` is too complex ([`c09c982`](https://github.com/ral-facilities/datagateway-api/commit/c09c982977dcb70a8ed8a82a21be607b47cca19c)) - -* style: add logging to satisfy linter #259 ([`f7d9829`](https://github.com/ral-facilities/datagateway-api/commit/f7d98297c3b100dedffe0e68f3a3c40d65086042)) - -* style: clean up comments #259 ([`94af185`](https://github.com/ral-facilities/datagateway-api/commit/94af185d4f8cd1bc270e99354f2eb4c3105b29ad)) - -### Test +### Testing * test: add tests for applying WHERE filters #260 ([`f326e02`](https://github.com/ral-facilities/datagateway-api/commit/f326e0288eb818c96fc7dcc464db7fb4f6c855e8)) @@ -2101,7 +2201,7 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * test: refactor tests for where filter in include #259 ([`d6c62ea`](https://github.com/ral-facilities/datagateway-api/commit/d6c62ea64443eb8ee0f2c248d873d13ef8d4a9d1)) -* test: remove test cases on things we're not going to support #259 ([`38d17a5`](https://github.com/ral-facilities/datagateway-api/commit/38d17a53cd7e58e72dbe1d4c1b9804331e2f5c51)) +* test: remove test cases on things we're not going to support #259 ([`38d17a5`](https://github.com/ral-facilities/datagateway-api/commit/38d17a53cd7e58e72dbe1d4c1b9804331e2f5c51)) * test: refactor `TestSearchAPIQueryFilterFactory` #259 ([`1abaf66`](https://github.com/ral-facilities/datagateway-api/commit/1abaf6689e8f96af598f408d8106eeb3813390f0)) @@ -2109,7 +2209,7 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c * test: fix some query param tests #259 -- It's a big ol' file this! ([`2106e99`](https://github.com/ral-facilities/datagateway-api/commit/2106e9960da40aca18a913e29d9c2c7c6f6512d9)) +- It's a big ol' file this! ([`2106e99`](https://github.com/ral-facilities/datagateway-api/commit/2106e9960da40aca18a913e29d9c2c7c6f6512d9)) * test: fix tests for `NestedWhereFilters` #259 ([`46cb5c3`](https://github.com/ral-facilities/datagateway-api/commit/46cb5c3bd72cea6f34f9b62084d17275941d72a2)) @@ -2143,7 +2243,7 @@ Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.c Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/datagateway-api/commit/206cea8d3f7dece888ed99424210b6d5ea9799e9)) -* Merge remote-tracking branch 'origin/add-panosc-search-api-data-model-#264' into filter-input-conversion ([`ff745ec`](https://github.com/ral-facilities/datagateway-api/commit/ff745ec547ecf8384504c4c940dadd4053951b5f)) +* Merge remote-tracking branch 'origin/add-panosc-search-api-data-model-#264' into filter-input-conversion ([`ff745ec`](https://github.com/ral-facilities/datagateway-api/commit/ff745ec547ecf8384504c4c940dadd4053951b5f)) * add basic implementation of `SearchAPIQuery` #265 ([`8479d23`](https://github.com/ral-facilities/datagateway-api/commit/8479d23c332fb95aa88fa450c2eb6792c78fce1a)) @@ -2153,9 +2253,9 @@ Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/ * add blank mapping file #265 ([`978a8bd`](https://github.com/ral-facilities/datagateway-api/commit/978a8bd6fb2260597474da199817baa8c9b4f6bd)) -* Merge branch 'add-panosc-search-api-data-model-#264' into filter-input-conversion ([`9473782`](https://github.com/ral-facilities/datagateway-api/commit/9473782db97fd3a25bd3eaa34d6222643f9f24db)) +* Merge branch 'add-panosc-search-api-data-model-#264' into filter-input-conversion ([`9473782`](https://github.com/ral-facilities/datagateway-api/commit/9473782db97fd3a25bd3eaa34d6222643f9f24db)) -* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`75f8a91`](https://github.com/ral-facilities/datagateway-api/commit/75f8a91acf62a3bb7fab37f24eb38d8fe2112e6d)) +* Merge branch 'feature/query-params-search-api-#259' into filter-input-conversion ([`75f8a91`](https://github.com/ral-facilities/datagateway-api/commit/75f8a91acf62a3bb7fab37f24eb38d8fe2112e6d)) * make LHS and RHS support lists of WHERE filters #259 @@ -2164,7 +2264,7 @@ Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/ * add functionality to deal with an empty RHS #259 -- Relevant when a filter input has a boolean operator but there's only one condition in that list. Makes the boolean operator redundant but is still an edge case we should support +- Relevant when a filter input has a boolean operator but there's only one condition in that list. Makes the boolean operator redundant but is still an edge case we should support - Additional test cases have been added to cover this ([`ea5deb0`](https://github.com/ral-facilities/datagateway-api/commit/ea5deb0bbeebe6955d9cf7a05d6fba2ff03d46fc)) * add `__repr__` functions for easier testing #259 ([`df323fe`](https://github.com/ral-facilities/datagateway-api/commit/df323fecd78dc0d37c84176597401db882c9233f)) @@ -2177,7 +2277,7 @@ Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/ * move string conversion to `__str__()` #259 -- This means when the input is of type `SearchAPIWhereFilter`, it won't execute Python ICAT code until the filter needs to be applied/processed ([`0c4f9ac`](https://github.com/ral-facilities/datagateway-api/commit/0c4f9ac194aea8b3393e203f6acf68de1ab53975)) +- This means when the input is of type `SearchAPIWhereFilter`, it won't execute Python ICAT code until the filter needs to be applied/processed ([`0c4f9ac`](https://github.com/ral-facilities/datagateway-api/commit/0c4f9ac194aea8b3393e203f6acf68de1ab53975)) * pass in entity name to `get_query_filter()` to be used by text operator #259 ([`1d24021`](https://github.com/ral-facilities/datagateway-api/commit/1d24021ce32fe7fa9843de7c438aa6713d4eb44e)) @@ -2187,7 +2287,7 @@ Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/ * move text operator logic to WHERE filter #259 ([`cdb30ff`](https://github.com/ral-facilities/datagateway-api/commit/cdb30ff0d4ebc8a0901e385d14bbd623f7c96fbb)) -* Merge branch 'master' into feature/query-params-search-api-#259 ([`434aeeb`](https://github.com/ral-facilities/datagateway-api/commit/434aeeb546bca4f171e4cd88b861c5ed29b705cc)) +* Merge branch 'master' into feature/query-params-search-api-#259 ([`434aeeb`](https://github.com/ral-facilities/datagateway-api/commit/434aeeb546bca4f171e4cd88b861c5ed29b705cc)) * add support for text operator in query params #259 ([`19ff841`](https://github.com/ral-facilities/datagateway-api/commit/19ff8418d04104abcf92b9ba443b4449fd6c076c)) @@ -2195,27 +2295,32 @@ Add PaNOSC Search API Data Model ([`206cea8`](https://github.com/ral-facilities/ * add boolean operator to WHERE filter creation #259 ([`6882b9f`](https://github.com/ral-facilities/datagateway-api/commit/6882b9fa4c571ec7d6d20f7183f7c50e08879077)) -* Merge branch 'master' into feature/query-params-search-api-#259 ([`cab9f3f`](https://github.com/ral-facilities/datagateway-api/commit/cab9f3f4870fbd957c4e912f901e1fc9b897aeca)) +* Merge branch 'master' into feature/query-params-search-api-#259 ([`cab9f3f`](https://github.com/ral-facilities/datagateway-api/commit/cab9f3f4870fbd957c4e912f901e1fc9b897aeca)) * add fetch filters to search API endpoints #259 ([`22e8a73`](https://github.com/ral-facilities/datagateway-api/commit/22e8a738385cb77f5cfa2cfff616590cfa571638)) * add boolean operator to WHERE filter #259 ([`12c680f`](https://github.com/ral-facilities/datagateway-api/commit/12c680fdcea546e594e463a26205a743399d0623)) -* Merge branch 'feature/search-api-endpoint-definition-#257' into feature/query-params-search-api-#259 ([`78ec0fc`](https://github.com/ral-facilities/datagateway-api/commit/78ec0fcbeca0fb43ed16540486b2bbfa0954fe54)) +* Merge branch 'feature/search-api-endpoint-definition-#257' into feature/query-params-search-api-#259 ([`78ec0fc`](https://github.com/ral-facilities/datagateway-api/commit/78ec0fcbeca0fb43ed16540486b2bbfa0954fe54)) * Merge pull request #295 from ral-facilities/implement-limit-and-skip-filters Implement Limit and Skip filters ([`dd23cce`](https://github.com/ral-facilities/datagateway-api/commit/dd23cce935102c99526668736a0ccbe0e8bf27d5)) -* Merge branch 'master' into implement-limit-and-skip-filters ([`a01072c`](https://github.com/ral-facilities/datagateway-api/commit/a01072c33c435477096282237ce11565bb5a3c81)) +* Merge branch 'master' into implement-limit-and-skip-filters ([`a01072c`](https://github.com/ral-facilities/datagateway-api/commit/a01072c33c435477096282237ce11565bb5a3c81)) + ## v3.1.0 (2021-12-06) -### Feature +### Code Style + +* style: make changes to satisfy flake8 #258 ([`a261774`](https://github.com/ral-facilities/datagateway-api/commit/a261774a6d31e351d5ac9ed313714ed103250550)) + +### Features * feat: implement session/client handling for search API #258 ([`46a1539`](https://github.com/ral-facilities/datagateway-api/commit/46a1539398f63e9c8a6539d703a164dd7c8749e7)) -### Refactor +### Refactoring * refactor: move config to its own class #258 @@ -2229,21 +2334,17 @@ Implement Limit and Skip filters ([`dd23cce`](https://github.com/ral-facilities/ * refactor: allow `PythonICATSkipFilter` to use Search API config #263 ([`5ab60de`](https://github.com/ral-facilities/datagateway-api/commit/5ab60de0c48b7a2e63330b6278d547d29157bcce)) -### Style - -* style: make changes to satisfy flake8 #258 ([`a261774`](https://github.com/ral-facilities/datagateway-api/commit/a261774a6d31e351d5ac9ed313714ed103250550)) - -### Test +### Testing * test: remove print statement -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`67a119b`](https://github.com/ral-facilities/datagateway-api/commit/67a119b751ac9245b94595a7bc7b669a5c917ecd)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`67a119b`](https://github.com/ral-facilities/datagateway-api/commit/67a119b751ac9245b94595a7bc7b669a5c917ecd)) * test: fix imports #258 ([`8508af0`](https://github.com/ral-facilities/datagateway-api/commit/8508af015f0c16bf0d2a1d5fd9c441c6e24a7689)) * test: use alternate fixture -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`00c76b9`](https://github.com/ral-facilities/datagateway-api/commit/00c76b978634f6e73ef121e3c0b6e57a3df98688)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`00c76b9`](https://github.com/ral-facilities/datagateway-api/commit/00c76b978634f6e73ef121e3c0b6e57a3df98688)) * test: add tests for search API session/client handling #258 ([`b7dea73`](https://github.com/ral-facilities/datagateway-api/commit/b7dea7378be9fee6c0323b7ec8b9608ff87996a3)) @@ -2269,17 +2370,18 @@ Search API Session/Client Handling ([`93905e3`](https://github.com/ral-facilitie * add helper functions for each endpoint type for search API #258 ([`1049a5f`](https://github.com/ral-facilities/datagateway-api/commit/1049a5f82feef3f5909440e4e928a43f969c4219)) + ## v3.0.1 (2021-11-24) -### Fix +### Fixes * fix: allow blank extensions and slash extension to be valid ([`70ddb7a`](https://github.com/ral-facilities/datagateway-api/commit/70ddb7a4fd89ba10b06cd71c3ab2a98648cfb773)) -### Test +### Testing * test: correct test data -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`f4339f2`](https://github.com/ral-facilities/datagateway-api/commit/f4339f24d3f297323d215173a411873bd6920a84)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`f4339f2`](https://github.com/ral-facilities/datagateway-api/commit/f4339f24d3f297323d215173a411873bd6920a84)) * test: add tests for extension validation logic ([`36b42c0`](https://github.com/ral-facilities/datagateway-api/commit/36b42c0899b298e4d7a546383dff3dbb06cce924)) @@ -2289,9 +2391,10 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( Extension Validation Bugfix ([`1a10fd4`](https://github.com/ral-facilities/datagateway-api/commit/1a10fd4f4a81e128d07435dbe5b89500f23a6dc7)) + ## v3.0.0 (2021-11-23) -### Style +### Code Style * style: fix formatting and remove TODO #283 ([`9129288`](https://github.com/ral-facilities/datagateway-api/commit/9129288bd8b2d2080419720d62d5716a0983a7f2)) @@ -2301,9 +2404,10 @@ Extension Validation Bugfix ([`1a10fd4`](https://github.com/ral-facilities/datag Respect Config for Search API Endpoints ([`20c46a1`](https://github.com/ral-facilities/datagateway-api/commit/20c46a15020e4294d6dbd291d9f9c31615e8e3fd)) -* Merge branch 'respect-config-for-search-api-endpoints-#283' of github.com:ral-facilities/datagateway-api into respect-config-for-search-api-endpoints-#283 ([`c029aae`](https://github.com/ral-facilities/datagateway-api/commit/c029aae951b1152022bb36d34983fd733f99b344)) +* Merge branch 'respect-config-for-search-api-endpoints-#283' of github.com:ral-facilities/datagateway-api into respect-config-for-search-api-endpoints-#283 ([`c029aae`](https://github.com/ral-facilities/datagateway-api/commit/c029aae951b1152022bb36d34983fd733f99b344)) + +* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`0edfb2e`](https://github.com/ral-facilities/datagateway-api/commit/0edfb2e083b4426f50913479a67ff0fad68c5e48)) -* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`0edfb2e`](https://github.com/ral-facilities/datagateway-api/commit/0edfb2e083b4426f50913479a67ff0fad68c5e48)) ## v2.0.0 (2021-11-22) @@ -2311,13 +2415,13 @@ Respect Config for Search API Endpoints ([`20c46a1`](https://github.com/ral-faci * docs: adjust versioning documentation -BREAKING CHANGE: Adding breaking change to correct the version bump which didn't happen when merging #285 ([`44c48e8`](https://github.com/ral-facilities/datagateway-api/commit/44c48e8b772147bfcf395d1430e067730d66df44)) +BREAKING CHANGE: Adding breaking change to correct the version bump which didn't happen when merging #285 ([`44c48e8`](https://github.com/ral-facilities/datagateway-api/commit/44c48e8b772147bfcf395d1430e067730d66df44)) * feat: configure end part of endpoint urls to contain api extension #283 BREAKING CHANGE: modify endpoint urls to use relevant api extension ([`5bdd72e`](https://github.com/ral-facilities/datagateway-api/commit/5bdd72ea911323cdf0fc7d9ec6fb419b8dd6006c)) -### Test +### Testing * test: fix failing tests #283 ([`6aac97b`](https://github.com/ral-facilities/datagateway-api/commit/6aac97b183e9ee3c43bd02cb986f8fb3ef017b6b)) @@ -2325,9 +2429,9 @@ BREAKING CHANGE: modify endpoint urls to use relevant api extension ([`5bdd72e`] ### Unknown -* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`a5ce9fa`](https://github.com/ral-facilities/datagateway-api/commit/a5ce9fa4642aaed564cb967557f3771f2f7d1189)) +* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`a5ce9fa`](https://github.com/ral-facilities/datagateway-api/commit/a5ce9fa4642aaed564cb967557f3771f2f7d1189)) -* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`1ba2b5e`](https://github.com/ral-facilities/datagateway-api/commit/1ba2b5e555f907d43fdc12fafcb61beb176a079c)) +* Merge branch 'master' into respect-config-for-search-api-endpoints-#283 ([`1ba2b5e`](https://github.com/ral-facilities/datagateway-api/commit/1ba2b5e555f907d43fdc12fafcb61beb176a079c)) * Merge pull request #285 from ral-facilities/add-datagateway-and-panosc-modes-#256 @@ -2335,23 +2439,24 @@ Add DataGateway and PaNOSC Modes ([`5fd00c4`](https://github.com/ral-facilities/ * validate api extensions #256 ([`8774537`](https://github.com/ral-facilities/datagateway-api/commit/8774537c7998ffd5769d1648e117b36ecc0748a5)) -* Merge branch 'master' into add-datagateway-and-panosc-modes-#256 ([`72201a3`](https://github.com/ral-facilities/datagateway-api/commit/72201a30f4a0e0b9bcf12de1d1c3ec709d90b202)) +* Merge branch 'master' into add-datagateway-and-panosc-modes-#256 ([`72201a3`](https://github.com/ral-facilities/datagateway-api/commit/72201a30f4a0e0b9bcf12de1d1c3ec709d90b202)) + ## v1.1.0 (2021-11-19) +### Code Style + +* style: change import order #257 ([`896d3b8`](https://github.com/ral-facilities/datagateway-api/commit/896d3b8e42f7a05697e15ce52e7998830d5d14c3)) + ### Documentation * docs: rebuild openapi docs #257 ([`de15357`](https://github.com/ral-facilities/datagateway-api/commit/de1535772db64916f75e16d79be3f3fdf10fc47c)) -### Feature +### Features * feat: add unimplemented endpoint definitions for search API #257 ([`d0e52d9`](https://github.com/ral-facilities/datagateway-api/commit/d0e52d96dd3b94ce54dcc9b81969e777a196922a)) -### Style - -* style: change import order #257 ([`896d3b8`](https://github.com/ral-facilities/datagateway-api/commit/896d3b8e42f7a05697e15ce52e7998830d5d14c3)) - -### Test +### Testing * test: add tests for search API endpoints #257 ([`bc1d09d`](https://github.com/ral-facilities/datagateway-api/commit/bc1d09d69aeb2378a7ec65a0f0350de3bb96deb5)) @@ -2361,11 +2466,11 @@ Add DataGateway and PaNOSC Modes ([`5fd00c4`](https://github.com/ral-facilities/ Define Endpoints for Search API ([`9e137c6`](https://github.com/ral-facilities/datagateway-api/commit/9e137c66953577cd7ab9573c1c7491561809bd60)) -* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`39f7c4b`](https://github.com/ral-facilities/datagateway-api/commit/39f7c4b2b0c4faaf7e81f81fadd9727b6c09dbbf)) +* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`39f7c4b`](https://github.com/ral-facilities/datagateway-api/commit/39f7c4b2b0c4faaf7e81f81fadd9727b6c09dbbf)) -* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`754136a`](https://github.com/ral-facilities/datagateway-api/commit/754136a4408133f541ff36377a37ebea363d5cae)) +* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`754136a`](https://github.com/ral-facilities/datagateway-api/commit/754136a4408133f541ff36377a37ebea363d5cae)) -* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`8ea6e2d`](https://github.com/ral-facilities/datagateway-api/commit/8ea6e2dec9f3da389415c424f59ed67b1e66d544)) +* Merge branch 'expands-search-api-structure' into feature/search-api-endpoint-definition-#257 ([`8ea6e2d`](https://github.com/ral-facilities/datagateway-api/commit/8ea6e2dec9f3da389415c424f59ed67b1e66d544)) * add explicit endpoint names to avoid collisions #257 @@ -2379,15 +2484,20 @@ Define Endpoints for Search API ([`9e137c6`](https://github.com/ral-facilities/d Search API Structure ([`14dfc2a`](https://github.com/ral-facilities/datagateway-api/commit/14dfc2a1f9424ae21e45078a3c2257976268034f)) -* Merge branch 'master' into expands-search-api-structure ([`a2de545`](https://github.com/ral-facilities/datagateway-api/commit/a2de545bfbdf724dc99f9a6d65475c3e36c4bdea)) +* Merge branch 'master' into expands-search-api-structure ([`a2de545`](https://github.com/ral-facilities/datagateway-api/commit/a2de545bfbdf724dc99f9a6d65475c3e36c4bdea)) + ## v1.0.1 (2021-11-15) -### Build +### Build System * build: fix poetry.lock issue #256 ([`59eca6e`](https://github.com/ral-facilities/datagateway-api/commit/59eca6e8cb0254731ba8cab5796ba6d9ff4bc993)) -### Ci +### Code Style + +* style: reorder import statements to satisfy flake8 ([`c0acd33`](https://github.com/ral-facilities/datagateway-api/commit/c0acd33212e654c7f5fdc42d42915163f0b4ac7b)) + +### Continuous Integration * ci: specify Python 3.9.7 to fix issue found with 3.9.8 @@ -2397,13 +2507,13 @@ Details of error encountered can be seen at: https://www.mail-archive.com/debian * docs: add study PID to swagger docs #287 ([`89a9e27`](https://github.com/ral-facilities/datagateway-api/commit/89a9e27b72dfe1d474d49a721f128a643ef2ae36)) -### Fix +### Fixes * fix: add PID field for study in DB backend #287 ([`18379be`](https://github.com/ral-facilities/datagateway-api/commit/18379becafd23ff2957e556de2bd3fc210a71f5b)) * fix: add generation of study.pid #287 ([`f6a8ebc`](https://github.com/ral-facilities/datagateway-api/commit/f6a8ebc6c775ba3f5252d5af5cedc4e1e0e79a40)) -### Refactor +### Refactoring * refactor: move PID specific Faker instance into relevant generator class #287 ([`4f282dc`](https://github.com/ral-facilities/datagateway-api/commit/4f282dc9f1c6d96f5a14d04dc275681b61b87042)) @@ -2413,11 +2523,7 @@ Details of error encountered can be seen at: https://www.mail-archive.com/debian * refactor: make non-mandatory production config options optional ([`7d68501`](https://github.com/ral-facilities/datagateway-api/commit/7d68501a3c805302fa73df0faa6e10b4f0a85bbe)) -### Style - -* style: reorder import statements to satisfy flake8 ([`c0acd33`](https://github.com/ral-facilities/datagateway-api/commit/c0acd33212e654c7f5fdc42d42915163f0b4ac7b)) - -### Test +### Testing * test: fix failing tests #283 ([`e69af78`](https://github.com/ral-facilities/datagateway-api/commit/e69af7806cb92bd0be9ca85141c355d9b432bd85)) @@ -2443,11 +2549,11 @@ BREAKING CHANGE: modify endpoint urls to use relevant api extension ([`81fa469`] * create api endpoints based on config objects #283 ([`cbdaed6`](https://github.com/ral-facilities/datagateway-api/commit/cbdaed6632c2ffb53ad50c58004608fcfab86f3e)) -* Merge branch 'feature/search-api-endpoint-definition-#257' into respect-config-for-search-api-endpoints-#283 ([`0b685e8`](https://github.com/ral-facilities/datagateway-api/commit/0b685e85e300f688f6f2e3da41efb3f47e140394)) +* Merge branch 'feature/search-api-endpoint-definition-#257' into respect-config-for-search-api-endpoints-#283 ([`0b685e8`](https://github.com/ral-facilities/datagateway-api/commit/0b685e85e300f688f6f2e3da41efb3f47e140394)) -* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`c23b0e5`](https://github.com/ral-facilities/datagateway-api/commit/c23b0e5856340e5b2f201643737e45dfb5fedfc2)) +* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`c23b0e5`](https://github.com/ral-facilities/datagateway-api/commit/c23b0e5856340e5b2f201643737e45dfb5fedfc2)) -* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`dc6dba4`](https://github.com/ral-facilities/datagateway-api/commit/dc6dba4976b1e9d441660332d520f30379331563)) +* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`dc6dba4`](https://github.com/ral-facilities/datagateway-api/commit/dc6dba4976b1e9d441660332d520f30379331563)) * change directory structure of API ([`bf35193`](https://github.com/ral-facilities/datagateway-api/commit/bf35193c57d36b7af9df44a9746ad95ab9df9b12)) @@ -2455,15 +2561,16 @@ BREAKING CHANGE: modify endpoint urls to use relevant api extension ([`81fa469`] BREAKING CHANGE: extend configuration to allow for different API modes ([`be64faf`](https://github.com/ral-facilities/datagateway-api/commit/be64faf9c2bb641d207a2b8a22a03ba68217682c)) -* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`b57c127`](https://github.com/ral-facilities/datagateway-api/commit/b57c127bdc4a6b63c9fcc3a43e627276f2313370)) +* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`b57c127`](https://github.com/ral-facilities/datagateway-api/commit/b57c127bdc4a6b63c9fcc3a43e627276f2313370)) + +* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`f51a7b3`](https://github.com/ral-facilities/datagateway-api/commit/f51a7b301200277841b02318f4ee33c16bdda468)) -* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`f51a7b3`](https://github.com/ral-facilities/datagateway-api/commit/f51a7b301200277841b02318f4ee33c16bdda468)) +* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`fb738dd`](https://github.com/ral-facilities/datagateway-api/commit/fb738dd04dcad730a7020a81957c4574dfebfebf)) -* Merge branch 'expands-search-api-structure' into add-datagateway-and-panosc-modes-#256 ([`fb738dd`](https://github.com/ral-facilities/datagateway-api/commit/fb738dd04dcad730a7020a81957c4574dfebfebf)) +* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`01d86fd`](https://github.com/ral-facilities/datagateway-api/commit/01d86fd54950ba99e50bc3abb06fa0164a6abdbb)) -* Merge branch 'expands-search-api-structure' of github.com:ral-facilities/datagateway-api into expands-search-api-structure ([`01d86fd`](https://github.com/ral-facilities/datagateway-api/commit/01d86fd54950ba99e50bc3abb06fa0164a6abdbb)) +* Merge branch 'master' into expands-search-api-structure ([`c87b6cd`](https://github.com/ral-facilities/datagateway-api/commit/c87b6cdf435b5c2254ce8ca46c6187ac3a78cc26)) -* Merge branch 'master' into expands-search-api-structure ([`c87b6cd`](https://github.com/ral-facilities/datagateway-api/commit/c87b6cdf435b5c2254ce8ca46c6187ac3a78cc26)) ## v1.0.0 (2021-11-03) @@ -2473,7 +2580,7 @@ BREAKING CHANGE: extend configuration to allow for different API modes ([`be64fa BREAKING CHANGE: As the API will be approaching production use soon, this seems like a good opportunity to bump the version to 1.0.0. This also serves as a good test that the introduction of automatic versioning actually works ([`ccf6d29`](https://github.com/ral-facilities/datagateway-api/commit/ccf6d2974216f8979a03e3e223f7c9e84ced05cb)) -### Build +### Build System * build: Add dependency to help with versioning releases #242 ([`1afbd71`](https://github.com/ral-facilities/datagateway-api/commit/1afbd71b169f068b58c14332513ccaa27569e4e8)) @@ -2485,7 +2592,7 @@ BREAKING CHANGE: As the API will be approaching production use soon, this seems * build: set min python version to 3.6.1 #256 ([`fd4e70c`](https://github.com/ral-facilities/datagateway-api/commit/fd4e70ccd8000c5a9705cf21a8eed503041dd900)) -### Ci +### Continuous Integration * ci: use admin personal access token to automate releases ([`fd76315`](https://github.com/ral-facilities/datagateway-api/commit/fd763154c31ad183a989f807bfbf2926a2de4ae4)) @@ -2497,17 +2604,17 @@ BREAKING CHANGE: As the API will be approaching production use soon, this seems * docs: follow Angular commit message capitalisation #242 -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`d53d85a`](https://github.com/ral-facilities/datagateway-api/commit/d53d85ad46a115ba871c6da8273a242e790c810c)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`d53d85a`](https://github.com/ral-facilities/datagateway-api/commit/d53d85ad46a115ba871c6da8273a242e790c810c)) -### Refactor +### Refactoring * refactor: #257: Add unimplemented endpoint classes -- Matching DataGateway API's class structure, with relevant TODOs to add in code when endpoints are defined and implemented ([`f2f5edc`](https://github.com/ral-facilities/datagateway-api/commit/f2f5edcbc412d205eafdd9bfe4a0603386063e75)) +- Matching DataGateway API's class structure, with relevant TODOs to add in code when endpoints are defined and implemented ([`f2f5edc`](https://github.com/ral-facilities/datagateway-api/commit/f2f5edcbc412d205eafdd9bfe4a0603386063e75)) * refactor: use pydantic for configuration handling #256 ([`0cca696`](https://github.com/ral-facilities/datagateway-api/commit/0cca696ac8e4cf42385d7a3dbd2deb0191cde52c)) -### Test +### Testing * test: unit test config logic #256 @@ -2528,7 +2635,7 @@ Fix Automated Releases ([`12d3fc9`](https://github.com/ral-facilities/datagatewa Semantic Versioning ([`a24b330`](https://github.com/ral-facilities/datagateway-api/commit/a24b3309cf5c76364c36229894fbab7d718e57d0)) -* Merge branch 'master' into feature-versioning-#242 ([`fe53174`](https://github.com/ral-facilities/datagateway-api/commit/fe53174b18d72629f32c2b76cd0907df6b7c4e9a)) +* Merge branch 'master' into feature-versioning-#242 ([`fe53174`](https://github.com/ral-facilities/datagateway-api/commit/fe53174b18d72629f32c2b76cd0907df6b7c4e9a)) * #243: Upgrade Python ICAT version ([`b59abba`](https://github.com/ral-facilities/datagateway-api/commit/b59abba226d8673639403d6cb0f6b2066056b6cc)) @@ -2565,19 +2672,19 @@ Semantic Versioning ([`a24b330`](https://github.com/ral-facilities/datagateway-a - Since this repository will support DataGateway API and the Search API, there needs to be some changes in directory structure to split the different files up. Essentially this means adding `datagateway_api/` and `search_api/` in `common/` and `src/resources/` - The imports will be fixed in a future commit ([`b57b92d`](https://github.com/ral-facilities/datagateway-api/commit/b57b92d19155f554c533b526922aa483a8ef9f09)) -* Merge branch 'master' into expands-search-api-structure ([`0e35684`](https://github.com/ral-facilities/datagateway-api/commit/0e356848cf24461482a18fa7fe03cd0d63c5cd85)) +* Merge branch 'master' into expands-search-api-structure ([`0e35684`](https://github.com/ral-facilities/datagateway-api/commit/0e356848cf24461482a18fa7fe03cd0d63c5cd85)) * Merge pull request #273 from ral-facilities/feature/ilike-operator-#243 Add Insensitive Like Operator to WHERE Filter ([`822408b`](https://github.com/ral-facilities/datagateway-api/commit/822408bddcdc992b4404c29ac215309421916fa2)) -* Merge branch 'bugfix/default-python-version' into feature/ilike-operator-#243 ([`550de36`](https://github.com/ral-facilities/datagateway-api/commit/550de3651fe4778427894bb0cb744f597d153e22)) +* Merge branch 'bugfix/default-python-version' into feature/ilike-operator-#243 ([`550de36`](https://github.com/ral-facilities/datagateway-api/commit/550de3651fe4778427894bb0cb744f597d153e22)) * #243: Upgrade Python ICAT version ([`39424fa`](https://github.com/ral-facilities/datagateway-api/commit/39424fa05581e934112c9cafd415cc58b22c1a22)) * #243: Fix spacing on PR template ([`f8a3a9b`](https://github.com/ral-facilities/datagateway-api/commit/f8a3a9bc56779a8ced661507064d77404077fbb4)) -* Merge branch 'master' into feature/ilike-operator-#243 ([`f69f136`](https://github.com/ral-facilities/datagateway-api/commit/f69f1361603eaa92b31ac1000e0776a77afd3bec)) +* Merge branch 'master' into feature/ilike-operator-#243 ([`f69f136`](https://github.com/ral-facilities/datagateway-api/commit/f69f1361603eaa92b31ac1000e0776a77afd3bec)) * #243: Add tests for ilike and nilike operators ([`19c48a5`](https://github.com/ral-facilities/datagateway-api/commit/19c48a560dbd331c370b9f5a4afdfde768eef348)) @@ -2601,7 +2708,7 @@ Upgrade `werkzeug` for security reasons ([`9ef4f8e`](https://github.com/ral-faci * Add flake8 ignore comments to long imports ([`b60f532`](https://github.com/ral-facilities/datagateway-api/commit/b60f5322c0805fbc22fcb8e94579961c2a67950e)) -* Merge branch 'bugfix/default-python-version' into expands-search-api-structure ([`0b7c9fd`](https://github.com/ral-facilities/datagateway-api/commit/0b7c9fd8efba77744837c24020322fbce65cd15b)) +* Merge branch 'bugfix/default-python-version' into expands-search-api-structure ([`0b7c9fd`](https://github.com/ral-facilities/datagateway-api/commit/0b7c9fd8efba77744837c24020322fbce65cd15b)) * Fix spacing in PR template ([`42c29be`](https://github.com/ral-facilities/datagateway-api/commit/42c29bef80ebec2584983603e629584ff21e601f)) @@ -2624,7 +2731,7 @@ Upgrade `werkzeug` for security reasons ([`9ef4f8e`](https://github.com/ral-faci * #257: Add unimplemented endpoint classes -- Matching DataGateway API's class structure, with relevant TODOs to add in code when endpoints are defined and implemented ([`4dd84e0`](https://github.com/ral-facilities/datagateway-api/commit/4dd84e06b1add7ee7e6bc08f2817333694f5d005)) +- Matching DataGateway API's class structure, with relevant TODOs to add in code when endpoints are defined and implemented ([`4dd84e0`](https://github.com/ral-facilities/datagateway-api/commit/4dd84e06b1add7ee7e6bc08f2817333694f5d005)) * #258: Set out file for search API session handling @@ -2632,7 +2739,7 @@ Upgrade `werkzeug` for security reasons ([`9ef4f8e`](https://github.com/ral-faci * #260: Add class definitions for search API filters -- This just inherits from the Python ICAT versions for now as they're unimplemented for the time being ([`5a9aba9`](https://github.com/ral-facilities/datagateway-api/commit/5a9aba9f14eec79d17532dd125e618f8be6167f8)) +- This just inherits from the Python ICAT versions for now as they're unimplemented for the time being ([`5a9aba9`](https://github.com/ral-facilities/datagateway-api/commit/5a9aba9f14eec79d17532dd125e618f8be6167f8)) * #264, #265: Add unimplemented search API data models @@ -2649,7 +2756,7 @@ Change ICAT Ansible back to master ([`a426ec7`](https://github.com/ral-facilitie * #271: Update version of Poetry used -- Hopefully this will fix the `'Link' object has no attribute 'is_absolute'` error seen on GitHub Actions when installing the API's dependencies ([`0b02151`](https://github.com/ral-facilities/datagateway-api/commit/0b021510e622f2319daeea0ea8211bcf6f839b61)) +- Hopefully this will fix the `'Link' object has no attribute 'is_absolute'` error seen on GitHub Actions when installing the API's dependencies ([`0b02151`](https://github.com/ral-facilities/datagateway-api/commit/0b021510e622f2319daeea0ea8211bcf6f839b61)) * #271: Only run unit tests on matrix version ([`621df10`](https://github.com/ral-facilities/datagateway-api/commit/621df104bafe7397d0a44d8d9757453bb7945252)) @@ -2671,7 +2778,7 @@ Increase Test Coverage ([`87fbbeb`](https://github.com/ral-facilities/datagatewa * #250: Add test class for ICATClient -- Class used to create object pools of Python ICAT's client class ([`9e0977d`](https://github.com/ral-facilities/datagateway-api/commit/9e0977d534c02dcd7ebbe098c058352574c56558)) +- Class used to create object pools of Python ICAT's client class ([`9e0977d`](https://github.com/ral-facilities/datagateway-api/commit/9e0977d534c02dcd7ebbe098c058352574c56558)) * #250: Add test to mock Python ICAT data update failure ([`01cb60c`](https://github.com/ral-facilities/datagateway-api/commit/01cb60cc0a6152a745eab04b312fa4d07708a35d)) @@ -2679,7 +2786,7 @@ Increase Test Coverage ([`87fbbeb`](https://github.com/ral-facilities/datagatewa * #250: Add tests for OpenAPI type conversion ([`b946467`](https://github.com/ral-facilities/datagateway-api/commit/b94646723bd1799a55abce1caeee85df3982c112)) -* #250: Add test to mock session with < 0 mins remaining ([`4a3cf7e`](https://github.com/ral-facilities/datagateway-api/commit/4a3cf7ec53f006649b90607b5ceb854eaf25312b)) +* #250: Add test to mock session with < 0 mins remaining ([`4a3cf7e`](https://github.com/ral-facilities/datagateway-api/commit/4a3cf7ec53f006649b90607b5ceb854eaf25312b)) * #250: Add test to mock TypeError when setting query limits @@ -2715,7 +2822,7 @@ Add CI Generator Script Comparison ([`a393483`](https://github.com/ral-facilitie * #246: Remove debugging ([`4957dd3`](https://github.com/ral-facilities/datagateway-api/commit/4957dd31e38e39de85c2cea6b232d17d4a2b5e9b)) -* #246: Add setup for API's master version ([`d62e9b7`](https://github.com/ral-facilities/datagateway-api/commit/d62e9b71e253207dc07483f407fdc405f273e152)) +* #246: Add setup for API's master version ([`d62e9b7`](https://github.com/ral-facilities/datagateway-api/commit/d62e9b71e253207dc07483f407fdc405f273e152)) * #246: Add second test to CI generator script job @@ -2735,7 +2842,7 @@ Allow One-Many Related Orderings to not miss out blank results ([`34a8c42`](http * #238: Use default generator args for CI -- This will line up the CI's data with what I have locally and what is on SciGateway preprod's icatdb +- This will line up the CI's data with what I have locally and what is on SciGateway preprod's icatdb - This means the failing query test from a commit or two ago will work on CI ([`724acdf`](https://github.com/ral-facilities/datagateway-api/commit/724acdf39a83dd0524b16ce6f8e8535c6d8743a6)) * #238: Update Python ICAT to 0.19.0 ([`9bb24f3`](https://github.com/ral-facilities/datagateway-api/commit/9bb24f3a015b33e7c55afed604f711d4c9c77e2e)) @@ -2748,11 +2855,11 @@ Allow One-Many Related Orderings to not miss out blank results ([`34a8c42`](http * #238: Edit expected data on query test -- Not too sure why this is happening, perhaps the generator script fixes? Would've thought it would've brought this up in the relevant PR though but I'll monitor this via CI on this branch ([`6cd0d8d`](https://github.com/ral-facilities/datagateway-api/commit/6cd0d8d8cb8b5365297dd2ab67cb5dbb030fc2b6)) +- Not too sure why this is happening, perhaps the generator script fixes? Would've thought it would've brought this up in the relevant PR though but I'll monitor this via CI on this branch ([`6cd0d8d`](https://github.com/ral-facilities/datagateway-api/commit/6cd0d8d8cb8b5365297dd2ab67cb5dbb030fc2b6)) * #238: Implement join specs on queries with one-to-many ordering -- This feature is currently still in PR (therefore unreleased) so I haven't updated the dependency version, I will do so when Python ICAT is released for 0.19.0 ([`cbef7b9`](https://github.com/ral-facilities/datagateway-api/commit/cbef7b9274a931dd023e034233961fe67c052519)) +- This feature is currently still in PR (therefore unreleased) so I haven't updated the dependency version, I will do so when Python ICAT is released for 0.19.0 ([`cbef7b9`](https://github.com/ral-facilities/datagateway-api/commit/cbef7b9274a931dd023e034233961fe67c052519)) * Merge pull request #237 from ral-facilities/bugfix/icatdb-generator-data-#236 @@ -2807,7 +2914,7 @@ Allow related entities on DB distinct filter ([`205f155`](https://github.com/ral * #223: Remove underscore prefixes -- `_get_field()` is the only function in that class that's used internally, so I've remvoed the underscores from the other functions as I'm not sure I've used them correctly ([`0a202d3`](https://github.com/ral-facilities/datagateway-api/commit/0a202d3d739aceac0e07e3cc06533753bc9da5ed)) +- `_get_field()` is the only function in that class that's used internally, so I've remvoed the underscores from the other functions as I'm not sure I've used them correctly ([`0a202d3`](https://github.com/ral-facilities/datagateway-api/commit/0a202d3d739aceac0e07e3cc06533753bc9da5ed)) * #223: Add test cases for the bug fixed in previous commit ([`f16cb15`](https://github.com/ral-facilities/datagateway-api/commit/f16cb15a4360e6fb818db8409508d6f9352127e0)) @@ -2817,13 +2924,13 @@ Allow related entities on DB distinct filter ([`205f155`](https://github.com/ral * #223: Remove commented code -- This was the best solution I could find, particularly as the two init's have different method signatures ([`c9aa20b`](https://github.com/ral-facilities/datagateway-api/commit/c9aa20b1f92cb0471ebacc138e2fa601d525d92e)) +- This was the best solution I could find, particularly as the two init's have different method signatures ([`c9aa20b`](https://github.com/ral-facilities/datagateway-api/commit/c9aa20b1f92cb0471ebacc138e2fa601d525d92e)) * #225: Fix timezone-related issues found by merging master - These issues were a result of writing new code that involved timezones before master got merged in, which had the original fixes for timezones on DB backend ([`dc583a8`](https://github.com/ral-facilities/datagateway-api/commit/dc583a8155c0e2f20017cf996f6aeded94baedb1)) -* Merge branch 'master' into feature/distinct-filter-related-entities-#223 ([`bfa8c84`](https://github.com/ral-facilities/datagateway-api/commit/bfa8c84de7bf9d4acf8aa6521e265be976051e72)) +* Merge branch 'master' into feature/distinct-filter-related-entities-#223 ([`bfa8c84`](https://github.com/ral-facilities/datagateway-api/commit/bfa8c84de7bf9d4acf8aa6521e265be976051e72)) * Merge pull request #229 from ral-facilities/bugfix/optional-config-options-#228 @@ -2855,7 +2962,7 @@ Update dependencies to prevent Poetry warning ([`f8b1136`](https://github.com/ra * #223: Fix bug where single related distinct field was given -- This fixes requests such as: `/investigations?distinct=["investigationtype.createTime"]` ([`0dfa7a3`](https://github.com/ral-facilities/datagateway-api/commit/0dfa7a384fe637bf3427ad40446bff196547d993)) +- This fixes requests such as: `/investigations?distinct=["investigationtype.createTime"]` ([`0dfa7a3`](https://github.com/ral-facilities/datagateway-api/commit/0dfa7a384fe637bf3427ad40446bff196547d993)) * #223: Add tests for _get_entity_model_for_filter() ([`3916a56`](https://github.com/ral-facilities/datagateway-api/commit/3916a561ce7af57eac13eaeeec488364bdfbc760)) @@ -2894,19 +3001,19 @@ Update dependencies to prevent Poetry warning ([`f8b1136`](https://github.com/ra Refactor config to be aware of the backend in use ([`0c68549`](https://github.com/ral-facilities/datagateway-api/commit/0c68549a857553f5aa6c934c16356aedf8286ac3)) -* Merge branch 'master' into refactor/config-backend-specific-#210 ([`5d83b92`](https://github.com/ral-facilities/datagateway-api/commit/5d83b9203be6b873bf350f873a4ae85aba02cf15)) +* Merge branch 'master' into refactor/config-backend-specific-#210 ([`5d83b92`](https://github.com/ral-facilities/datagateway-api/commit/5d83b9203be6b873bf350f873a4ae85aba02cf15)) * Merge pull request #216 from ral-facilities/bugfix/client-cache-#209 Improve Client Handling ([`99450bc`](https://github.com/ral-facilities/datagateway-api/commit/99450bca14c029939bd65225889bcffa0893b610)) -* Merge branch 'master' into bugfix/client-cache-#209 ([`a643145`](https://github.com/ral-facilities/datagateway-api/commit/a643145b5b4d1d7efe4b2cf203a7414e760663b1)) +* Merge branch 'master' into bugfix/client-cache-#209 ([`a643145`](https://github.com/ral-facilities/datagateway-api/commit/a643145b5b4d1d7efe4b2cf203a7414e760663b1)) * Merge pull request #219 from ral-facilities/bugfix/fix-distinct-filter-#141 Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-facilities/datagateway-api/commit/c3c607f85cfdc273ca858dd8d3578a5f18865653)) -* Merge branch 'master' into bugfix/fix-distinct-filter-#141 ([`68abaff`](https://github.com/ral-facilities/datagateway-api/commit/68abaff5be990a59bcc2568b3429e74811b8de1b)) +* Merge branch 'master' into bugfix/fix-distinct-filter-#141 ([`68abaff`](https://github.com/ral-facilities/datagateway-api/commit/68abaff5be990a59bcc2568b3429e74811b8de1b)) * #141: Update Python ICAT to 0.18.1 ([`fdd04b0`](https://github.com/ral-facilities/datagateway-api/commit/fdd04b0683d0a32e5ea04b58ca24d8e355301c66)) @@ -2928,7 +3035,7 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #141: Add flag to mark ISIS endpoints -- This flag is needed to distinguish ISIS endpoints (that use DISTINCT, but don't select multiple fields) from queries that use a distinct filter (DISTINCT and select multiple fields) ([`504e94f`](https://github.com/ral-facilities/datagateway-api/commit/504e94feef9a608796197e1ae2ac9b67019ec843)) +- This flag is needed to distinguish ISIS endpoints (that use DISTINCT, but don't select multiple fields) from queries that use a distinct filter (DISTINCT and select multiple fields) ([`504e94f`](https://github.com/ral-facilities/datagateway-api/commit/504e94feef9a608796197e1ae2ac9b67019ec843)) * #141: Add test cases for distinct attribute mapping ([`ede08f2`](https://github.com/ral-facilities/datagateway-api/commit/ede08f2050dce3e8f1637b0d35a96285085ebbf2)) @@ -2938,7 +3045,7 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #141: Edit test data to make sense -- Behaviour of 404s was changed, but the test data wasn't, so it could be confusing why test data saying a 404 should occur then isn't tested that happens (which it shouldn't now) ([`552f743`](https://github.com/ral-facilities/datagateway-api/commit/552f7431941e7a328b7bbb9190ef2518c077e709)) +- Behaviour of 404s was changed, but the test data wasn't, so it could be confusing why test data saying a 404 should occur then isn't tested that happens (which it shouldn't now) ([`552f743`](https://github.com/ral-facilities/datagateway-api/commit/552f7431941e7a328b7bbb9190ef2518c077e709)) * #141: Add test case for distinct filter on count endpoint ([`1d63692`](https://github.com/ral-facilities/datagateway-api/commit/1d63692ac65d3461e956eccc0d88155ee90c1241)) @@ -2960,7 +3067,7 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #141: Change function to fetch distinct attributes -- I haven't deleted the original function yet, but it's very likely I will at the end of this work as there are no other calls to that function ([`42dea33`](https://github.com/ral-facilities/datagateway-api/commit/42dea337c95215e41f7e94f4561e0db2a12b0983)) +- I haven't deleted the original function yet, but it's very likely I will at the end of this work as there are no other calls to that function ([`42dea33`](https://github.com/ral-facilities/datagateway-api/commit/42dea337c95215e41f7e94f4561e0db2a12b0983)) * #141: Add manual_count flag @@ -2992,7 +3099,7 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #209: Remove executor -- This was never used and won't be needed for the solution to client handling ([`1a1064c`](https://github.com/ral-facilities/datagateway-api/commit/1a1064cd361c4bfb8c25e355f6cfe4c119967166)) +- This was never used and won't be needed for the solution to client handling ([`1a1064c`](https://github.com/ral-facilities/datagateway-api/commit/1a1064cd361c4bfb8c25e355f6cfe4c119967166)) * #209: Remove client defensiveness @@ -3000,7 +3107,7 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #209: Fix linting issues ([`7a885d2`](https://github.com/ral-facilities/datagateway-api/commit/7a885d20b84846361f9f3f9493013684aba65d51)) -* Merge branch 'master' into bugfix/client-cache-#209 ([`904ded8`](https://github.com/ral-facilities/datagateway-api/commit/904ded8b1dfa81f75e563f4a7707580fd8b2e948)) +* Merge branch 'master' into bugfix/client-cache-#209 ([`904ded8`](https://github.com/ral-facilities/datagateway-api/commit/904ded8b1dfa81f75e563f4a7707580fd8b2e948)) * #209: Add documentation for client handling ([`400b6b5`](https://github.com/ral-facilities/datagateway-api/commit/400b6b5070ae361f94fe8b5d3a1ebabfa66f3a4f)) @@ -3008,25 +3115,25 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #209: Fix API on DB backend -- The client pool design wasn't working on DB backend, but now it does ([`b0350c9`](https://github.com/ral-facilities/datagateway-api/commit/b0350c9afc99d7b2c73ab36d7c1ef9a7991aab89)) +- The client pool design wasn't working on DB backend, but now it does ([`b0350c9`](https://github.com/ral-facilities/datagateway-api/commit/b0350c9afc99d7b2c73ab36d7c1ef9a7991aab89)) -* #209: Change 'max capacity' to 'max size' +* #209: Change 'max capacity' to 'max size' -- This change should just help make things a bit clearer due to 'init size', make the terminology more similar ([`33bdcd1`](https://github.com/ral-facilities/datagateway-api/commit/33bdcd11f617f1d1fbe10d696bedb7ebce4773b5)) +- This change should just help make things a bit clearer due to 'init size', make the terminology more similar ([`33bdcd1`](https://github.com/ral-facilities/datagateway-api/commit/33bdcd11f617f1d1fbe10d696bedb7ebce4773b5)) * #209: Make client handling values configurable ([`e4abe88`](https://github.com/ral-facilities/datagateway-api/commit/e4abe888a2330ed619567880f46dac5649c15456)) * #209: Add comments and move code to a more logical location ([`416288c`](https://github.com/ral-facilities/datagateway-api/commit/416288cb8bfbc8809207baa329d7b23d2389e3ee)) -* #119: Implement client object pool using LRU cache to hold 'in use' clients +* #119: Implement client object pool using LRU cache to hold 'in use' clients -- LRU cache allows recently used client objects to be kept around. This means there's a 1 client object to 1 session ID ratio, more resource sensitive than a 1 client object for every request ratio -- Workflow: client pool is created at startup, incoming request fetches client from LRU cache, which pulls a client from the pool. Client is kept in the cache until it becomes least recently used, at which point it's then put back into the pool +- LRU cache allows recently used client objects to be kept around. This means there's a 1 client object to 1 session ID ratio, more resource sensitive than a 1 client object for every request ratio +- Workflow: client pool is created at startup, incoming request fetches client from LRU cache, which pulls a client from the pool. Client is kept in the cache until it becomes least recently used, at which point it's then put back into the pool - POST to /sessions uses the same workflow, passing a (pretend) session ID of None to get the same client from the cache each time - The first time a new session ID is passed in the request headers, there is no slowdown in the request like before (where a client was being created for that ID). The client is fetched from the pool -- I've ran this commit against some e2e tests on the frontend and the performance from the API was good, similar to the branch which uses a single client object, passed around using kwargs. I have no concerns regarding a 'slow API' with the pool and cache -- This is just a rough proof of concept, there's lots of cleaning up to do, including making the resource stats on the pool accurate and not just passing the default ones each time. One potential solution is to make something similar to the `Executor` class in the pool library. I experiemented with this (think the class I mocked up is in this commit?) but I wanted to get a basic example working before worrying about the stats (which the API doesn't make use of, but it might be useful to keep accurate stats if they ever need to be logged out. All part of the cleanup process -- This doesn't use the context manager as this wouldn't allow me to implement the LRU cache in the way I have ([`74f1edd`](https://github.com/ral-facilities/datagateway-api/commit/74f1edd78b56b10618ec1c57f8016eb6b5073ad7)) +- I've ran this commit against some e2e tests on the frontend and the performance from the API was good, similar to the branch which uses a single client object, passed around using kwargs. I have no concerns regarding a 'slow API' with the pool and cache +- This is just a rough proof of concept, there's lots of cleaning up to do, including making the resource stats on the pool accurate and not just passing the default ones each time. One potential solution is to make something similar to the `Executor` class in the pool library. I experiemented with this (think the class I mocked up is in this commit?) but I wanted to get a basic example working before worrying about the stats (which the API doesn't make use of, but it might be useful to keep accurate stats if they ever need to be logged out. All part of the cleanup process +- This doesn't use the context manager as this wouldn't allow me to implement the LRU cache in the way I have ([`74f1edd`](https://github.com/ral-facilities/datagateway-api/commit/74f1edd78b56b10618ec1c57f8016eb6b5073ad7)) * #209: Add client cache size as a configurable option ([`fb20095`](https://github.com/ral-facilities/datagateway-api/commit/fb2009590a028f3f31deb9f4337b51775fc5b143)) @@ -3048,13 +3155,13 @@ Fix Distinct Filter on ICAT Backend ([`c3c607f`](https://github.com/ral-faciliti * #210: Apply suggestions from code review -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`2ffe5a9`](https://github.com/ral-facilities/datagateway-api/commit/2ffe5a9e8c853fbce2f23820c54b004ff30a6365)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`2ffe5a9`](https://github.com/ral-facilities/datagateway-api/commit/2ffe5a9e8c853fbce2f23820c54b004ff30a6365)) * #210: Fix linting issues ([`d5c536f`](https://github.com/ral-facilities/datagateway-api/commit/d5c536f0c996dbb8ac3bc5ec571c5740d299dea5)) * #210: Remove client handling config options -- These aren't in the current branch, they'll need to be added back when the client handling PR gets merged in ([`01ab8e1`](https://github.com/ral-facilities/datagateway-api/commit/01ab8e13dd7f222e42a1cf7536bc54c3e428d7d7)) +- These aren't in the current branch, they'll need to be added back when the client handling PR gets merged in ([`01ab8e1`](https://github.com/ral-facilities/datagateway-api/commit/01ab8e13dd7f222e42a1cf7536bc54c3e428d7d7)) * #210: Add leading underscore to instance variables ([`1cb1003`](https://github.com/ral-facilities/datagateway-api/commit/1cb1003a1459700cac5d5b9640f4661e6912b0b8)) @@ -3070,7 +3177,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #210: Replace old config getters with calls to generic -- This commit also removes the old getters, as they're no longer being used ([`9ad2f57`](https://github.com/ral-facilities/datagateway-api/commit/9ad2f574ff461e66a59ad0ea2b072d71bf78533b)) +- This commit also removes the old getters, as they're no longer being used ([`9ad2f57`](https://github.com/ral-facilities/datagateway-api/commit/9ad2f574ff461e66a59ad0ea2b072d71bf78533b)) * #210: Make all config keys use same casing ([`c1a02e5`](https://github.com/ral-facilities/datagateway-api/commit/c1a02e5e0aac93906bf4589a17b51657d59c7163)) @@ -3080,8 +3187,8 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #210: Remove config calls from being added as a constant -- No real reason for this to happen, once the JSON is loaded, the values aren't changed until API restart and not modified elsewhere currently -- It's probably a good thing the request behind ICAT_PROPERTIES actually gets called on demand in case the values get changed before the API is restarted +- No real reason for this to happen, once the JSON is loaded, the values aren't changed until API restart and not modified elsewhere currently +- It's probably a good thing the request behind ICAT_PROPERTIES actually gets called on demand in case the values get changed before the API is restarted - Ultimately, this is the cause of the issue (requiring DB_URL despite using ICAT backend) ([`79d00e8`](https://github.com/ral-facilities/datagateway-api/commit/79d00e8b61509f5dc92b008057d9b3bb91ead3b2)) * Merge pull request #221 from ral-facilities/bugfix/fix-ci-#220 @@ -3124,7 +3231,7 @@ Make Flask Reloader Configurable ([`7626a92`](https://github.com/ral-facilities/ * #214: Add documentation for configurable flask reloader -- I've mentioned the new solution for client handling which isn't currently in this branch, but when those changes are merged, the documentation will make full sense ([`1ed467d`](https://github.com/ral-facilities/datagateway-api/commit/1ed467deb1033c77b9a08488e758a5bb10c4e4ec)) +- I've mentioned the new solution for client handling which isn't currently in this branch, but when those changes are merged, the documentation will make full sense ([`1ed467d`](https://github.com/ral-facilities/datagateway-api/commit/1ed467deb1033c77b9a08488e758a5bb10c4e4ec)) * #214: Add config option for code reloading ([`089ace3`](https://github.com/ral-facilities/datagateway-api/commit/089ace3667c7907d0c4aeeae7557bed985b992ca)) @@ -3134,7 +3241,7 @@ Make DB Backend use camelCase ([`0601fb2`](https://github.com/ral-facilities/dat * #119: Add comments to related entity logic ([`a0c966e`](https://github.com/ral-facilities/datagateway-api/commit/a0c966ef7614874277b511dc8005b341b9e16c41)) -* Merge branch 'master' into feature/camel-case-db-backend-#119 ([`ae63c89`](https://github.com/ral-facilities/datagateway-api/commit/ae63c8906e221d18a4fa7030538007b6ffb7375b)) +* Merge branch 'master' into feature/camel-case-db-backend-#119 ([`ae63c89`](https://github.com/ral-facilities/datagateway-api/commit/ae63c8906e221d18a4fa7030538007b6ffb7375b)) * #119: Fix tests for change to no results behaviour @@ -3152,7 +3259,7 @@ Make DB Backend use camelCase ([`0601fb2`](https://github.com/ral-facilities/dat * #119: Add NULL to an empty list when using the in operator of a where filter -- This will allow the ICAT backend to return a 200 when something like the following is sent as a where filter - `{"id": {"in": []}}` ([`6662f86`](https://github.com/ral-facilities/datagateway-api/commit/6662f86bff60397140d77d996b95ae981bc5073b)) +- This will allow the ICAT backend to return a 200 when something like the following is sent as a where filter - `{"id": {"in": []}}` ([`6662f86`](https://github.com/ral-facilities/datagateway-api/commit/6662f86bff60397140d77d996b95ae981bc5073b)) * #119: Change attribute names to camelCase ([`6377ad5`](https://github.com/ral-facilities/datagateway-api/commit/6377ad5ea7d149fc5d0f24360dfad0b229ce3020)) @@ -3167,16 +3274,16 @@ Make DB Backend use camelCase ([`0601fb2`](https://github.com/ral-facilities/dat * #119: Set response body keys based on field name rather than table name - This change also allows related entities to be retrieved on with plural field name -- Related entities with a singular field name also typically have a foreign key attribute in the class. When an include filter is used in this situation, the included entity will be returned in the response body, rather than the foreign key. This had a better outcome than I thought it would've done :) ([`ce5e763`](https://github.com/ral-facilities/datagateway-api/commit/ce5e7632a3c0bb41476ba5c5bf3f23ddd2324028)) +- Related entities with a singular field name also typically have a foreign key attribute in the class. When an include filter is used in this situation, the included entity will be returned in the response body, rather than the foreign key. This had a better outcome than I thought it would've done :) ([`ce5e763`](https://github.com/ral-facilities/datagateway-api/commit/ce5e7632a3c0bb41476ba5c5bf3f23ddd2324028)) * #119: Allow relationships to be accessed from camelCase input -- The addition of __singularfieldname__ and __pluralfieldname__ will be used in the following commit, where these will be used to set JSON response body keys (so they're camelCase, not SNAKE_CASE) ([`b9e52d9`](https://github.com/ral-facilities/datagateway-api/commit/b9e52d91120624729d08ecc74c51e80132453e30)) +- The addition of __singularfieldname__ and __pluralfieldname__ will be used in the following commit, where these will be used to set JSON response body keys (so they're camelCase, not SNAKE_CASE) ([`b9e52d9`](https://github.com/ral-facilities/datagateway-api/commit/b9e52d91120624729d08ecc74c51e80132453e30)) * #119: Allow entity objects to be fetched from plural field names -- This feature will be needed when there's camelCase field names for related entities, e.g. for user input on include filters -- This change also moves the location of get_entity_object_from_name() to prevent any issues with circular imports. Since the function no longer makes use of globals(), there's no requirement for the function to be in models.py ([`f543007`](https://github.com/ral-facilities/datagateway-api/commit/f543007246fcdc040aaa048d84ba4d8c10ab85e0)) +- This feature will be needed when there's camelCase field names for related entities, e.g. for user input on include filters +- This change also moves the location of get_entity_object_from_name() to prevent any issues with circular imports. Since the function no longer makes use of globals(), there's no requirement for the function to be in models.py ([`f543007`](https://github.com/ral-facilities/datagateway-api/commit/f543007246fcdc040aaa048d84ba4d8c10ab85e0)) * #119: Move endpoints dict to a separate file @@ -3199,7 +3306,7 @@ Make DB Backend use camelCase ([`0601fb2`](https://github.com/ral-facilities/dat * #119: Edit entity conversion to work with most camelCase attribute names -- This doesn't work with foreign key attribute keys yet - e.g. "DATACOLLECTION_ID" will be changed to "datacollectionid" and this doesn't match the variable names in the entities ([`0d0c5d0`](https://github.com/ral-facilities/datagateway-api/commit/0d0c5d0c7843bd74ab0cf85dd07f4b8a76d51d21)) +- This doesn't work with foreign key attribute keys yet - e.g. "DATACOLLECTION_ID" will be changed to "datacollectionid" and this doesn't match the variable names in the entities ([`0d0c5d0`](https://github.com/ral-facilities/datagateway-api/commit/0d0c5d0c7843bd74ab0cf85dd07f4b8a76d51d21)) * #119: Edit DB backend tests to use camelCase @@ -3235,7 +3342,7 @@ Add WSGI script and fix errors with pip install ([`04eafd5`](https://github.com/ * Add missing python-dateutil dependency ([`1572c0c`](https://github.com/ral-facilities/datagateway-api/commit/1572c0cf9a118cbffc26b6006fdff28e148afda9)) -* Merge branch 'master' into feature/wsgi +* Merge branch 'master' into feature/wsgi Conflicts: poetry.lock @@ -3251,7 +3358,7 @@ Conflicts: * Move config.json to datagateway_api directory ([`6b8e1e9`](https://github.com/ral-facilities/datagateway-api/commit/6b8e1e94fafa6d850598cd52d1353cb92302c7f4)) -* Don't write to openapi.yaml when generate_swagger set to false ([`611c227`](https://github.com/ral-facilities/datagateway-api/commit/611c227879bd149a4976dcb1a5c3440098b0b9d1)) +* Don't write to openapi.yaml when generate_swagger set to false ([`611c227`](https://github.com/ral-facilities/datagateway-api/commit/611c227879bd149a4976dcb1a5c3440098b0b9d1)) * Merge pull request #204 from ral-facilities/bugfix/improve-db-sessions @@ -3269,7 +3376,7 @@ Bugfix/improve db sessions ([`856c31e`](https://github.com/ral-facilities/dataga * Move session init code to more sensible places ([`38dc28e`](https://github.com/ral-facilities/datagateway-api/commit/38dc28e445c78e36a1bd2b1e701a6cd2a1360eaa)) -* Merge branch 'master' into bugfix/improve-db-sessions +* Merge branch 'master' into bugfix/improve-db-sessions Conflicts: datagateway_api/src/main.py @@ -3297,7 +3404,7 @@ Add teardown for POST entity endpoint tests ([`460b680`](https://github.com/ral- * #201: Add teardown for POST entity endpoint tests -- This replaces the data deletion loop that was after the assert statement, which wouldn't run if the an AssertionError was raised, resulting in undeleted test data ([`71a65b3`](https://github.com/ral-facilities/datagateway-api/commit/71a65b3d06bd727a5d0e3d613daa610f6f2d730b)) +- This replaces the data deletion loop that was after the assert statement, which wouldn't run if the an AssertionError was raised, resulting in undeleted test data ([`71a65b3`](https://github.com/ral-facilities/datagateway-api/commit/71a65b3d06bd727a5d0e3d613daa610f6f2d730b)) * Merge pull request #200 from ral-facilities/feature/remove-sql-dependency-from-backends-#154 @@ -3305,7 +3412,7 @@ Recreate SQL Dependency PR ([`89b9d19`](https://github.com/ral-facilities/dataga * #154: Fix broken tests ([`c84eccf`](https://github.com/ral-facilities/datagateway-api/commit/c84eccf88efa4461677ffd5b252fa56422d74310)) -* Merge branch 'master' into feature/remove-sql-dependency-from-backends-#154 ([`deb1539`](https://github.com/ral-facilities/datagateway-api/commit/deb1539a53ccc22d1768f14a782bb13621e40882)) +* Merge branch 'master' into feature/remove-sql-dependency-from-backends-#154 ([`deb1539`](https://github.com/ral-facilities/datagateway-api/commit/deb1539a53ccc22d1768f14a782bb13621e40882)) * Merge pull request #175 from ral-facilities/feature/improve-logging-icat-backend-#164 @@ -3322,7 +3429,7 @@ Implement Remaining Standard Endpoints for Python ICAT Backend ([`e9a9173`](http * #145: Improve datetime conversion -- The 'accepted_date_format' constant is removed since it's no longer used. Datetime to string conversion will convert to ISO format and string to datetime can be converted using the same format (allowing for easy-tripping of datetimes for API users). ([`e8c13e9`](https://github.com/ral-facilities/datagateway-api/commit/e8c13e9ad184fdabb231b6647e40b964fe909a6c)) +- The 'accepted_date_format' constant is removed since it's no longer used. Datetime to string conversion will convert to ISO format and string to datetime can be converted using the same format (allowing for easy-tripping of datetimes for API users). ([`e8c13e9`](https://github.com/ral-facilities/datagateway-api/commit/e8c13e9ad184fdabb231b6647e40b964fe909a6c)) * Merge pull request #172 from ral-facilities/feature/isis-specific-endpoints-icat-#146 @@ -3340,7 +3447,7 @@ Add Code Coverage Reports ([`bccce12`](https://github.com/ral-facilities/datagat * #167: Remove codecov as a dependency -- This is no longer needed, I've opted to use the GitHub Actions codecov plugin ([`9542fc8`](https://github.com/ral-facilities/datagateway-api/commit/9542fc808562d57b5070fa0f73c79b3830ead6f0)) +- This is no longer needed, I've opted to use the GitHub Actions codecov plugin ([`9542fc8`](https://github.com/ral-facilities/datagateway-api/commit/9542fc808562d57b5070fa0f73c79b3830ead6f0)) * #167: Remove coverage nox session @@ -3380,7 +3487,7 @@ Add Code Coverage Reports ([`bccce12`](https://github.com/ral-facilities/datagat * #163: Remove Python 3.5 support -- Some dependencies require Python >=3.6 ([`b04abbd`](https://github.com/ral-facilities/datagateway-api/commit/b04abbdd7e64c1831d12e3dce0266db6d2cd3051)) +- Some dependencies require Python >=3.6 ([`b04abbd`](https://github.com/ral-facilities/datagateway-api/commit/b04abbdd7e64c1831d12e3dce0266db6d2cd3051)) * #163: Allow Poetry to use Python 3.5 ([`5ab6c93`](https://github.com/ral-facilities/datagateway-api/commit/5ab6c93a31e58e507a8d26c170f957fad50876e8)) @@ -3462,7 +3569,7 @@ Add Code Coverage Reports ([`bccce12`](https://github.com/ral-facilities/datagat * #163: Force each Python version build to run sequentially -- With using preprod as the ICAT URL, there's issues with the 3 jobs (3 python versions) running tests at the same time meaning that they fail. This is a workaround for the time being, though I think a move to icat-ansible and using a local ICAT instance could prevent this from being a problem because jobs run on different hosted runners, so each job would use a different 'local' ICAT instance ([`d8b618d`](https://github.com/ral-facilities/datagateway-api/commit/d8b618d0acb8ee043f24cdf0f32564eb611770b4)) +- With using preprod as the ICAT URL, there's issues with the 3 jobs (3 python versions) running tests at the same time meaning that they fail. This is a workaround for the time being, though I think a move to icat-ansible and using a local ICAT instance could prevent this from being a problem because jobs run on different hosted runners, so each job would use a different 'local' ICAT instance ([`d8b618d`](https://github.com/ral-facilities/datagateway-api/commit/d8b618d0acb8ee043f24cdf0f32564eb611770b4)) * #163: Set log location for exampple config file @@ -3492,7 +3599,7 @@ Add Code Coverage Reports ([`bccce12`](https://github.com/ral-facilities/datagat * #163: Copy the example config to config.json -- This commit also adds 'name' tags to everything to make things more understandable ([`81acc92`](https://github.com/ral-facilities/datagateway-api/commit/81acc928c3b6163d2fd4d1852a43502fde6928fa)) +- This commit also adds 'name' tags to everything to make things more understandable ([`81acc92`](https://github.com/ral-facilities/datagateway-api/commit/81acc928c3b6163d2fd4d1852a43502fde6928fa)) * #163: Add baseline GitHub Actions workflow ([`863d1f2`](https://github.com/ral-facilities/datagateway-api/commit/863d1f23a06c4773ae5dd72950e92c0898b8f789)) @@ -3518,7 +3625,7 @@ Add ICAT Backend Documentation ([`5301cfd`](https://github.com/ral-facilities/da * #190: Add --without-hashes options to poetry export cmd -- This commit also adds the "tests" session to the list of Nox sessions ([`fb3900b`](https://github.com/ral-facilities/datagateway-api/commit/fb3900b25334aa141c36b33efb17bc71e137c043)) +- This commit also adds the "tests" session to the list of Nox sessions ([`fb3900b`](https://github.com/ral-facilities/datagateway-api/commit/fb3900b25334aa141c36b33efb17bc71e137c043)) * #190: Add link to icat.manual repo for tutorials on setting up an ICAT instance ([`73bb72d`](https://github.com/ral-facilities/datagateway-api/commit/73bb72d186a321b81bfba4e02484aed37d81e604)) @@ -3526,33 +3633,33 @@ Add ICAT Backend Documentation ([`5301cfd`](https://github.com/ral-facilities/da * #165: Remove details regarding tmpdir cmd option -- This has been removed in a different branch so I've removed the documented details about it in this branch and adjusted it according to the new solution found ([`135965c`](https://github.com/ral-facilities/datagateway-api/commit/135965c02c1384d1350fe4052c759041b561a273)) +- This has been removed in a different branch so I've removed the documented details about it in this branch and adjusted it according to the new solution found ([`135965c`](https://github.com/ral-facilities/datagateway-api/commit/135965c02c1384d1350fe4052c759041b561a273)) * #190: Make change to project tree based on previous commit ([`93d0980`](https://github.com/ral-facilities/datagateway-api/commit/93d09807b6c631e6607a94d2964b5e0bf45b8018)) * #190: Rename query_filter_factory.py ([`60c56f6`](https://github.com/ral-facilities/datagateway-api/commit/60c56f62ec877d1d6f934b24173b9cd40b9b06f8)) -* #165: Add a note to remind users to have user's Python added to PATH ([`f2f7f55`](https://github.com/ral-facilities/datagateway-api/commit/f2f7f55eff5ea86202471ea7b709d24747d7a606)) +* #165: Add a note to remind users to have user's Python added to PATH ([`f2f7f55`](https://github.com/ral-facilities/datagateway-api/commit/f2f7f55eff5ea86202471ea7b709d24747d7a606)) * #190: Update README.md for ICAT backend ([`8b24725`](https://github.com/ral-facilities/datagateway-api/commit/8b2472514df420ea6546b860e95394dfd22ad1e9)) * #190: Make small changes to existing docs ([`96f5aec`](https://github.com/ral-facilities/datagateway-api/commit/96f5aecc5fdf37917899cf2c67aa42b7d25f94e5)) -* Merge branch 'feature/test-multiple-backends-#150' of github.com:ral-facilities/datagateway-api into feature/test-multiple-backends-#150 ([`6dea07e`](https://github.com/ral-facilities/datagateway-api/commit/6dea07edabd350b8291810489dbafa5032ef9ad3)) +* Merge branch 'feature/test-multiple-backends-#150' of github.com:ral-facilities/datagateway-api into feature/test-multiple-backends-#150 ([`6dea07e`](https://github.com/ral-facilities/datagateway-api/commit/6dea07edabd350b8291810489dbafa5032ef9ad3)) * Update datagateway_api/common/backends.py -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`baff80d`](https://github.com/ral-facilities/datagateway-api/commit/baff80dd02f6a6f40d217ac5b0aff438d02fb123)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`baff80d`](https://github.com/ral-facilities/datagateway-api/commit/baff80dd02f6a6f40d217ac5b0aff438d02fb123)) * #150: Make requested changes on PR review ([`e826e20`](https://github.com/ral-facilities/datagateway-api/commit/e826e207c439da7a6597df1fe30fc32bf3497292)) -* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`01449cc`](https://github.com/ral-facilities/datagateway-api/commit/01449cc63e05797b398760384bbf017bc4f00b78)) +* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`01449cc`](https://github.com/ral-facilities/datagateway-api/commit/01449cc63e05797b398760384bbf017bc4f00b78)) -* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`91f90a1`](https://github.com/ral-facilities/datagateway-api/commit/91f90a14a0f7350cd9e27f8349823ba66008c9d4)) +* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`91f90a1`](https://github.com/ral-facilities/datagateway-api/commit/91f90a14a0f7350cd9e27f8349823ba66008c9d4)) -* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`5f10ecc`](https://github.com/ral-facilities/datagateway-api/commit/5f10eccad53239c51ad23604867f88e02658296d)) +* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`5f10ecc`](https://github.com/ral-facilities/datagateway-api/commit/5f10eccad53239c51ad23604867f88e02658296d)) -* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`3b6251c`](https://github.com/ral-facilities/datagateway-api/commit/3b6251c5a5768f1ca9e221421ca103b1e60d2501)) +* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`3b6251c`](https://github.com/ral-facilities/datagateway-api/commit/3b6251c5a5768f1ca9e221421ca103b1e60d2501)) * #150: Add documentation for running the tests ([`4039233`](https://github.com/ral-facilities/datagateway-api/commit/40392333b159de0d3c2034e8ede2ab46d705a2dd)) @@ -3560,7 +3667,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Actually fix openapi YAML creation -- This is essentially an undo of 8c1941dfbda5d77092a19a61c2e14a2a300f5786 as I've realised the backend must get parsed into the endpoint classes for testing reasons ([`c5a867c`](https://github.com/ral-facilities/datagateway-api/commit/c5a867c6c8d101fc639ae6a7e138ddb58f60d29a)) +- This is essentially an undo of 8c1941dfbda5d77092a19a61c2e14a2a300f5786 as I've realised the backend must get parsed into the endpoint classes for testing reasons ([`c5a867c`](https://github.com/ral-facilities/datagateway-api/commit/c5a867c6c8d101fc639ae6a7e138ddb58f60d29a)) * #150: Add findone tests for DB backend @@ -3568,13 +3675,13 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Fix openapi YAML creation -- I've reverted the setup for the ISIS and session endpoints back to way it was done at the start of this branch, there's no need to parse backend now the test backend is set in the config object, just create it locally on each endpoint file ([`8c1941d`](https://github.com/ral-facilities/datagateway-api/commit/8c1941dfbda5d77092a19a61c2e14a2a300f5786)) +- I've reverted the setup for the ISIS and session endpoints back to way it was done at the start of this branch, there's no need to parse backend now the test backend is set in the config object, just create it locally on each endpoint file ([`8c1941d`](https://github.com/ral-facilities/datagateway-api/commit/8c1941dfbda5d77092a19a61c2e14a2a300f5786)) * #150: Add get with filter tests for DB backend ([`1b91217`](https://github.com/ral-facilities/datagateway-api/commit/1b9121749a3e5cb2d7ee5fd900fbb72bfc6d4a5b)) * #150: Add remaining data creation fixtures for DB backend tests -- These fixtures haven't been tested, they will when I write the remaining endpoint tests for the DB backend ([`b2af27d`](https://github.com/ral-facilities/datagateway-api/commit/b2af27dabe656b392aeb936d7abed7a7f3dfa745)) +- These fixtures haven't been tested, they will when I write the remaining endpoint tests for the DB backend ([`b2af27d`](https://github.com/ral-facilities/datagateway-api/commit/b2af27dabe656b392aeb936d7abed7a7f3dfa745)) * #150: Create localised conftest files @@ -3582,11 +3689,11 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Ensure filenames are unique across test suite -- pytest requires that all filenames are unique, even if they're stored in different directories ([`578f897`](https://github.com/ral-facilities/datagateway-api/commit/578f897268e02f9ad619df4d3b6c8612300d5653)) +- pytest requires that all filenames are unique, even if they're stored in different directories ([`578f897`](https://github.com/ral-facilities/datagateway-api/commit/578f897268e02f9ad619df4d3b6c8612300d5653)) * #150: Move endpoint rules tests -- This aren't backend-specific ([`6baf55d`](https://github.com/ral-facilities/datagateway-api/commit/6baf55dd797f5811bef65dd4300b88296f3cef55)) +- This aren't backend-specific ([`6baf55d`](https://github.com/ral-facilities/datagateway-api/commit/6baf55dd797f5811bef65dd4300b88296f3cef55)) * #150: Add tests for /count for DB backend ([`bbca31c`](https://github.com/ral-facilities/datagateway-api/commit/bbca31cd3291f6433baf10c6c5c6372a6204faac)) @@ -3598,7 +3705,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Rewrite get_filter_from_query_string tests ([`d6f6ab8`](https://github.com/ral-facilities/datagateway-api/commit/d6f6ab8c82851c1adcf36b54ab44d21590685b4d)) -* #150: Complete TODOs from 'backend can be set for tests' work ([`74215cd`](https://github.com/ral-facilities/datagateway-api/commit/74215cdbfda4d1b4e4c417be3cd2d568d4143bb4)) +* #150: Complete TODOs from 'backend can be set for tests' work ([`74215cd`](https://github.com/ral-facilities/datagateway-api/commit/74215cdbfda4d1b4e4c417be3cd2d568d4143bb4)) * #150: Rewrite session ID from header tests ([`e8f1139`](https://github.com/ral-facilities/datagateway-api/commit/e8f113975077b463f62c78be71778d20b2c8be3d)) @@ -3617,7 +3724,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Restructure test files -- Before this commit, I kept the pytest tests I've created in this branch separate from the unittest tests that were there beforehand to keep them isolated. This restructure means that non-backend specific tests are together, and backend specific tests are put in the correctly named directories ([`b8324db`](https://github.com/ral-facilities/datagateway-api/commit/b8324db630ad77a20e094f9b40ef0ff90c6d49b6)) +- Before this commit, I kept the pytest tests I've created in this branch separate from the unittest tests that were there beforehand to keep them isolated. This restructure means that non-backend specific tests are together, and backend specific tests are put in the correctly named directories ([`b8324db`](https://github.com/ral-facilities/datagateway-api/commit/b8324db630ad77a20e094f9b40ef0ff90c6d49b6)) * #150: General cleanup of recent work @@ -3631,7 +3738,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Fix logging issues when dealing with session IDs which are strings, not numbers -- When dealing with session IDs, you cannot assume they are numbers, since they're in the format of UUIDs, so %s is more suitable ([`c29f68e`](https://github.com/ral-facilities/datagateway-api/commit/c29f68e9452a9f5835c2ebe0ab0c54bdc762e393)) +- When dealing with session IDs, you cannot assume they are numbers, since they're in the format of UUIDs, so %s is more suitable ([`c29f68e`](https://github.com/ral-facilities/datagateway-api/commit/c29f68e9452a9f5835c2ebe0ab0c54bdc762e393)) * #150: Fix imports on test helpers ([`c676f46`](https://github.com/ral-facilities/datagateway-api/commit/c676f46c8c9a6df9d03d2892bfaba8ad780524ff)) @@ -3641,7 +3748,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Fix failing endpoint rule tests -- The tests were looking at the flask app from src.main which is only setup if running the file as per README.md. So a generic flask app fixture has been created and that's used to check endpoint rules ([`db97d8a`](https://github.com/ral-facilities/datagateway-api/commit/db97d8a2934de943457b373cb56fb6e97f1bbb81)) +- The tests were looking at the flask app from src.main which is only setup if running the file as per README.md. So a generic flask app fixture has been created and that's used to check endpoint rules ([`db97d8a`](https://github.com/ral-facilities/datagateway-api/commit/db97d8a2934de943457b373cb56fb6e97f1bbb81)) * #150: Add separate flask app fixtures for each backend @@ -3649,16 +3756,16 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Allow backend type to be set when a flask test fixture runs -- This will allow tests to run on a backend set by the fixture instead of relying on the contents of config.json. This means both backends can be tested in one test session and the contents of the config file doesn't matter ([`70dc393`](https://github.com/ral-facilities/datagateway-api/commit/70dc3937243eee3825beef48b291fea93f2a2771)) +- This will allow tests to run on a backend set by the fixture instead of relying on the contents of config.json. This means both backends can be tested in one test session and the contents of the config file doesn't matter ([`70dc393`](https://github.com/ral-facilities/datagateway-api/commit/70dc3937243eee3825beef48b291fea93f2a2771)) * #150: Move QueryFilterFactory to its own file - It used to be in the database helpers file, but this class is used across both backends -- The imports have been moved inside the staticmethod because the Flask TEST_BACKEND config option won't have been set by the time QueryFilterFactory has been imported, so the imports which decide which set of filters to import must be put in some code. ([`7a6a8ef`](https://github.com/ral-facilities/datagateway-api/commit/7a6a8ef2e0ee46f8de60c7823091818dc9d51619)) +- The imports have been moved inside the staticmethod because the Flask TEST_BACKEND config option won't have been set by the time QueryFilterFactory has been imported, so the imports which decide which set of filters to import must be put in some code. ([`7a6a8ef`](https://github.com/ral-facilities/datagateway-api/commit/7a6a8ef2e0ee46f8de60c7823091818dc9d51619)) * #150: Expand flask test app so the backend can be configured -- This doesn't fully work yet because filters are still created based on contents of config.json ([`6902921`](https://github.com/ral-facilities/datagateway-api/commit/69029214a0d0a2c12351632e32f92e608ad37453)) +- This doesn't fully work yet because filters are still created based on contents of config.json ([`6902921`](https://github.com/ral-facilities/datagateway-api/commit/69029214a0d0a2c12351632e32f92e608ad37453)) * #150: Checkpoint in making backend configurable for testing ([`9532d91`](https://github.com/ral-facilities/datagateway-api/commit/9532d910ffd4491506f221a33b2cd0a22c70763e)) @@ -3672,7 +3779,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Fix order filter test failures -- test_direction_is_uppercase() wasn't being destroyed correctly ([`90f14a1`](https://github.com/ral-facilities/datagateway-api/commit/90f14a12e55c3e7457d188a2bc8e406889e0e457)) +- test_direction_is_uppercase() wasn't being destroyed correctly ([`90f14a1`](https://github.com/ral-facilities/datagateway-api/commit/90f14a12e55c3e7457d188a2bc8e406889e0e457)) * #150: Increase coverage of PythonICATIncludeFilter ([`49ef7f8`](https://github.com/ral-facilities/datagateway-api/commit/49ef7f807129a069ff7beeaa2dbb66663d969be5)) @@ -3698,7 +3805,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add test to create single investigation -- Also remove assertion for data deletion in these tests - I've changed the name of the data used in these tests so they don't have an impact on later tests, so there's no need to highlight any failures in data deletion ([`b16098e`](https://github.com/ral-facilities/datagateway-api/commit/b16098e4c4f2663d0beac1202d0763863397359b)) +- Also remove assertion for data deletion in these tests - I've changed the name of the data used in these tests so they don't have an impact on later tests, so there's no need to highlight any failures in data deletion ([`b16098e`](https://github.com/ral-facilities/datagateway-api/commit/b16098e4c4f2663d0beac1202d0763863397359b)) * #150: Add invalid tests for data creation ([`e1f07b7`](https://github.com/ral-facilities/datagateway-api/commit/e1f07b7362161ff5300068d95cbff9b4dcac7c68)) @@ -3712,7 +3819,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add tests for no result requests -- This was trying to cover 404s but I'm not sure how I'd get a count query to 404.. ([`a2fd644`](https://github.com/ral-facilities/datagateway-api/commit/a2fd64413e3057a60ad6df4e5cbfa3304bd78c6f)) +- This was trying to cover 404s but I'm not sure how I'd get a count query to 404.. ([`a2fd644`](https://github.com/ral-facilities/datagateway-api/commit/a2fd64413e3057a60ad6df4e5cbfa3304bd78c6f)) * #150: Add more invalid tests for update endpoint ([`bead8cf`](https://github.com/ral-facilities/datagateway-api/commit/bead8cfd5a10d2214601a57cb25ae7f8fc983c45)) @@ -3735,7 +3842,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( - Single and multiple update tests ([`fc7f3a1`](https://github.com/ral-facilities/datagateway-api/commit/fc7f3a15063bedd11cffd9366104c85e60ac13aa)) -* #150: Add test for skip & limit filter merge ([`fdafb7a`](https://github.com/ral-facilities/datagateway-api/commit/fdafb7a79764919286a959cdc83fd9168158c326)) +* #150: Add test for skip & limit filter merge ([`fdafb7a`](https://github.com/ral-facilities/datagateway-api/commit/fdafb7a79764919286a959cdc83fd9168158c326)) * #150: Add fixture to inject multiple investigation results @@ -3782,7 +3889,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add tests for filter handler ([`e621f42`](https://github.com/ral-facilities/datagateway-api/commit/e621f423e38a0538ae51cd9fa66ab84be6b299e9)) -* Merge branch 'master' into feature/test-multiple-backends-#150 ([`9625cc1`](https://github.com/ral-facilities/datagateway-api/commit/9625cc1137bcaf7f840b24d991fb8b9ada93ab55)) +* Merge branch 'master' into feature/test-multiple-backends-#150 ([`9625cc1`](https://github.com/ral-facilities/datagateway-api/commit/9625cc1137bcaf7f840b24d991fb8b9ada93ab55)) * #150: Add test for backend creation ([`55397e5`](https://github.com/ral-facilities/datagateway-api/commit/55397e56a1090ee35ac9fcb81b5724326cfbbe91)) @@ -3800,7 +3907,7 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add pytest fixtures for filter testing -- Since they're placed in conftest.py, pytest will automatically pick these up, they don't need to be imported into the places I use them in ([`71720d0`](https://github.com/ral-facilities/datagateway-api/commit/71720d0e657703550701041192fcd3ff3442f543)) +- Since they're placed in conftest.py, pytest will automatically pick these up, they don't need to be imported into the places I use them in ([`71720d0`](https://github.com/ral-facilities/datagateway-api/commit/71720d0e657703550701041192fcd3ff3442f543)) * #150: Combine config test username and password @@ -3808,14 +3915,14 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add tests for test configuration options ([`7455c48`](https://github.com/ral-facilities/datagateway-api/commit/7455c480f88aa255322cff29258ca4562c101b1f)) -* #150: Add configuration options required for repo's tests +* #150: Add configuration options required for repo's tests - This commit also adds getters in config.py ([`57fcd68`](https://github.com/ral-facilities/datagateway-api/commit/57fcd682dbe17532f37b3850cb7937b9c3a0e4fb)) * #150: Add pytest-cov to the repo - nox -s tests -- --cov is a good starting point for usage -- I'm not sure how much I trust the output - there's around half coverage for both DB & ICAT backend's helper files, even though I've currently got the ICAT backend configured... ([`257082e`](https://github.com/ral-facilities/datagateway-api/commit/257082e3d517d58c468022bf66ad7f834a8430a6)) +- I'm not sure how much I trust the output - there's around half coverage for both DB & ICAT backend's helper files, even though I've currently got the ICAT backend configured... ([`257082e`](https://github.com/ral-facilities/datagateway-api/commit/257082e3d517d58c468022bf66ad7f834a8430a6)) * #150: Add tests for config ([`d1b045f`](https://github.com/ral-facilities/datagateway-api/commit/d1b045fbeb9734169c92c9cdd39d6d846fe71590)) @@ -3826,23 +3933,23 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( * #150: Add tests for DateHandler ([`343f8d4`](https://github.com/ral-facilities/datagateway-api/commit/343f8d4fe609417bc51245cde9fce99126bf7b9c)) -* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`b655de1`](https://github.com/ral-facilities/datagateway-api/commit/b655de1ec2ca0f2a6905698177c4f9fef5ddab7f)) +* Merge branch 'feature/fix-code-linting-#184' into feature/test-multiple-backends-#150 ([`b655de1`](https://github.com/ral-facilities/datagateway-api/commit/b655de1ec2ca0f2a6905698177c4f9fef5ddab7f)) -* #150: Add nox 'tests' session +* #150: Add nox 'tests' session -- This will run the discovered unit tests in multiple versions of Python (unless nox is specified with -p [version_num] which is probably what I'll do for the majority of the time, just useful to test multi-version compatability) ([`29f8111`](https://github.com/ral-facilities/datagateway-api/commit/29f811127ad4885b115214da61e985e829b01508)) +- This will run the discovered unit tests in multiple versions of Python (unless nox is specified with -p [version_num] which is probably what I'll do for the majority of the time, just useful to test multi-version compatability) ([`29f8111`](https://github.com/ral-facilities/datagateway-api/commit/29f811127ad4885b115214da61e985e829b01508)) * #150: Add pytest to dev dependencies -- This also updates a couple of dependencies as marked by safety, which didn't get merged in from a recent git merge ([`96b3728`](https://github.com/ral-facilities/datagateway-api/commit/96b37283cc1ecdb2f4e652477b85256f89a30e86)) +- This also updates a couple of dependencies as marked by safety, which didn't get merged in from a recent git merge ([`96b3728`](https://github.com/ral-facilities/datagateway-api/commit/96b37283cc1ecdb2f4e652477b85256f89a30e86)) -* Merge branch 'feature/configure-log-file-location-#182' into feature/test-multiple-backends-#150 ([`04f25f1`](https://github.com/ral-facilities/datagateway-api/commit/04f25f1878c57fc4784fb7dd3e6721844ca71794)) +* Merge branch 'feature/configure-log-file-location-#182' into feature/test-multiple-backends-#150 ([`04f25f1`](https://github.com/ral-facilities/datagateway-api/commit/04f25f1878c57fc4784fb7dd3e6721844ca71794)) -* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/test-multiple-backends-#150 ([`79e6e88`](https://github.com/ral-facilities/datagateway-api/commit/79e6e8858c18185a70a9fc7904207d529e903e5c)) +* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/test-multiple-backends-#150 ([`79e6e88`](https://github.com/ral-facilities/datagateway-api/commit/79e6e8858c18185a70a9fc7904207d529e903e5c)) * #150: Allow backends to be created for testing purposes -- Currently getting a 403 on these changes but I'm not sure the code is at fault... ([`2dee8f0`](https://github.com/ral-facilities/datagateway-api/commit/2dee8f0b3881830853ef794f608f9e523cfc8e0b)) +- Currently getting a 403 on these changes but I'm not sure the code is at fault... ([`2dee8f0`](https://github.com/ral-facilities/datagateway-api/commit/2dee8f0b3881830853ef794f608f9e523cfc8e0b)) * #150: Work out how the existing tests will work with the new test structure @@ -3856,11 +3963,11 @@ Add Code Linting and Implementation of Hypermodern Python ([`ca0efc6`](https://g Apply Fixes suggested by Linting Tools ([`9b4907c`](https://github.com/ral-facilities/datagateway-api/commit/9b4907c77b76b50cb1d4d7818f34ab40cbf45c1a)) -* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`c4b63eb`](https://github.com/ral-facilities/datagateway-api/commit/c4b63eb344f6e13979e83976f4d05130747403ae)) +* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`c4b63eb`](https://github.com/ral-facilities/datagateway-api/commit/c4b63eb344f6e13979e83976f4d05130747403ae)) -* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`821e8b9`](https://github.com/ral-facilities/datagateway-api/commit/821e8b93fd6ecacc591bcff4b4e683f78574a872)) +* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`821e8b9`](https://github.com/ral-facilities/datagateway-api/commit/821e8b93fd6ecacc591bcff4b4e683f78574a872)) -* Merge branch 'feature/improve-logging-icat-backend-#164' into feature/remove-sql-dependency-from-backends-#154 ([`ec1dd64`](https://github.com/ral-facilities/datagateway-api/commit/ec1dd6466efe266a5901d27c0ee8cf12d3c1b87a)) +* Merge branch 'feature/improve-logging-icat-backend-#164' into feature/remove-sql-dependency-from-backends-#154 ([`ec1dd64`](https://github.com/ral-facilities/datagateway-api/commit/ec1dd6466efe266a5901d27c0ee8cf12d3c1b87a)) * Merge pull request #177 from ral-facilities/feature/add-postman-collection-#162 @@ -3871,19 +3978,19 @@ Add Postman Collection to Repo ([`0578120`](https://github.com/ral-facilities/da - Make variables work for the collection, not the environment - Set default port to 5000, matching the default port on the API ([`493ac65`](https://github.com/ral-facilities/datagateway-api/commit/493ac650b56b4ba1e832aa4c537ccfe5fb499126)) -* Merge branch 'feature/improve-logging-icat-backend-#164' into feature/remove-sql-dependency-from-backends-#154 ([`adc1f40`](https://github.com/ral-facilities/datagateway-api/commit/adc1f40713cd1f056b44f8eb4e9615b39fae8c53)) +* Merge branch 'feature/improve-logging-icat-backend-#164' into feature/remove-sql-dependency-from-backends-#154 ([`adc1f40`](https://github.com/ral-facilities/datagateway-api/commit/adc1f40713cd1f056b44f8eb4e9615b39fae8c53)) -* Merge branch 'feature/isis-specific-endpoints-icat-#146' into feature/improve-logging-icat-backend-#164 ([`4acfc92`](https://github.com/ral-facilities/datagateway-api/commit/4acfc92ccfb1396a4c1000b7ef6abe93f9b4ff2d)) +* Merge branch 'feature/isis-specific-endpoints-icat-#146' into feature/improve-logging-icat-backend-#164 ([`4acfc92`](https://github.com/ral-facilities/datagateway-api/commit/4acfc92ccfb1396a4c1000b7ef6abe93f9b4ff2d)) * #146: Correct mistake made in merge conflict resolution ([`1a16451`](https://github.com/ral-facilities/datagateway-api/commit/1a16451f79d0f247205102a7b70eb3f32e0727dd)) -* Merge branch 'feature/remaining-icat-endpoints-#145' into feature/isis-specific-endpoints-icat-#146 ([`7532606`](https://github.com/ral-facilities/datagateway-api/commit/75326067e1bb3e676316122f1a63227766542f0c)) +* Merge branch 'feature/remaining-icat-endpoints-#145' into feature/isis-specific-endpoints-icat-#146 ([`7532606`](https://github.com/ral-facilities/datagateway-api/commit/75326067e1bb3e676316122f1a63227766542f0c)) -* Merge branch 'master' into feature/remaining-icat-endpoints-#145 ([`4d00fb2`](https://github.com/ral-facilities/datagateway-api/commit/4d00fb2f56a9cae2f941b757fb2ef25bb1bdfb44)) +* Merge branch 'master' into feature/remaining-icat-endpoints-#145 ([`4d00fb2`](https://github.com/ral-facilities/datagateway-api/commit/4d00fb2f56a9cae2f941b757fb2ef25bb1bdfb44)) * Merge pull request #170 from ral-facilities/feature/distinct-filter-included-columns-#148 -Update the distinct filter to accept 'included' fields ([`7b72dc9`](https://github.com/ral-facilities/datagateway-api/commit/7b72dc9dd884854f03567e8298453b122aac4e22)) +Update the distinct filter to accept 'included' fields ([`7b72dc9`](https://github.com/ral-facilities/datagateway-api/commit/7b72dc9dd884854f03567e8298453b122aac4e22)) * #148: Make suggested changes to distinct attribute mapping ([`84164c9`](https://github.com/ral-facilities/datagateway-api/commit/84164c9282c8c49297b044d9baf9c3c488b0c82f)) @@ -3895,7 +4002,7 @@ Adding issue/PR templates ([`7fffd18`](https://github.com/ral-facilities/datagat * Adding issue/PR templates ([`921c9d9`](https://github.com/ral-facilities/datagateway-api/commit/921c9d949f276993e7e5f37ca65cb3d770e6b972)) -* Merge branch 'master' into feature/remaining-icat-endpoints-#145 ([`69f96bd`](https://github.com/ral-facilities/datagateway-api/commit/69f96bd76e7502891cdb4543e665b36711d78353)) +* Merge branch 'master' into feature/remaining-icat-endpoints-#145 ([`69f96bd`](https://github.com/ral-facilities/datagateway-api/commit/69f96bd76e7502891cdb4543e665b36711d78353)) * Merge pull request #169 from ral-facilities/feature/where-filter-included-columns-#144 @@ -3909,11 +4016,11 @@ Implement Include Filter for Python ICAT Backend ([`f4e3e6c`](https://github.com Fix session handling for ICAT backend ([`bf64e9b`](https://github.com/ral-facilities/datagateway-api/commit/bf64e9b2beb08dd47ef1d2d174ff0567d7cb6450)) -* Merge branch 'master' into feature/fix-session-handling-#135 ([`f1fd838`](https://github.com/ral-facilities/datagateway-api/commit/f1fd8386ce75444fa71bf82e87e3cbd2ac208acb)) +* Merge branch 'master' into feature/fix-session-handling-#135 ([`f1fd838`](https://github.com/ral-facilities/datagateway-api/commit/f1fd8386ce75444fa71bf82e87e3cbd2ac208acb)) * #135: Simplify assignment of client in ICAT backend functions ([`074d4da`](https://github.com/ral-facilities/datagateway-api/commit/074d4da296b446c3041c041978fb98e3cfeeb7d1)) -* Merge branch 'master' into feature/fix-session-handling-#135 ([`f4a06ce`](https://github.com/ral-facilities/datagateway-api/commit/f4a06ce50145d660ce19f3b27066a28546ac7ead)) +* Merge branch 'master' into feature/fix-session-handling-#135 ([`f4a06ce`](https://github.com/ral-facilities/datagateway-api/commit/f4a06ce50145d660ce19f3b27066a28546ac7ead)) * #135: Make client objects bound to an endpoint, not a backend @@ -3930,15 +4037,15 @@ Fix session handling for ICAT backend ([`bf64e9b`](https://github.com/ral-facili * #145: Add attempt to restore old data if an update goes wrong - This is a solution to a comment made on the PR for this branch -- This solution doesn't need to be applied to update by ID because if an error occurs there, there's no other data that could possibly be updated ([`3224a27`](https://github.com/ral-facilities/datagateway-api/commit/3224a277ab03e3beeda74e1afe167ae90e4e5212)) +- This solution doesn't need to be applied to update by ID because if an error occurs there, there's no other data that could possibly be updated ([`3224a27`](https://github.com/ral-facilities/datagateway-api/commit/3224a277ab03e3beeda74e1afe167ae90e4e5212)) * #145: Ensure the database remains in a similar state to what it started in if POST returns an error -- Similar purpose to the previous commit but expanded so changes are 'rolled back' if an exception occurs on the .create() ([`b6395e5`](https://github.com/ral-facilities/datagateway-api/commit/b6395e5b1737b126b93e8d11af14f604bf3103fb)) +- Similar purpose to the previous commit but expanded so changes are 'rolled back' if an exception occurs on the .create() ([`b6395e5`](https://github.com/ral-facilities/datagateway-api/commit/b6395e5b1737b126b93e8d11af14f604bf3103fb)) * #145: Ensure updated data is pushed at the end of the request -- This will prevent an issue where you're updating multiple pieces of data and the request returns a 400, you don't know which pieces of data have been updated ([`ed562e8`](https://github.com/ral-facilities/datagateway-api/commit/ed562e8940c0838a26e023b1f76312466d9bf1f5)) +- This will prevent an issue where you're updating multiple pieces of data and the request returns a 400, you don't know which pieces of data have been updated ([`ed562e8`](https://github.com/ral-facilities/datagateway-api/commit/ed562e8940c0838a26e023b1f76312466d9bf1f5)) * Merge pull request #174 from ral-facilities/feature/make-swagger-yaml-stay-same-on-startup @@ -3950,22 +4057,22 @@ Make swagger YAML stay the same on startup ([`58f995b`](https://github.com/ral-f Make Distinct Field Filters Apply Correctly on ISIS Endpoints ([`eadd9fc`](https://github.com/ral-facilities/datagateway-api/commit/eadd9fc863e53beab77ea90fab65782e417fa700)) -* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`36dfeb0`](https://github.com/ral-facilities/datagateway-api/commit/36dfeb060219f056b15b2154e1a05a2f747d2517)) +* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`36dfeb0`](https://github.com/ral-facilities/datagateway-api/commit/36dfeb060219f056b15b2154e1a05a2f747d2517)) * #165: Disable auto file deletion for NamedTemporaryFile - This fixes a PermissionError that was found when using these Nox sessions on Windows -- This is a replacement solution for the tmp_dir option/fix, so that's now been removed ([`ed448ca`](https://github.com/ral-facilities/datagateway-api/commit/ed448ca98aa42b03d17485707ce44eaa7da1a1de)) +- This is a replacement solution for the tmp_dir option/fix, so that's now been removed ([`ed448ca`](https://github.com/ral-facilities/datagateway-api/commit/ed448ca98aa42b03d17485707ce44eaa7da1a1de)) -* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`1013e82`](https://github.com/ral-facilities/datagateway-api/commit/1013e82fb413c5b3eef16c454669c17a77cf8027)) +* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`1013e82`](https://github.com/ral-facilities/datagateway-api/commit/1013e82fb413c5b3eef16c454669c17a77cf8027)) * #165: Allow tmp directory to be configured for nox sessions ([`0366d08`](https://github.com/ral-facilities/datagateway-api/commit/0366d08d0b531c98d229e9ce3c849e00c2d8f043)) -* Merge branch 'feature/add-code-linting-#165' of github.com:ral-facilities/datagateway-api into feature/add-code-linting-#165 ([`3682165`](https://github.com/ral-facilities/datagateway-api/commit/3682165ade132dc05b76d002bb5636df13429b29)) +* Merge branch 'feature/add-code-linting-#165' of github.com:ral-facilities/datagateway-api into feature/add-code-linting-#165 ([`3682165`](https://github.com/ral-facilities/datagateway-api/commit/3682165ade132dc05b76d002bb5636df13429b29)) * Update README.md -Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`a4ca2df`](https://github.com/ral-facilities/datagateway-api/commit/a4ca2df69c2adc1859e8df592596c303b6272277)) +Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ([`a4ca2df`](https://github.com/ral-facilities/datagateway-api/commit/a4ca2df69c2adc1859e8df592596c303b6272277)) * #165: Update repo tree structure @@ -3979,9 +4086,9 @@ Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> ( - Most likely caused when I merged other branches after I created the PR ([`b01eaf5`](https://github.com/ral-facilities/datagateway-api/commit/b01eaf503210d84cfe63fd3077d8d7cae2ad910f)) -* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`116ca2a`](https://github.com/ral-facilities/datagateway-api/commit/116ca2a00d4c9cc6bf1d63b78a843a5fe9cedba7)) +* Merge branch 'feature/add-code-linting-#165' into feature/fix-code-linting-#184 ([`116ca2a`](https://github.com/ral-facilities/datagateway-api/commit/116ca2a00d4c9cc6bf1d63b78a843a5fe9cedba7)) -* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`9e34729`](https://github.com/ral-facilities/datagateway-api/commit/9e34729c3ab813e3aacff197f6fbafc395750f3c)) +* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`9e34729`](https://github.com/ral-facilities/datagateway-api/commit/9e34729c3ab813e3aacff197f6fbafc395750f3c)) * Merge pull request #178 from ral-facilities/feature/fix-swagger-data-parsing-#166 @@ -3991,7 +4098,7 @@ Update Swagger/OpenAPI Docs for New Backend ([`864e020`](https://github.com/ral- * #166: Add examples to match all possible WHERE filter operations -- Also modified description to aid users if they're having issues getting example values to work ([`2724911`](https://github.com/ral-facilities/datagateway-api/commit/27249111d892468e9b659e7a76e780e0bbd4e1c0)) +- Also modified description to aid users if they're having issues getting example values to work ([`2724911`](https://github.com/ral-facilities/datagateway-api/commit/27249111d892468e9b659e7a76e780e0bbd4e1c0)) * #166: Add not equal to DB where filter @@ -4009,7 +4116,7 @@ Fix Exception Handling for Non-Debug Mode ([`b12e7cd`](https://github.com/ral-fa * #147: Misc. code formatting changes ([`80943ad`](https://github.com/ral-facilities/datagateway-api/commit/80943adebfdb2ffa3ae8677d1f6d327197e5f136)) -* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`c977be0`](https://github.com/ral-facilities/datagateway-api/commit/c977be0867aa4f5af08df4e269357571c1d1a652)) +* Merge branch 'feature/remove-sql-dependency-from-backends-#154' into feature/add-code-linting-#165 ([`c977be0`](https://github.com/ral-facilities/datagateway-api/commit/c977be0867aa4f5af08df4e269357571c1d1a652)) * Merge pull request #179 from ral-facilities/feature/update-swagger-genaration-in-readme-#134 @@ -4021,7 +4128,7 @@ Update Swagger Generation Section in README.md ([`5125106`](https://github.com/r * #134: Edit Swagger doc section of README to reflect changes in generation ([`c2e8099`](https://github.com/ral-facilities/datagateway-api/commit/c2e8099f00861e3c61cf945415091ecc03131c3b)) -* #134: Make file adhere to Black's 88 character/line rule +* #134: Make file adhere to Black's 88 character/line rule - Since the Python files in the repo adhere to this limit, it seems sensible that the README file also following this formatting rule where possible ([`efb732c`](https://github.com/ral-facilities/datagateway-api/commit/efb732c9c5ba670e10cb7edbdf584649f4604094)) @@ -4035,7 +4142,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #182: Allow log file to be configured -- In production, this will be used to store the API's logs in /var/log/ +- In production, this will be used to store the API's logs in /var/log/ - Also remove an unused variable that I noticed ([`45b5896`](https://github.com/ral-facilities/datagateway-api/commit/45b5896be4c0201b1704a719c6e59a4706781b80)) * #182: Add log location configuration option ([`7723d69`](https://github.com/ral-facilities/datagateway-api/commit/7723d69f25b53725871e22608478108ba2bee5e7)) @@ -4050,7 +4157,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #184: Make certain function less complex -- I've had to increase the max complexity in .flake8 because there's not much you can do with a couple of the functions. Still made some improvements though! ([`a694129`](https://github.com/ral-facilities/datagateway-api/commit/a6941295d6e9ef1060a734d03b1b54e21dc98c41)) +- I've had to increase the max complexity in .flake8 because there's not much you can do with a couple of the functions. Still made some improvements though! ([`a694129`](https://github.com/ral-facilities/datagateway-api/commit/a6941295d6e9ef1060a734d03b1b54e21dc98c41)) * #184: Fix G200 from flake8-logging-format @@ -4060,9 +4167,9 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #184: Fix misc. linting issues ([`ed8aa34`](https://github.com/ral-facilities/datagateway-api/commit/ed8aa343f6c1290de50e4c000197e2b68bf0b53d)) -* #184: Add file specific ignore for 'random' usage +* #184: Add file specific ignore for 'random' usage -- S311 (from Bandit) states "Standard pseudo-random generators are not suitable for security/cryptographic purposes.". The generator script doesn't generate data that would be vulnerable to security (no keys or anything of that nature is created using the random library) hence this status code is ignored ([`33193de`](https://github.com/ral-facilities/datagateway-api/commit/33193de961d7294b3571feafa53688420f769c44)) +- S311 (from Bandit) states "Standard pseudo-random generators are not suitable for security/cryptographic purposes.". The generator script doesn't generate data that would be vulnerable to security (no keys or anything of that nature is created using the random library) hence this status code is ignored ([`33193de`](https://github.com/ral-facilities/datagateway-api/commit/33193de961d7294b3571feafa53688420f769c44)) * #184: Rebuild openapi.yaml file to reflect recent changes ([`93e1e3b`](https://github.com/ral-facilities/datagateway-api/commit/93e1e3bf851d3a96349a6b1242d838dfea54a63f)) @@ -4084,7 +4191,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #184: Add trailing commas to meet flake8 output ([`a9f3b08`](https://github.com/ral-facilities/datagateway-api/commit/a9f3b08fca2e0214af2ef804bf385e59f0cbb20f)) -* #165: Change README's project structure ([`0f232dd`](https://github.com/ral-facilities/datagateway-api/commit/0f232dd0f56448a56067fa9a66f2edbc16abe280)) +* #165: Change README's project structure ([`0f232dd`](https://github.com/ral-facilities/datagateway-api/commit/0f232dd0f56448a56067fa9a66f2edbc16abe280)) * #165: Add dev environment creation summary ([`e32543b`](https://github.com/ral-facilities/datagateway-api/commit/e32543be39dbeb82c9b8d5364b0d35daf6ab22af)) @@ -4094,7 +4201,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #165: Remove unused requirements files -- These files have been replaced by the use of Poetry to store the API's dependencies ([`be6e229`](https://github.com/ral-facilities/datagateway-api/commit/be6e2298e7564c11c6995c085c8fbd911e93d219)) +- These files have been replaced by the use of Poetry to store the API's dependencies ([`be6e229`](https://github.com/ral-facilities/datagateway-api/commit/be6e2298e7564c11c6995c085c8fbd911e93d219)) * #165: Add flake8 plugins to Poetry and nox session ([`b28446c`](https://github.com/ral-facilities/datagateway-api/commit/b28446c7d391f04477e1c51d20eae4207101c728)) @@ -4107,7 +4214,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #165: Add pre-commit hook config ([`348acf1`](https://github.com/ral-facilities/datagateway-api/commit/348acf15f9086528d6f287be963aaff3f602897c)) -* #165: Allow dependencies to be installed according to Poetry's dependencies +* #165: Allow dependencies to be installed according to Poetry's dependencies - This will help keep consistent versions of flake8 etc being installed between developers, to prevent incosistent linting/safety outputs ([`b890d98`](https://github.com/ral-facilities/datagateway-api/commit/b890d981a5c7f1bc83769606e70ffb973b797e57)) @@ -4133,12 +4240,12 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #154: Convert get_python_icat_entity_name() to a camel case only returning function -- Due to removing the SQL dependency, there is no use for the primary aim of this function. As a result, it's now only used once in this repo. It has been renamed (and modified) since the function only returns a camelCase version of its input ([`08ee87d`](https://github.com/ral-facilities/datagateway-api/commit/08ee87d00847ffb0a8e1514a096b56e0f852d27b)) +- Due to removing the SQL dependency, there is no use for the primary aim of this function. As a result, it's now only used once in this repo. It has been renamed (and modified) since the function only returns a camelCase version of its input ([`08ee87d`](https://github.com/ral-facilities/datagateway-api/commit/08ee87d00847ffb0a8e1514a096b56e0f852d27b)) * #154: Adapt Swagger docs for entity_type - This commit re-enables the Swagger docs and adapts them for the non-backend specific contents of entity_type -- This also fixes some issues where example values wouldn't show in PATCH and POST endpoints ([`ac095e1`](https://github.com/ral-facilities/datagateway-api/commit/ac095e1fb7570a98549b5e86ac530c27df6584ac)) +- This also fixes some issues where example values wouldn't show in PATCH and POST endpoints ([`ac095e1`](https://github.com/ral-facilities/datagateway-api/commit/ac095e1fb7570a98549b5e86ac530c27df6584ac)) * #154: Misc. code formatting changes made by Black ([`c7cc4c1`](https://github.com/ral-facilities/datagateway-api/commit/c7cc4c1b107899fb333d3614e2e0a2fc55695682)) @@ -4165,13 +4272,13 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #154: Move common.models to common.database -- The only model in common.models was for the database backend (there's no model for the Python ICAT backend), hence the change +- The only model in common.models was for the database backend (there's no model for the Python ICAT backend), hence the change - This commit also includes the changes required to correctly import the file from the new location - Updated the file tree in the README ([`56b7606`](https://github.com/ral-facilities/datagateway-api/commit/56b760615dd37bcf90540e36eaf18387bfa9d424)) * #162: Add Postman Collection compiled for ICAT backend -- This is a Postman Collection I've built up over the past few months, containing 320 requests. The requests are aimed at the Python ICAT backend (with query params created for that backend) but can be used for the DB backend by changing parameters to SNAKE_CASE where needed. The collection has been exported as v2.1 and is ready to be imported into Postman ([`cf83b3f`](https://github.com/ral-facilities/datagateway-api/commit/cf83b3f2bc88e4b26064bfe552b5446474412962)) +- This is a Postman Collection I've built up over the past few months, containing 320 requests. The requests are aimed at the Python ICAT backend (with query params created for that backend) but can be used for the DB backend by changing parameters to SNAKE_CASE where needed. The collection has been exported as v2.1 and is ready to be imported into Postman ([`cf83b3f`](https://github.com/ral-facilities/datagateway-api/commit/cf83b3f2bc88e4b26064bfe552b5446474412962)) * #114: Remove logging used for development purposes ([`7aa794e`](https://github.com/ral-facilities/datagateway-api/commit/7aa794e120f9a8ec9996a1c93aec25941c994379)) @@ -4187,7 +4294,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #173: Order OpenAPI YAML request types alphabetically -- Things like get, patch, post, delete etc. weren't alphabetically ordered as changing the order of the YAML file on startup ([`88c623a`](https://github.com/ral-facilities/datagateway-api/commit/88c623a1c507694b2d6b7f34025df933687759bf)) +- Things like get, patch, post, delete etc. weren't alphabetically ordered as changing the order of the YAML file on startup ([`88c623a`](https://github.com/ral-facilities/datagateway-api/commit/88c623a1c507694b2d6b7f34025df933687759bf)) * #146: Add to ICATQuery docstring ([`adcb7a6`](https://github.com/ral-facilities/datagateway-api/commit/adcb7a6d3ed9e3414eba22efc4b55591a5ec38c6)) @@ -4201,7 +4308,7 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #146: Apply count query flag logic to second ISIS endpoint -- It should be noted that the affected endpoint doesn't currently do anything ([`8d1dba2`](https://github.com/ral-facilities/datagateway-api/commit/8d1dba20c01b1f7669f6427775e1448bdfdf7fec)) +- It should be noted that the affected endpoint doesn't currently do anything ([`8d1dba2`](https://github.com/ral-facilities/datagateway-api/commit/8d1dba20c01b1f7669f6427775e1448bdfdf7fec)) * #146: Add count functionality for 1st ISIS endpoint @@ -4223,15 +4330,15 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #146: Add skeleton to an ISIS endpoint -- This endpoint does not work currently, there are issues with speech marks in WHERE filter of the startDate conditions and a DISTINCT aggregate needs to be added (with a flag in ICATQuery to mark an ISIS endpoint so the aggregate doesn't behave like a distinct filter - these are two different things) ([`b6333e9`](https://github.com/ral-facilities/datagateway-api/commit/b6333e9f8917e6a49bfc87ddaa5f519e5d4afbb8)) +- This endpoint does not work currently, there are issues with speech marks in WHERE filter of the startDate conditions and a DISTINCT aggregate needs to be added (with a flag in ICATQuery to mark an ISIS endpoint so the aggregate doesn't behave like a distinct filter - these are two different things) ([`b6333e9`](https://github.com/ral-facilities/datagateway-api/commit/b6333e9f8917e6a49bfc87ddaa5f519e5d4afbb8)) -* Merge branch 'feature/remaining-icat-endpoints-#145' into feature/isis-specific-endpoints-icat-#146 ([`eb2382d`](https://github.com/ral-facilities/datagateway-api/commit/eb2382d84b5a7c53e420021c161305c2c91ab282)) +* Merge branch 'feature/remaining-icat-endpoints-#145' into feature/isis-specific-endpoints-icat-#146 ([`eb2382d`](https://github.com/ral-facilities/datagateway-api/commit/eb2382d84b5a7c53e420021c161305c2c91ab282)) -* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`3702123`](https://github.com/ral-facilities/datagateway-api/commit/3702123dd976bf482b48198690ca9194cc79973c)) +* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`3702123`](https://github.com/ral-facilities/datagateway-api/commit/3702123dd976bf482b48198690ca9194cc79973c)) * #148: Fix ImportError ([`88908f4`](https://github.com/ral-facilities/datagateway-api/commit/88908f45f98e2cdbd67f0a56c875da7963d5139f)) -* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`c1e5480`](https://github.com/ral-facilities/datagateway-api/commit/c1e5480b906666086ea7098fba9ff30f828b595b)) +* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`c1e5480`](https://github.com/ral-facilities/datagateway-api/commit/c1e5480b906666086ea7098fba9ff30f828b595b)) * #146: Change where include filter data is referenced ([`a089db4`](https://github.com/ral-facilities/datagateway-api/commit/a089db4f148c6838596263b1927177eeb55134f8)) @@ -4241,13 +4348,13 @@ Allow Log File Location to be Configurable ([`463e3db`](https://github.com/ral-f * #146: Fix ISIS endpoints for DB backends -- The function calls were to functions that didn't exist in the backend files, so I've corrected them so they do exist and also slightly renamed them during this change ([`90a2e28`](https://github.com/ral-facilities/datagateway-api/commit/90a2e28c59ce673b5fe52399a5ed6ce6707b2adb)) +- The function calls were to functions that didn't exist in the backend files, so I've corrected them so they do exist and also slightly renamed them during this change ([`90a2e28`](https://github.com/ral-facilities/datagateway-api/commit/90a2e28c59ce673b5fe52399a5ed6ce6707b2adb)) -* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`6de7c73`](https://github.com/ral-facilities/datagateway-api/commit/6de7c73edc44da440bef21e7b5eecdd88bedab85)) +* Merge branch 'feature/distinct-filter-included-columns-#148' into feature/remaining-icat-endpoints-#145 ([`6de7c73`](https://github.com/ral-facilities/datagateway-api/commit/6de7c73edc44da440bef21e7b5eecdd88bedab85)) -* Merge branch 'feature/icat-include-filter-#143' into feature/distinct-filter-included-columns-#148 ([`8b6cfad`](https://github.com/ral-facilities/datagateway-api/commit/8b6cfadcb191c9742771c61ee5eb3ded6556d28b)) +* Merge branch 'feature/icat-include-filter-#143' into feature/distinct-filter-included-columns-#148 ([`8b6cfad`](https://github.com/ral-facilities/datagateway-api/commit/8b6cfadcb191c9742771c61ee5eb3ded6556d28b)) -* Merge branch 'master' into feature/icat-include-filter-#143 ([`a023678`](https://github.com/ral-facilities/datagateway-api/commit/a023678cc4468fcea1631ed260b266ffb83668b5)) +* Merge branch 'master' into feature/icat-include-filter-#143 ([`a023678`](https://github.com/ral-facilities/datagateway-api/commit/a023678cc4468fcea1631ed260b266ffb83668b5)) * Merge pull request #161 from ral-facilities/feature/icat-distinct-filter-#141 @@ -4257,7 +4364,7 @@ Implement Distinct Filter for Python ICAT Backend ([`e419d8c`](https://github.co - This should allow these types of searches to provide more accurate results, where previously none could be found ([`acc9672`](https://github.com/ral-facilities/datagateway-api/commit/acc96727aa4f2be59b3336b8df44ab3871e702e4)) -* Merge branch 'feature/icat-limit-skip-filters-#139' into feature/icat-distinct-filter-#141 ([`e58cbae`](https://github.com/ral-facilities/datagateway-api/commit/e58cbae97c9be758e035ea5f60f0e600a1964e63)) +* Merge branch 'feature/icat-limit-skip-filters-#139' into feature/icat-distinct-filter-#141 ([`e58cbae`](https://github.com/ral-facilities/datagateway-api/commit/e58cbae97c9be758e035ea5f60f0e600a1964e63)) * #141: Rename ICATQuery and move it to a separate file ([`4f84e52`](https://github.com/ral-facilities/datagateway-api/commit/4f84e52847a7b3c7ceb72b32169f3e7449aa4aff)) @@ -4279,11 +4386,11 @@ Implement Order Filter for Python ICAT Backend ([`a014b11`](https://github.com/r Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway-api/commit/0600a0ae9e5e4641d5adffbe93e8d2f4a0dd2bd7)) -* Merge branch 'master' into feature/python-icat-entity-id-endpoints-#136 ([`6c1dd4c`](https://github.com/ral-facilities/datagateway-api/commit/6c1dd4cf9abffbb8289337d26d02817d096ed7cf)) +* Merge branch 'master' into feature/python-icat-entity-id-endpoints-#136 ([`6c1dd4c`](https://github.com/ral-facilities/datagateway-api/commit/6c1dd4cf9abffbb8289337d26d02817d096ed7cf)) * Update LICENSE ([`412cf1b`](https://github.com/ral-facilities/datagateway-api/commit/412cf1b73b095cec4d779e2f1bfb13fcaf95c17d)) -* Merge branch 'feature/python-icat-get-with-filters-#137' into feature/python-icat-entity-id-endpoints-#136 ([`cc75ec0`](https://github.com/ral-facilities/datagateway-api/commit/cc75ec07dca8583171fa28f7ea2bac73decb5793)) +* Merge branch 'feature/python-icat-get-with-filters-#137' into feature/python-icat-entity-id-endpoints-#136 ([`cc75ec0`](https://github.com/ral-facilities/datagateway-api/commit/cc75ec07dca8583171fa28f7ea2bac73decb5793)) * #145: Remove logging statement from development work ([`8e046f6`](https://github.com/ral-facilities/datagateway-api/commit/8e046f65ba72da282c8f117fa690ae8741e5df05)) @@ -4291,7 +4398,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- - This will help clean up common.icat.helpers and move filter-specific functions to the relevant file - This commit also adds a function that calls other functions in its class to reduce code duplication -- This is a 'leave the code in a better state than you found it' kind of commit ([`8c8a241`](https://github.com/ral-facilities/datagateway-api/commit/8c8a2419b3356ff5900bbff72342c3e7779cb8c8)) +- This is a 'leave the code in a better state than you found it' kind of commit ([`8c8a241`](https://github.com/ral-facilities/datagateway-api/commit/8c8a2419b3356ff5900bbff72342c3e7779cb8c8)) * #145: Remove return_first_value_only flag @@ -4307,7 +4414,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #145: Move date-related functions to a separate class -- In the future, these could be used by other backends so I've moved these 3 functions into their own utility class. This change helps clean up common.icat.helpers a bit which is another reason this change has been made ([`2a88aae`](https://github.com/ral-facilities/datagateway-api/commit/2a88aaedc78e68931972064ba389dbeced9a6266)) +- In the future, these could be used by other backends so I've moved these 3 functions into their own utility class. This change helps clean up common.icat.helpers a bit which is another reason this change has been made ([`2a88aae`](https://github.com/ral-facilities/datagateway-api/commit/2a88aaedc78e68931972064ba389dbeced9a6266)) * #145: Add exception to be caught when creating ICAT data ([`d7741f7`](https://github.com/ral-facilities/datagateway-api/commit/d7741f74f390b92f7a95a634976af085050295ad)) @@ -4317,11 +4424,11 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #145: Deal with attributes that have MANY relationships -- This code needs to be recursed over, since multiple 'levels' of mandatory MANY relationships don't happen currently and this results in a database related error ([`85860ff`](https://github.com/ral-facilities/datagateway-api/commit/85860ff112b19190819556d4a80ed343a9fc19a8)) +- This code needs to be recursed over, since multiple 'levels' of mandatory MANY relationships don't happen currently and this results in a database related error ([`85860ff`](https://github.com/ral-facilities/datagateway-api/commit/85860ff112b19190819556d4a80ed343a9fc19a8)) * #145: Remove parameter from str_to_datetime_object() -- I've also made use of this in create_entities() which made me notice that said parameter wasn't used ([`5eed66e`](https://github.com/ral-facilities/datagateway-api/commit/5eed66ea64da1b3f7496f382d74c85fdb1a4bb00)) +- I've also made use of this in create_entities() which made me notice that said parameter wasn't used ([`5eed66e`](https://github.com/ral-facilities/datagateway-api/commit/5eed66ea64da1b3f7496f382d74c85fdb1a4bb00)) * #145: Allow Python ICAT names to be fetched as camelCase @@ -4335,7 +4442,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #145: Prevent related entities from displaying in response of a PATCH request -- Related entities (i.e. includes="1") must be retrieved when updating data to avoid an IcatException which highlights that a related entity field is trying to be set to null which is invalid ([`2970dde`](https://github.com/ral-facilities/datagateway-api/commit/2970dde9478bdf9f5ab334a638a3f9f11c2cb03f)) +- Related entities (i.e. includes="1") must be retrieved when updating data to avoid an IcatException which highlights that a related entity field is trying to be set to null which is invalid ([`2970dde`](https://github.com/ral-facilities/datagateway-api/commit/2970dde9478bdf9f5ab334a638a3f9f11c2cb03f)) * #145: Add basic implementation of updating multiple entities in one request @@ -4345,7 +4452,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #145: Remove to_dict() conversion on PATCH entity endpoints -- Python ICAT backend doesn't need this conversion, so this has been moved into the relevant DB backend helper function ([`a4baba3`](https://github.com/ral-facilities/datagateway-api/commit/a4baba30c16f3310f763732f221903b5191c2a39)) +- Python ICAT backend doesn't need this conversion, so this has been moved into the relevant DB backend helper function ([`a4baba3`](https://github.com/ral-facilities/datagateway-api/commit/a4baba30c16f3310f763732f221903b5191c2a39)) * #145: Implement /findone for all entities ([`0747c5b`](https://github.com/ral-facilities/datagateway-api/commit/0747c5b35a0adb93665d0135b76ff0ea36c23889)) @@ -4359,7 +4466,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #148: Fix bug where no distinct filter is present ([`f6df659`](https://github.com/ral-facilities/datagateway-api/commit/f6df6597b7d5a32bb7e7947c5f1fdc1eee3ab324)) -* #148: Allow distinct fields to work correctly with included columns of >1 depth ([`0760556`](https://github.com/ral-facilities/datagateway-api/commit/0760556cfe5bbdba286dd3bf3f539fc94e1ab286)) +* #148: Allow distinct fields to work correctly with included columns of >1 depth ([`0760556`](https://github.com/ral-facilities/datagateway-api/commit/0760556cfe5bbdba286dd3bf3f539fc94e1ab286)) * #148: Move checking WHERE filters for distinctiveness to its own function @@ -4375,7 +4482,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #148: Move duplicated code to its own function -- This involves moving the distinct fields belonging to the entity that's going to be sent into entity_to_dict() (via recursion) to be moved to the base so it can be checked when that recursion call executes ([`f4b89db`](https://github.com/ral-facilities/datagateway-api/commit/f4b89dbf1436827d9e0dbfbc1de945a3f0232641)) +- This involves moving the distinct fields belonging to the entity that's going to be sent into entity_to_dict() (via recursion) to be moved to the base so it can be checked when that recursion call executes ([`f4b89db`](https://github.com/ral-facilities/datagateway-api/commit/f4b89dbf1436827d9e0dbfbc1de945a3f0232641)) * #148: Allow included fields to be specified as distinct fields ([`4470944`](https://github.com/ral-facilities/datagateway-api/commit/4470944571bb946defcc0fec4bad094ad25475d7)) @@ -4392,7 +4499,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #144: Move extraction of filter fields to specific backend -- This makes the WHERE filter interact well with included fields for the Python ICAT backend - e.g. {'investigationUsers.id': "= '6'"} ([`d3b08e4`](https://github.com/ral-facilities/datagateway-api/commit/d3b08e4377cd56f7aa6b13d2efa9e9cc2e6ebdd5)) +- This makes the WHERE filter interact well with included fields for the Python ICAT backend - e.g. {'investigationUsers.id': "= '6'"} ([`d3b08e4`](https://github.com/ral-facilities/datagateway-api/commit/d3b08e4377cd56f7aa6b13d2efa9e9cc2e6ebdd5)) * #143: Remove unused import ([`6fa0d9a`](https://github.com/ral-facilities/datagateway-api/commit/6fa0d9ae496a4ffeb3e43aabd104aadeff4c09c2)) @@ -4410,17 +4517,17 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #143: Allow included fields to be added to response to n levels deep -- A nice recursive function allows dictionary-based include filters to be correctly added to the request's response +- A nice recursive function allows dictionary-based include filters to be correctly added to the request's response - Requests are still currently broken because of date conversion still not happening correctly, but the log message which shows `data` before being returned shows the data structure is correct, near identical to the way its assembled in the database backend ([`bba6a23`](https://github.com/ral-facilities/datagateway-api/commit/bba6a23d5bb01fa091bdf72e8b2d54d560785b96)) * #143: Checkpoint for making data nested -- Written a specific solution for the data I've been looking at. +- Written a specific solution for the data I've been looking at. - This now uncovered another issue, with the way I search dict_result to convert datetime objects to strings ([`0064ac8`](https://github.com/ral-facilities/datagateway-api/commit/0064ac8670b600a1e06950c60a4d5ecf4c3a305a)) * #143: Checkpoint for adding included data to response -- Data is now added when dictionaries are used within an include filter, however it's not nested correctly ([`b89baea`](https://github.com/ral-facilities/datagateway-api/commit/b89baea6680cf03c88e9a9a31cafedcd1db85b13)) +- Data is now added when dictionaries are used within an include filter, however it's not nested correctly ([`b89baea`](https://github.com/ral-facilities/datagateway-api/commit/b89baea6680cf03c88e9a9a31cafedcd1db85b13)) * #143: Deal with included fields which are joined by dots @@ -4442,15 +4549,15 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #143: Allow dictionary of include filter to be converted to Python ICAT format -- This change doesn't make dictionary include filter work, but they're now converted to a notation that Python ICAT accepts ([`9b8e08e`](https://github.com/ral-facilities/datagateway-api/commit/9b8e08e528fbc145f254a05ad60b4455f338cd33)) +- This change doesn't make dictionary include filter work, but they're now converted to a notation that Python ICAT accepts ([`9b8e08e`](https://github.com/ral-facilities/datagateway-api/commit/9b8e08e528fbc145f254a05ad60b4455f338cd33)) * #143: Add basic implementation of include filter - This filter currently accepts a single entity name, or a list of entity names. Dictionaries are not yet supported ([`c724f72`](https://github.com/ral-facilities/datagateway-api/commit/c724f721a0e5905a38a48cb8b8a66c52f137c5f3)) -* Merge branch 'feature/icat-limit-skip-filters-#139' into feature/icat-distinct-filter-#141 ([`32e6927`](https://github.com/ral-facilities/datagateway-api/commit/32e69278b3a1d047d4e3820d7b75d35a734d77fd)) +* Merge branch 'feature/icat-limit-skip-filters-#139' into feature/icat-distinct-filter-#141 ([`32e6927`](https://github.com/ral-facilities/datagateway-api/commit/32e69278b3a1d047d4e3820d7b75d35a734d77fd)) -* Merge branch 'feature/icat-order-filter-#140' into feature/icat-limit-skip-filters-#139 ([`61b63a2`](https://github.com/ral-facilities/datagateway-api/commit/61b63a26fdf473fa48ce02603f2d3aa1de0dcd8d)) +* Merge branch 'feature/icat-order-filter-#140' into feature/icat-limit-skip-filters-#139 ([`61b63a2`](https://github.com/ral-facilities/datagateway-api/commit/61b63a26fdf473fa48ce02603f2d3aa1de0dcd8d)) * #140: Make suggested changes as per PR comments ([`8c1dcd7`](https://github.com/ral-facilities/datagateway-api/commit/8c1dcd7e68146b31e950156499ce92010eecaa9f)) @@ -4463,11 +4570,11 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- - This change fixes a bug where if a value used for a WHERE filter with an IN operation had only a single element in a list, it would cause a JPQL error. This happened because the list was converted into a tuple (to satisfy JPQL formatting of array based data). With single element tuples, Python adds a trailing comma, something which is invalid in JPQL. The value is now converted into a string, with the square brackets being replaced with normal brackets before being sent off to JPQL. - Also added type checking on the value if an IN operation is used to ensure the value is a list ([`2aea37c`](https://github.com/ral-facilities/datagateway-api/commit/2aea37c6800f590b8eac6709437b62d1cfd2e7fc)) -* #141: Fix bug where JSON serialisable dates wouldn't be applied when using distinct filter ([`2d7eeff`](https://github.com/ral-facilities/datagateway-api/commit/2d7eeff9415fedb9e605b5001ac2b6c6e550d4a3)) +* #141: Fix bug where JSON serialisable dates wouldn't be applied when using distinct filter ([`2d7eeff`](https://github.com/ral-facilities/datagateway-api/commit/2d7eeff9415fedb9e605b5001ac2b6c6e550d4a3)) -* #141: Fix where distinct filter doesn't show field because of overlapping WHERE filter +* #141: Fix where distinct filter doesn't show field because of overlapping WHERE filter -- This change means that if there's a distinct filter of an attribute, and a WHERE filter specifying a condition of the same attribute, the distinct filter will act as intended (where before the data of that attribute wasn't added to the response) ([`92d6b01`](https://github.com/ral-facilities/datagateway-api/commit/92d6b01b905664449b08de80f534f2a66e6a6038)) +- This change means that if there's a distinct filter of an attribute, and a WHERE filter specifying a condition of the same attribute, the distinct filter will act as intended (where before the data of that attribute wasn't added to the response) ([`92d6b01`](https://github.com/ral-facilities/datagateway-api/commit/92d6b01b905664449b08de80f534f2a66e6a6038)) * #141: Refactor ICAT creation and execution @@ -4477,7 +4584,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #141: Refactor the distinct filter aspects of execute_icat_query() - Combine some of the logic with the existing logic where `return_json_formattable` is True - this will ensure that datetimes are converted to an appropriate format when using distinct filters -- This commit also adds checking of the query's conditions to only select attribute names of those which are "!= null" as set by the distinct filter ([`7031f59`](https://github.com/ral-facilities/datagateway-api/commit/7031f5981b144fb7567b639beec541f229c070c5)) +- This commit also adds checking of the query's conditions to only select attribute names of those which are "!= null" as set by the distinct filter ([`7031f59`](https://github.com/ral-facilities/datagateway-api/commit/7031f5981b144fb7567b639beec541f229c070c5)) * #141: Allow multiple fields to be used in a distinct filter @@ -4487,7 +4594,7 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- - This requires the addition of creating WHERE filters within a distinct filter to deal with multiple fields within a single distinct filter ([`eedc803`](https://github.com/ral-facilities/datagateway-api/commit/eedc8034ad9afba234fb005464da42769da385d2)) -* #141: Add 'not equal' operation to ICAT WHERE filter +* #141: Add 'not equal' operation to ICAT WHERE filter - The primary used for this operation will be to add WHERE filters when a distinct filter is in a request, so distinct filters can accomodate multiple fields ([`bda22f4`](https://github.com/ral-facilities/datagateway-api/commit/bda22f40e48d846beb7d262ae4b0f5c4e7022f7f)) @@ -4506,18 +4613,18 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #139: Allow a request to have both limit and skip filters - The skip filter will be merged into the limit filter, with the skip filter being removed from the filter handler -- There is a bug when using a skip filter on it's own, as it'll always return a 404 ([`93eb468`](https://github.com/ral-facilities/datagateway-api/commit/93eb4686670299b75e8e164ba878a4106374b30c)) +- There is a bug when using a skip filter on it's own, as it'll always return a 404 ([`93eb468`](https://github.com/ral-facilities/datagateway-api/commit/93eb4686670299b75e8e164ba878a4106374b30c)) * #140: Move create_condition() to PythonICATWhereFilter - This is to remove a circular dependency that I found while implementing an order filter -- Also added a couple of __init__.py files which didn't previously exist ([`51924f8`](https://github.com/ral-facilities/datagateway-api/commit/51924f8bf0efac50a2b93f3f2978f54608512db8)) +- Also added a couple of __init__.py files which didn't previously exist ([`51924f8`](https://github.com/ral-facilities/datagateway-api/commit/51924f8bf0efac50a2b93f3f2978f54608512db8)) * #140: Remove unused imports ([`19a286b`](https://github.com/ral-facilities/datagateway-api/commit/19a286b794a6d1e1373bdce4b0711f60ece34a88)) * #140: Basic implementation of ICAT order filter -- If there's more than one order filter in a request, the others get overwritten due to the way setOrder() works in Python ICAT ([`578ac21`](https://github.com/ral-facilities/datagateway-api/commit/578ac214b56e5086483ca5f0a13fca0aad036234)) +- If there's more than one order filter in a request, the others get overwritten due to the way setOrder() works in Python ICAT ([`578ac21`](https://github.com/ral-facilities/datagateway-api/commit/578ac214b56e5086483ca5f0a13fca0aad036234)) * #140: Move FilterOrderHandler into its own file @@ -4528,19 +4635,19 @@ Entity by ID Methods ([`0600a0a`](https://github.com/ral-facilities/datagateway- * #142: Rebuild Swagger docs -- They've changed a little since they've last been committed ([`6d225d6`](https://github.com/ral-facilities/datagateway-api/commit/6d225d6d7b669824c43e1d451d42754f8a23d740)) +- They've changed a little since they've last been committed ([`6d225d6`](https://github.com/ral-facilities/datagateway-api/commit/6d225d6d7b669824c43e1d451d42754f8a23d740)) * #142: Make changes as requested in PR review ([`537d4c6`](https://github.com/ral-facilities/datagateway-api/commit/537d4c688c9fbb6f9e5438acfaf78759fc4d2f98)) -* Merge branch 'feature/python-icat-where-filter-#142' of github.com:ral-facilities/datagateway-api into feature/python-icat-where-filter-#142 +* Merge branch 'feature/python-icat-where-filter-#142' of github.com:ral-facilities/datagateway-api into feature/python-icat-where-filter-#142 - Caused by not doing a git pull before a made changes... ([`a70ee2b`](https://github.com/ral-facilities/datagateway-api/commit/a70ee2b307a402846db9ed59eff22ea34f67bfd3)) * Merge pull request #157 from ral-facilities/feature/linter-black-#155 -Implement Black (code formatter) into repo's development cycle ([`358b74b`](https://github.com/ral-facilities/datagateway-api/commit/358b74bcdb5a919fc38bdb45dad349a2eee9abac)) +Implement Black (code formatter) into repo's development cycle ([`358b74b`](https://github.com/ral-facilities/datagateway-api/commit/358b74bcdb5a919fc38bdb45dad349a2eee9abac)) -* Merge branch 'feature/python-icat-where-filter-#142' into feature/linter-black-#155 ([`aeb05dc`](https://github.com/ral-facilities/datagateway-api/commit/aeb05dc531e4fc9d2f00b3411f6e6b3ae6ed3c59)) +* Merge branch 'feature/python-icat-where-filter-#142' into feature/linter-black-#155 ([`aeb05dc`](https://github.com/ral-facilities/datagateway-api/commit/aeb05dc531e4fc9d2f00b3411f6e6b3ae6ed3c59)) * #155: Add documentation regarding code formatter ([`d7f726d`](https://github.com/ral-facilities/datagateway-api/commit/d7f726d488d7ebc16af28cdefb6a53b61924f8b7)) @@ -4550,27 +4657,27 @@ Implement Black (code formatter) into repo's development cycle ([`358b74b`]( * #155: Put longer strings onto multiple lines to keep with 88 character line length -- A couple have been left alone as they're only 1/2 characters over 88 (as defined by Black). It seemed better to keep them on a single line for readability reasons ([`0f67fc7`](https://github.com/ral-facilities/datagateway-api/commit/0f67fc798e42b8fcb49ef7c1fb3b7e5a36554034)) +- A couple have been left alone as they're only 1/2 characters over 88 (as defined by Black). It seemed better to keep them on a single line for readability reasons ([`0f67fc7`](https://github.com/ral-facilities/datagateway-api/commit/0f67fc798e42b8fcb49ef7c1fb3b7e5a36554034)) * #155: Make things missed by Black mostly abide by 88 characters -- Black mostly missed docstrings and some really long strings, but that's understandable. Black doesn't directly edit strings for fear of editing their contents ([`4aff02d`](https://github.com/ral-facilities/datagateway-api/commit/4aff02d1e7dabd9c9dcf29be1ffbc0df23a5f089)) +- Black mostly missed docstrings and some really long strings, but that's understandable. Black doesn't directly edit strings for fear of editing their contents ([`4aff02d`](https://github.com/ral-facilities/datagateway-api/commit/4aff02d1e7dabd9c9dcf29be1ffbc0df23a5f089)) * #155: Changes made by Black code formatter -- This is directly after doing `black .` on the root directory. It'll be interesting to see if any corrections are needed ([`93b4d85`](https://github.com/ral-facilities/datagateway-api/commit/93b4d85496abe282257f26b4b391fff0f52c6311)) +- This is directly after doing `black .` on the root directory. It'll be interesting to see if any corrections are needed ([`93b4d85`](https://github.com/ral-facilities/datagateway-api/commit/93b4d85496abe282257f26b4b391fff0f52c6311)) -* #142: Change 'BadFilterError' to 'FilterError' +* #142: Change 'BadFilterError' to 'FilterError' - Part of PR review for this branch ([`e27c887`](https://github.com/ral-facilities/datagateway-api/commit/e27c887515012faefe6054cc0fdd695e6bb3d086)) -* #142: Add 'gt' & 'lt' operations to WHERE filter +* #142: Add 'gt' & 'lt' operations to WHERE filter - This change affects both database and Python ICAT backends ([`4707be6`](https://github.com/ral-facilities/datagateway-api/commit/4707be6958426200511636ae149ee10345e97fb5)) -* Merge branch 'feature/python-icat-get-with-filters-#137' into feature/python-icat-where-filter-#142 ([`26b8033`](https://github.com/ral-facilities/datagateway-api/commit/26b8033133ffdf79021ffec6b2c760607af5d8e6)) +* Merge branch 'feature/python-icat-get-with-filters-#137' into feature/python-icat-where-filter-#142 ([`26b8033`](https://github.com/ral-facilities/datagateway-api/commit/26b8033133ffdf79021ffec6b2c760607af5d8e6)) -* Merge branch 'feature/python-icat-entity-id-endpoints-#136' into feature/python-icat-get-with-filters-#137 +* Merge branch 'feature/python-icat-entity-id-endpoints-#136' into feature/python-icat-get-with-filters-#137 Conflicts: common/python_icat_helpers.py ([`80b89e9`](https://github.com/ral-facilities/datagateway-api/commit/80b89e95a0a8ee1cc8319cbe60d0e6813a8af57f)) @@ -4593,7 +4700,7 @@ Conflicts: * #142: Implement aspects of WHERE filter for ICAT backend -- 'like' and 'in' operations don't work yet ([`9d2b4b5`](https://github.com/ral-facilities/datagateway-api/commit/9d2b4b559b6dc4cc0733dc79b6640df22588c2c5)) +- 'like' and 'in' operations don't work yet ([`9d2b4b5`](https://github.com/ral-facilities/datagateway-api/commit/9d2b4b559b6dc4cc0733dc79b6640df22588c2c5)) * #142: Remove duplicated constructor for DB filters ([`b6224db`](https://github.com/ral-facilities/datagateway-api/commit/b6224dbf06a4469e2b9ff5bc87424eac408b9fa6)) @@ -4613,7 +4720,7 @@ Conflicts: * #137: Basic implementation of GET endpoint for entities - Implementation for the Python ICAT backend -- This implementation ignores any filter parameters in the request as this haven't been implemented for the Python ICAT backend. As a result, this endpoint just gets all the records for a specified entity ([`cc4358e`](https://github.com/ral-facilities/datagateway-api/commit/cc4358efb5065998500fb81ec441004093c6501b)) +- This implementation ignores any filter parameters in the request as this haven't been implemented for the Python ICAT backend. As a result, this endpoint just gets all the records for a specified entity ([`cc4358e`](https://github.com/ral-facilities/datagateway-api/commit/cc4358efb5065998500fb81ec441004093c6501b)) * #136: Catch exception when an attribute cannot be found @@ -4623,7 +4730,7 @@ Conflicts: - Python ICAT exception returns a 500 to users when something Python ICAT related may have gone wrong (e.g. creating a Query object). This has been implemented for that example - Added docstrings to the session related functions to match with the ones for entity by ID helper function -- Removed an empty queries_records function inside the ICAT helper file as it's not needed ([`785adde`](https://github.com/ral-facilities/datagateway-api/commit/785addea1e43ed4db692f4b6b1a6f2993152dbe2)) +- Removed an empty queries_records function inside the ICAT helper file as it's not needed ([`785adde`](https://github.com/ral-facilities/datagateway-api/commit/785addea1e43ed4db692f4b6b1a6f2993152dbe2)) * #136: Resolve ICAT error where related entity were trying to be set to null @@ -4633,7 +4740,7 @@ Conflicts: * #136: Allow relevant updated data to be converted into datetime objects -- Code is currently untested due to issues I'm having with Python ICAT. The code will be tested before review. ([`8a1728b`](https://github.com/ral-facilities/datagateway-api/commit/8a1728b0cb64a2b977f24919669170dcfb8df1d4)) +- Code is currently untested due to issues I'm having with Python ICAT. The code will be tested before review. ([`8a1728b`](https://github.com/ral-facilities/datagateway-api/commit/8a1728b0cb64a2b977f24919669170dcfb8df1d4)) * #136: Add basic implementation for PATCH entity by ID @@ -4652,18 +4759,18 @@ Conflicts: * #136: Allow any entity by ID request to correctly get data -- Added docstrings to the functions related to this work. Some of them are incomplete but have TODO marked against them where that's the case -- Removed the hardcoded 'User' entity so any entity can be used. This compares the table name to each of the entity names from Python ICAT and passes the Python ICAT entity name to the query builder. This is due to Python ICAT being case sensitive. A 400 is thrown if an entity cannot be found within Python ICAT +- Added docstrings to the functions related to this work. Some of them are incomplete but have TODO marked against them where that's the case +- Removed the hardcoded 'User' entity so any entity can be used. This compares the table name to each of the entity names from Python ICAT and passes the Python ICAT entity name to the query builder. This is due to Python ICAT being case sensitive. A 400 is thrown if an entity cannot be found within Python ICAT - Moved query execution into a generic function for use elsewhere in the codebase -- Changed a blanket string conversion just to converting datetimes to strings. This was causing IDs to be converted to strings which isn't correct behaviour. Datetimes must be converted to strings so they become JSON serializable ([`0b0bc20`](https://github.com/ral-facilities/datagateway-api/commit/0b0bc208a6c71618910766868cd0fcc9aad910bb)) +- Changed a blanket string conversion just to converting datetimes to strings. This was causing IDs to be converted to strings which isn't correct behaviour. Datetimes must be converted to strings so they become JSON serializable ([`0b0bc20`](https://github.com/ral-facilities/datagateway-api/commit/0b0bc208a6c71618910766868cd0fcc9aad910bb)) * #136: Add functionality to get a user by their ID -- The 'User' entity is currently hardcoded into get_entity_by_id, due to facing an issue with case sensitivity on Python ICAT's side. In the future, any entity should be able to use this code ([`3cc1301`](https://github.com/ral-facilities/datagateway-api/commit/3cc1301ee6eaa6897344d87705ce6ba1669f8900)) +- The 'User' entity is currently hardcoded into get_entity_by_id, due to facing an issue with case sensitivity on Python ICAT's side. In the future, any entity should be able to use this code ([`3cc1301`](https://github.com/ral-facilities/datagateway-api/commit/3cc1301ee6eaa6897344d87705ce6ba1669f8900)) * Merge pull request #149 from ral-facilities/feature/python-icat-backend-login-endpoints-#135 -Python ICAT Backend: Login endpoints & session validation ([`ddca280`](https://github.com/ral-facilities/datagateway-api/commit/ddca2807ac60edf99015f02e8f5f53550d68e49d)) +Python ICAT Backend: Login endpoints & session validation ([`ddca280`](https://github.com/ral-facilities/datagateway-api/commit/ddca2807ac60edf99015f02e8f5f53550d68e49d)) * #135: Allow session IDs to not be overwritten in the database @@ -4678,7 +4785,7 @@ Python ICAT Backend: Login endpoints & session validation ([`ddca280`](https * #135: Further tweaks for Python ICAT session decorator - This also moves some of the DB helper code into the relevant file -- These changes cause one of the tests in test_helper.py to fail when using the Python ICAT backend. This is because @requires_session_id only really tests if a session ID is valid when it's actually doing an API call. I'm not 100% happy with this but the feature does function ([`dbe8ba1`](https://github.com/ral-facilities/datagateway-api/commit/dbe8ba1d16899e6fa3631339e86e28ab2087dedc)) +- These changes cause one of the tests in test_helper.py to fail when using the Python ICAT backend. This is because @requires_session_id only really tests if a session ID is valid when it's actually doing an API call. I'm not 100% happy with this but the feature does function ([`dbe8ba1`](https://github.com/ral-facilities/datagateway-api/commit/dbe8ba1d16899e6fa3631339e86e28ab2087dedc)) * #135: Add Python ICAT decorator to ensure valid session ID ([`168ba94`](https://github.com/ral-facilities/datagateway-api/commit/168ba94b07806e8e15c240a369fbeac74e70a443)) @@ -4688,8 +4795,8 @@ Python ICAT Backend: Login endpoints & session validation ([`ddca280`](https * #135: Implement login function for python ICAT backend -- Because this backend can use different mechanisms, I've changed the DB backend so it can use a mechanism as per the request body -- Any installed mechanism can be used, though if one isn't supplied, it defaults to simple ([`9755e0b`](https://github.com/ral-facilities/datagateway-api/commit/9755e0b16aeeb5c8e532bbfddd9e56d71bb65d0c)) +- Because this backend can use different mechanisms, I've changed the DB backend so it can use a mechanism as per the request body +- Any installed mechanism can be used, though if one isn't supplied, it defaults to simple ([`9755e0b`](https://github.com/ral-facilities/datagateway-api/commit/9755e0b16aeeb5c8e532bbfddd9e56d71bb65d0c)) * #135: Add skeleton outline for new python-icat backend ([`c2e09bf`](https://github.com/ral-facilities/datagateway-api/commit/c2e09bf86e8c2386294f932a7356d0b8084c060a)) @@ -4697,9 +4804,9 @@ Python ICAT Backend: Login endpoints & session validation ([`ddca280`](https Enable backend to be configurable ([`e4db23b`](https://github.com/ral-facilities/datagateway-api/commit/e4db23b42fc6b8b15db08cd5d3dfcbd1158edbf8)) -* Merge branch 'master' into feature/configurable-backend-#125 ([`108256f`](https://github.com/ral-facilities/datagateway-api/commit/108256fda0a0e5df82f7bd8722641f298b560527)) +* Merge branch 'master' into feature/configurable-backend-#125 ([`108256f`](https://github.com/ral-facilities/datagateway-api/commit/108256fda0a0e5df82f7bd8722641f298b560527)) -* Merge branch 'id-endpoints-404-#129' +* Merge branch 'id-endpoints-404-#129' Conflicts: src/swagger/openapi.yaml ([`016ce7b`](https://github.com/ral-facilities/datagateway-api/commit/016ce7bff672ebeee6f842ca6614cb1b99ab29d9)) @@ -4713,7 +4820,7 @@ Conflicts: - Swagger is case sensitive when using parameters - This change means endpoints with an ID parameter (e.g. /users/{id}) will now work using the Swagger UI user input for said ID ([`203707f`](https://github.com/ral-facilities/datagateway-api/commit/203707f76457daac2f56744e6ae073c7ae5f1a13)) -* Merge branch 'include-filter-count-endpoints-swagger-#128' +* Merge branch 'include-filter-count-endpoints-swagger-#128' Conflicts: src/swagger/openapi.yaml ([`d330972`](https://github.com/ral-facilities/datagateway-api/commit/d33097299736587c48cbf1ed6c2f38f7f08d4a7a)) @@ -4739,7 +4846,7 @@ Remove unused users investigation endpoints ([`948b4dd`](https://github.com/ral- * #125 - fix duplicated `to_dict` in get_id_endpoint ([`755e85f`](https://github.com/ral-facilities/datagateway-api/commit/755e85fde9cef703810b82f396ab7f83d8fcea85)) -* Merge branch 'master' into feature/configurable-backend-#125 ([`3862d11`](https://github.com/ral-facilities/datagateway-api/commit/3862d11474fca55c28b1934b5d8aa4ee9d8f0d17)) +* Merge branch 'master' into feature/configurable-backend-#125 ([`3862d11`](https://github.com/ral-facilities/datagateway-api/commit/3862d11474fca55c28b1934b5d8aa4ee9d8f0d17)) * Merge pull request #121 from ral-facilities/feature/set-session-info-#120 @@ -4762,13 +4869,13 @@ Improve OpenAPI spec generation ([`130a736`](https://github.com/ral-facilities/d - base entity endpoint fully documented - sessions endpoint fully documented ([`dfebf55`](https://github.com/ral-facilities/datagateway-api/commit/dfebf557464bff3a1ddf1575f14b4ddab4e92ac0)) -* #125 - add abstract "backend" class and move database specific code in endpoints to there. +* #125 - add abstract "backend" class and move database specific code in endpoints to there. Also, an change in that errors are no longer caught, and are translated by flask into error codes. ([`5ae2cc8`](https://github.com/ral-facilities/datagateway-api/commit/5ae2cc84876149f05600767f93ae9f6aa49c3ed0)) * Revert to bb164ae (committed to wrong branch) ([`1d84c39`](https://github.com/ral-facilities/datagateway-api/commit/1d84c39022f450660ea8080ea64d8a3f0aaaa994)) -* Include 'findone' endpoints in generated openapi.yaml ([`bc55c74`](https://github.com/ral-facilities/datagateway-api/commit/bc55c7417c6d2b28a991d549a3e9d5cf76083188)) +* Include 'findone' endpoints in generated openapi.yaml ([`bc55c74`](https://github.com/ral-facilities/datagateway-api/commit/bc55c7417c6d2b28a991d549a3e9d5cf76083188)) * Merge pull request #117 from ral-facilities/feature/schema-references-#116 @@ -4800,7 +4907,7 @@ Improve README ([`7140077`](https://github.com/ral-facilities/datagateway-api/co * #87: Update example ([`0b45c2a`](https://github.com/ral-facilities/datagateway-api/commit/0b45c2a82e5912e9b4706f8ca39ef72d63b24a39)) -* Merge branch 'master' into 87_improve_readme ([`95a1601`](https://github.com/ral-facilities/datagateway-api/commit/95a1601c38568e4af0c9ee877d45c3b2511502c1)) +* Merge branch 'master' into 87_improve_readme ([`95a1601`](https://github.com/ral-facilities/datagateway-api/commit/95a1601c38568e4af0c9ee877d45c3b2511502c1)) * #87: Fix typo ([`f427cb2`](https://github.com/ral-facilities/datagateway-api/commit/f427cb2a5c7f00891c0d4b28dd2554124c897a74)) @@ -4874,7 +4981,7 @@ Generate 2 datasets ([`78799d5`](https://github.com/ral-facilities/datagateway-a Proposed refactoring for 92 ([`72248a8`](https://github.com/ral-facilities/datagateway-api/commit/72248a8692f567eb0c69095089e1c2912d95502d)) -* Merge branch 'master' into 92_refactor_endpoints ([`2c6a862`](https://github.com/ral-facilities/datagateway-api/commit/2c6a8626b65f44bae69ddcaeee63de81e24c9802)) +* Merge branch 'master' into 92_refactor_endpoints ([`2c6a862`](https://github.com/ral-facilities/datagateway-api/commit/2c6a8626b65f44bae69ddcaeee63de81e24c9802)) * Merge pull request #99 from ral-facilities/83_add_dev_requirements @@ -4946,7 +5053,7 @@ Add db creation script ([`c74c0cf`](https://github.com/ral-facilities/datagatewa * #70: Add argument passing ([`15693c1`](https://github.com/ral-facilities/datagateway-api/commit/15693c1ec7ce3f1db6a044b174eab325b4a16e13)) -* Merge branch 'master' into 70_add_db_creation_script ([`77a2c6f`](https://github.com/ral-facilities/datagateway-api/commit/77a2c6fe0a773a3319733d6e2eb28afdfabdd901)) +* Merge branch 'master' into 70_add_db_creation_script ([`77a2c6f`](https://github.com/ral-facilities/datagateway-api/commit/77a2c6fe0a773a3319733d6e2eb28afdfabdd901)) * #70: add datafile location ([`c9b41ec`](https://github.com/ral-facilities/datagateway-api/commit/c9b41ec42ac30c21ce95f4ecdd3ab975174072ea)) @@ -4980,7 +5087,7 @@ Correct response types ([`5b1f878`](https://github.com/ral-facilities/datagatewa * #75: Use __file__ to get relative paths ([`6d1f323`](https://github.com/ral-facilities/datagateway-api/commit/6d1f323c39a17424d42bcada9b31e3ba39e4c533)) -* Merge branch 'master' into 75_fix_paths ([`620a248`](https://github.com/ral-facilities/datagateway-api/commit/620a248dfb2c2bd2c6f1438e3eb322a9017dd435)) +* Merge branch 'master' into 75_fix_paths ([`620a248`](https://github.com/ral-facilities/datagateway-api/commit/620a248dfb2c2bd2c6f1438e3eb322a9017dd435)) * Merge pull request #82 from ral-facilities/81_enable_cors @@ -5032,7 +5139,7 @@ Allow only one include ([`0d97b57`](https://github.com/ral-facilities/datagatewa * #39: Update swagger ([`c7031f2`](https://github.com/ral-facilities/datagateway-api/commit/c7031f250caec5db187f30c1804339af9fbf768e)) -* Merge branch 'master' into 39_only_one_include_filter ([`2e8e41d`](https://github.com/ral-facilities/datagateway-api/commit/2e8e41d80f9cf1df535a79cc35770645a09e6b63)) +* Merge branch 'master' into 39_only_one_include_filter ([`2e8e41d`](https://github.com/ral-facilities/datagateway-api/commit/2e8e41d80f9cf1df535a79cc35770645a09e6b63)) * #39: Handle exception and send response ([`b755af3`](https://github.com/ral-facilities/datagateway-api/commit/b755af3d18feef84241d655699a76172cc8e1a09)) @@ -5060,7 +5167,7 @@ Improve testing ([`991210a`](https://github.com/ral-facilities/datagateway-api/c * #21: Remove redundant tests ([`f537c5d`](https://github.com/ral-facilities/datagateway-api/commit/f537c5d1a15c996a7d5c50f796b0cf953a679412)) -* Merge branch 'master' into 75_fix_paths ([`03c015b`](https://github.com/ral-facilities/datagateway-api/commit/03c015bacba545f6963ed2dc180ec39b5f358033)) +* Merge branch 'master' into 75_fix_paths ([`03c015b`](https://github.com/ral-facilities/datagateway-api/commit/03c015bacba545f6963ed2dc180ec39b5f358033)) * Merge pull request #73 from ral-facilities/71_change_file_paths @@ -5086,7 +5193,7 @@ Change handling of session ([`c6ddda4`](https://github.com/ral-facilities/dataga Update swagger generation ([`444342a`](https://github.com/ral-facilities/datagateway-api/commit/444342a5f762965ec58f981c208e920e821ff67d)) -* Merge branch 'master' into 50_update_swagger ([`9d5962c`](https://github.com/ral-facilities/datagateway-api/commit/9d5962ca65e00c2a82bafa3577eafa70e765dca3)) +* Merge branch 'master' into 50_update_swagger ([`9d5962c`](https://github.com/ral-facilities/datagateway-api/commit/9d5962ca65e00c2a82bafa3577eafa70e765dca3)) * #50: Regenerate openapi.yaml ([`b2acf40`](https://github.com/ral-facilities/datagateway-api/commit/b2acf4036660c95b235de10722a81c9ba7474a98)) @@ -5110,7 +5217,7 @@ Update swagger generation ([`444342a`](https://github.com/ral-facilities/datagat Handle no credentials ([`40a3463`](https://github.com/ral-facilities/datagateway-api/commit/40a346325ec4d79117218e11e99f6b7231c8ba30)) -* Merge branch 'master' into 61_return_401_for_no_credentials ([`8e46366`](https://github.com/ral-facilities/datagateway-api/commit/8e46366d86611a1b040e35d0c15f60cd36a1f94f)) +* Merge branch 'master' into 61_return_401_for_no_credentials ([`8e46366`](https://github.com/ral-facilities/datagateway-api/commit/8e46366d86611a1b040e35d0c15f60cd36a1f94f)) * Merge pull request #57 from ral-facilities/51_refactoring_filters @@ -5118,7 +5225,7 @@ Refactor getting filters ([`bd206b1`](https://github.com/ral-facilities/datagate * #51: Update _get_results_with_include ([`1b2a389`](https://github.com/ral-facilities/datagateway-api/commit/1b2a3898acc17daa432aa3721de2dfb1b5a54a7a)) -* Merge branch 'master' into 51_refactoring_filters ([`01c0a1c`](https://github.com/ral-facilities/datagateway-api/commit/01c0a1ce4eb16185ce80f4ea957c7fb231641a5d)) +* Merge branch 'master' into 51_refactoring_filters ([`01c0a1c`](https://github.com/ral-facilities/datagateway-api/commit/01c0a1ce4eb16185ce80f4ea957c7fb231641a5d)) * #51: Use updated include filter ([`ce6beb7`](https://github.com/ral-facilities/datagateway-api/commit/ce6beb7182ae87eb326351ebc7e5ef313aec572d)) @@ -5168,7 +5275,7 @@ Add ability to get distinct values ([`5695e3f`](https://github.com/ral-facilitie * #41: Whitespace changes ([`12adcab`](https://github.com/ral-facilities/datagateway-api/commit/12adcab1c8b912db69eb255f4e79e9f872627484)) -* Merge branch 'master' into 41_add_ability_to_get_distinct_values ([`d8a8499`](https://github.com/ral-facilities/datagateway-api/commit/d8a8499850b92073727105b9a690855df9a98ed4)) +* Merge branch 'master' into 41_add_ability_to_get_distinct_values ([`d8a8499`](https://github.com/ral-facilities/datagateway-api/commit/d8a8499850b92073727105b9a690855df9a98ed4)) * Merge pull request #55 from ral-facilities/52_fix_isis_queries @@ -5180,7 +5287,7 @@ Add ability to get distinct values ([`5695e3f`](https://github.com/ral-facilitie Allow many to many includes ([`82e7dcb`](https://github.com/ral-facilities/datagateway-api/commit/82e7dcb836e8202ead51d73519916141155bb640)) -* Merge branch 'master' into 43_allow_many_to_many_includes ([`7ec4f3f`](https://github.com/ral-facilities/datagateway-api/commit/7ec4f3fe99759ea8bb8abb3b3a500dcd3ecf2693)) +* Merge branch 'master' into 43_allow_many_to_many_includes ([`7ec4f3f`](https://github.com/ral-facilities/datagateway-api/commit/7ec4f3fe99759ea8bb8abb3b3a500dcd3ecf2693)) * #43: Move included entities to nested array ([`100d004`](https://github.com/ral-facilities/datagateway-api/commit/100d0046e63ba8c1963acefa553789e98d5ed818)) @@ -5190,9 +5297,9 @@ Allow many to many includes ([`82e7dcb`](https://github.com/ral-facilities/datag * Merge pull request #53 from ral-facilities/52_fix_isis_queries -Fix ISIS facility cycles & ISIS investigations queries ([`fb16374`](https://github.com/ral-facilities/datagateway-api/commit/fb16374a1b300251c72a526b3497faef8b976dc4)) +Fix ISIS facility cycles & ISIS investigations queries ([`fb16374`](https://github.com/ral-facilities/datagateway-api/commit/fb16374a1b300251c72a526b3497faef8b976dc4)) -* #52: fix ISIS facility cycles & ISIS investigations queries ([`609ce2a`](https://github.com/ral-facilities/datagateway-api/commit/609ce2a7c1707c876e58bc6e7f19981450b46f3a)) +* #52: fix ISIS facility cycles & ISIS investigations queries ([`609ce2a`](https://github.com/ral-facilities/datagateway-api/commit/609ce2a7c1707c876e58bc6e7f19981450b46f3a)) * Merge pull request #38 from ral-facilities/34_add_table_specific_endpoints @@ -5270,7 +5377,7 @@ Fix ISIS facility cycles & ISIS investigations queries ([`fb16374`](https:// * #34: Temporary fix of 48 ([`225f182`](https://github.com/ral-facilities/datagateway-api/commit/225f182d69e15890b07a94179584ae4ea76e2d4c)) -* Merge branch 'master' into 34_add_table_specific_endpoints ([`bd06b89`](https://github.com/ral-facilities/datagateway-api/commit/bd06b8963e270558e3f318f6ec695e38b0a9ced1)) +* Merge branch 'master' into 34_add_table_specific_endpoints ([`bd06b89`](https://github.com/ral-facilities/datagateway-api/commit/bd06b8963e270558e3f318f6ec695e38b0a9ced1)) * #34: Update resource class for count ([`de74984`](https://github.com/ral-facilities/datagateway-api/commit/de749844914c8dedd9c9b1b7c7ad21498a168e69)) @@ -5296,7 +5403,7 @@ Fix ISIS facility cycles & ISIS investigations queries ([`fb16374`](https:// * #34: Change how table is selected for filtering ([`f0dd894`](https://github.com/ral-facilities/datagateway-api/commit/f0dd894c852536a81bd9377940617ef926dae73e)) -* Merge branch 'master' into 34_add_table_specific_endpoints ([`9016789`](https://github.com/ral-facilities/datagateway-api/commit/9016789d9fd0cab4b7a25eb8d07cf02e3223a3e6)) +* Merge branch 'master' into 34_add_table_specific_endpoints ([`9016789`](https://github.com/ral-facilities/datagateway-api/commit/9016789d9fd0cab4b7a25eb8d07cf02e3223a3e6)) * #34: Add _get_table_to_filter method ([`ac2b923`](https://github.com/ral-facilities/datagateway-api/commit/ac2b92316477a9cfe2f93d88e12f92564dbe91df)) @@ -5386,7 +5493,7 @@ Use order of operations for filtering ([`2f59010`](https://github.com/ral-facili Use classes for queries and filters, and create SessionManager ([`c6f0b87`](https://github.com/ral-facilities/datagateway-api/commit/c6f0b876ae922202d9000271db51c0d3cc055661)) -* Merge branch 'master' into use_classes_for_queries_and_filters ([`70844ce`](https://github.com/ral-facilities/datagateway-api/commit/70844cec5d9aac0bb629be30ff2de12bebb7a993)) +* Merge branch 'master' into use_classes_for_queries_and_filters ([`70844ce`](https://github.com/ral-facilities/datagateway-api/commit/70844cec5d9aac0bb629be30ff2de12bebb7a993)) * Merge pull request #27 from ral-facilities/15_generate_swagger @@ -5526,7 +5633,7 @@ Add filtering ([`27cfed0`](https://github.com/ral-facilities/datagateway-api/com * #2: Add docstring to method ([`a9c83d7`](https://github.com/ral-facilities/datagateway-api/commit/a9c83d7c2ff1f585ae368aaf879aaf21d510f2ea)) -* Merge branch 'master' into 2_add_include_and_order_filters ([`3415ce5`](https://github.com/ral-facilities/datagateway-api/commit/3415ce51f59443cdab40541f55746b2f8c9ce4cf)) +* Merge branch 'master' into 2_add_include_and_order_filters ([`3415ce5`](https://github.com/ral-facilities/datagateway-api/commit/3415ce51f59443cdab40541f55746b2f8c9ce4cf)) * Merge pull request #20 from ral-facilities/17_allow_empty_filters @@ -5566,7 +5673,7 @@ Allow empty filters ([`457630e`](https://github.com/ral-facilities/datagateway-a * #2: Allow ordering before limit and vise versa ([`36352dc`](https://github.com/ral-facilities/datagateway-api/commit/36352dcb3da72d688546c6baf043e2c973a39df5)) -* Merge branch 'master' into 2_add_include_and_order_filters ([`7970165`](https://github.com/ral-facilities/datagateway-api/commit/79701652561ad1b29885017b52cfb5e4b955bd01)) +* Merge branch 'master' into 2_add_include_and_order_filters ([`7970165`](https://github.com/ral-facilities/datagateway-api/commit/79701652561ad1b29885017b52cfb5e4b955bd01)) * Merge pull request #14 from ral-facilities/11_add_logging diff --git a/pyproject.toml b/pyproject.toml index 91820c48..af471da2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "datagateway-api" -version = "9.0.3" +version = "9.1.0" description = "ICAT API to interface with the DataGateway" license = "Apache-2.0" readme = "README.md"