[ALS-5056] Get Query Site of Origin #148
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Luke-Sikina
commented
Oct 10, 2023
•
Luke-Sikina
commented
- Requirement: in order to know where to send data, we need to associate each query with the requester's site
- Create table of site code, site name, site email domain
- When an institutional query request is made:
- Parse the site code from the email of the requesting user
- Add that site code to the query request
- When persisting a query object after starting a query request
- Check for a site code in the query request
- Add it to the query meta if it exists
- S3 status start
- status enum
- add to query meta during copy
Luke-Sikina
force-pushed
the
site-of-origin
branch
from
f8da791 to
51912b0
Compare
- Requirement: in order to know where to send data, we need to associate each query with the requester's site - Create table of site code, site name, site email domain - When an institutional query request is made: - Parse the site code from the email of the requesting user - Add that site code to the query request - When persisting a query object after starting a query request - Check for a site code in the query request - Add it to the query meta if it exists - Add some extra niceness for later data transfer work - S3 status code
Luke-Sikina
force-pushed
the
site-of-origin
branch
from
51912b0 to
8221ff9
Compare
Luke-Sikina
commented
Oct 10, 2023
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| public class SiteParsingService { |
| @@ -56,6 +56,9 @@ public class QueryRequest { | |||
| @Schema(hidden = true) | |||
| private UUID commonAreaUUID; | |||
|
|
|||
| @Schema(hidden = true) | |||
There was a problem hiding this comment.
Discuss: we (I) are bloating the queryrequest object with GIC specific fields. Maybe a sumtype would be appropriate here? Make QueryRequestTemplate, have QueryRequest extend it, then have a GICQueryRequest with extra fields. Jackson can handle this.
| @@ -277,7 +282,9 @@ public QueryStatus queryMetadata(UUID queryId, HttpHeaders headers){ | |||
| * and resource specific query (could be a string or a json object) | |||
| * @return {@link QueryStatus} | |||
| */ | |||
| public QueryStatus institutionalQuery(QueryRequest dataQueryRequest, HttpHeaders headers) { | |||
| public QueryStatus institutionalQuery(QueryRequest dataQueryRequest, HttpHeaders headers, String email) { | |||
| String siteCode = siteParsingService.parseSiteOfOrigin(email).orElseThrow(() -> new RuntimeException("Bad email")); | |||
There was a problem hiding this comment.
Do I want to throw or just null the field
There was a problem hiding this comment.
But document the error better in the logs
|
|
||
| CREATE TABLE `site` ( | ||
| `uuid` binary(16) NOT NULL, | ||
| `code` varchar(15) COLLATE utf8_bin DEFAULT NULL, |
There was a problem hiding this comment.
this should not be unique, same code can map to multiple domains
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.