Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement the include filter for python-icat #143

Closed
stuartpullinger opened this issue Jun 17, 2020 · 0 comments · Fixed by #168
Closed

implement the include filter for python-icat #143

stuartpullinger opened this issue Jun 17, 2020 · 0 comments · Fixed by #168
Assignees
@MRichards99
Milestone
Implement include...

Comments

@stuartpullinger
Copy link
Contributor

stuartpullinger commented Jun 17, 2020 •
edited
Loading

Involves parsing out several query formats. Use the ICAT extension to JPQL which allows you to add an 'INCLUDE' clause to queries. See the docs here:

https://repo.icatproject.org/site/icat/server/4.10.0/soap.html
MRichards99 added a commit that referenced this issue Sep 3, 2020
@MRichards99
#143: Add basic implementation of include filter
c724f72 
- This filter currently accepts a single entity name, or a list of entity names. Dictionaries are not yet supported
MRichards99 added a commit that referenced this issue Sep 3, 2020
@MRichards99
#143: Allow dictionary of include filter to be converted to Python I…
9b8e08e 
…CAT format

- This change doesn't make dictionary include filter work, but they're now converted to a notation that Python ICAT accepts
MRichards99 added a commit that referenced this issue Sep 3, 2020
@MRichards99
#143: Start to improve how include filter input is adapted for Pytho…
da3ac2c 
…n ICAT

- This deals with strings and lists very well, work is needed on handling dictionaries
MRichards99 added a commit that referenced this issue Sep 3, 2020
@MRichards99
#143: Checkpoint for dealing with include filter input
9d52037 
- Input for PythonICATIncludeFilter
MRichards99 added a commit that referenced this issue Sep 7, 2020
@MRichards99
#143: Solve warnings by VS Code
3257204 
- Warning were caused by missing import statements
MRichards99 added a commit that referenced this issue Sep 7, 2020
@MRichards99
#143: Convert lists and dicts into a form compatible with Python ICAT
3d0f59c
MRichards99 added a commit that referenced this issue Sep 7, 2020
@MRichards99
#143: Deal with included fields which are joined by dots
c32dd5e 
- Also add some comments in `execute_query()`
MRichards99 added a commit that referenced this issue Sep 9, 2020
@MRichards99
#143: Checkpoint for adding included data to response
b89baea 
- Data is now added when dictionaries are used within an include filter, however it's not nested correctly
MRichards99 added a commit that referenced this issue Sep 9, 2020
@MRichards99
#143: Checkpoint for making data nested
0064ac8 
- 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
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Allow included fields to be added to response to n levels deep
bba6a23 
- 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
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Allow dates to be converted to strings in nested structures
3381e82 
- Nice reduction in lines :)
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Make entity_to_dict() more readable
2210fdb
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Improve structure of execute_query()
26f303a 
- This commit will also add some info logging to track what happens to the query during its lifecycle
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Minor docstring/logging changes
1e7572a
MRichards99 added a commit that referenced this issue Sep 11, 2020
@MRichards99
#143: Remove unused import
6fa0d9a
@MRichards99 MRichards99 mentioned this issue Sep 11, 2020
Merged
@MRichards99 MRichards99 linked a pull request Sep 11, 2020 that will close this issue
Implement Include Filter for Python ICAT Backend #168
Merged
@MRichards99 MRichards99 self-assigned this Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@MRichards99 MRichards99

Labels
None yet
Projects
None yet
Milestone
Implement include filter
Development

Successfully merging a pull request may close this issue.

Implement Include Filter for Python ICAT Backend ral-facilities/datagateway-api
2 participants
@stuartpullinger @MRichards99