Skip to content

Conversation

@labkey-jeckels
Copy link
Contributor

@labkey-jeckels labkey-jeckels commented Mar 19, 2025

Rationale

Switch from pulling session ID from cookie to an API call for handoff to SSRS. Consolidate many duplicate chunks of code.

Related Pull Requests

Changes

  • Introduce new, simple onprc_ehr-getSessionId API to get session ID for SSRS usage
  • Use new API to get session ID instead of LABKEY.Utils.getSessionID()
  • Consolidate duplicate SSRS parameter and URL generation
  • Delete dead code
  • Minor code cleanup
  • Automated test coverage for SSRS URL generation

@labkey-jeckels
Copy link
Contributor Author

@brentlogan @jryurkanin Assuming these changes pass automated tests, I'd like to see if ONPRC can test my feature branch with the real SSRS server. I think the new code is generating equivalent URLs but I can't test in any depth because I don't have your SSRS setup and its associated reports.

@brentlogan
Copy link
Collaborator

@labkey-jeckels I see build #159 from this morning. If that is the correct build, I can install that on a test VM and check it against the production SSRS server.

@labkey-jeckels
Copy link
Contributor Author

@labkey-jeckels I see build #159 from this morning. If that is the correct build, I can install that on a test VM and check it against the production SSRS server.

Please wait for build #178 which will include my last set of changes. It's in the queue now:

https://teamcity.labkey.org/buildConfiguration/LabKey_2411Release_External_Onprc_OnprcInstaller/3428808

@brentlogan
Copy link
Collaborator

@labkey-jeckels I attempted to install the build you linked in your prior comment. It failed because there are two modules with the name ldk. I'll copy the 10 changed files over to my dev environment and test that way.

@brentlogan
Copy link
Collaborator

@labkey-jeckels I won't be able to check this on my dev machine: there's no session id and the SSRS VM won't be able to connect to "localhost."

I suspect the reason why the build doesn't show on our standard ONPRC Installer page in TeamCity is what causes the multiple modules to have the name "ldk."

Once you get that issue resolved, I'll be able to test this for you.

@labkey-jeckels
Copy link
Contributor Author

@labkey-jeckels I attempted to install the build you linked in your prior comment. It failed because there are two modules with the name ldk. I'll copy the 10 changed files over to my dev environment and test that way.

I'm taking a look at what went wrong with the installer build. There are duplicates of a handful of modules, including LDK. There's a matching feature branch in the Git repo where they live which must be tripping things up

@labkey-jeckels
Copy link
Contributor Author

@brentlogan I checked that the new build doesn't have the duplicate modules. Please give it a try at your convenience.

https://teamcity.labkey.org/buildConfiguration/LabKey_2411Release_External_Onprc_OnprcInstaller/3430278

@labkey-jeckels
Copy link
Contributor Author

@brentlogan I wanted to check in and make sure you have what you need to test this out.

@jryurkanin
Copy link

@labkey-jeckels He replied here about it, sorry for not pointing this out earlier: https://www.labkey.org/ONPRC/Support%20Tickets/issues-details.view?issueId=52120

@labkey-jeckels labkey-jeckels marked this pull request as ready for review April 3, 2025 17:12
@labkey-jeckels
Copy link
Contributor Author

@labkey-martyp ready for you to review. I won't merge until I get full confirmation from ONPRC but any changes should be minor at this point.

@brentlogan
Copy link
Collaborator

@labkey-jeckels, thanks for your work on this. I just talked with @Ohsudev this morning about standardizing. He will change one of the reports so we can test standardizing the capitalization of sessionid. We'll let you know when that testing is complete, which I expect by the end of the week.

labkey-martyp
labkey-martyp previously approved these changes Apr 3, 2025
@Ohsudev
Copy link
Collaborator

Ohsudev commented May 19, 2025

Marty, or Mr Patel. Can you please review, try to resolve all conflicts, and "merged" onto release

@labkey-jeckels
Copy link
Contributor Author

Marty, or Mr Patel. Can you please review, try to resolve all conflicts, and "merged" onto release

I pushed a fix. It was just a missing import.

@Ohsudev
Copy link
Collaborator

Ohsudev commented May 19, 2025 via email

@Ohsudev
Copy link
Collaborator

Ohsudev commented May 19, 2025 via email

@labkey-jeckels
Copy link
Contributor Author

Josh. I pushed a release early this morning that sets the last script within the onprc_ehrModule.java as @OverRide public @nullable Double getSchemaVersion() { return 24.009; } Hopefully, you did use that version number for you PR. Thanks, Raymond

I hadn't done a merge from the main 24.11 branch yet - I missed that was part of the request. I've done that now. My work didn't have any schema version changes so there was nothing to manually merge there.

@Ohsudev
Copy link
Collaborator

Ohsudev commented May 19, 2025 via email

@labkey-jeckels
Copy link
Contributor Author

@brentlogan @Ohsudev checking in on this PR. Anything else you need from me to help get it into production?

@brentlogan
Copy link
Collaborator

@labkey-jeckels, could you please resolve the conflicts in ONPRC_EHRController.java? Thanks!

# Conflicts:
#	onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRController.java
@labkey-jeckels
Copy link
Contributor Author

@labkey-jeckels, could you please resolve the conflicts in ONPRC_EHRController.java? Thanks!

The conflicts were all in the import statements at the top of the file. They were straightforward to resolve. I pushed the changes into the branch.

As I'm sure you know, the longer this feature branch stays open the more conflicts it'll accumulate. I hope it can be merged soon but know that it requires some coordination on the SSRS side.

@brentlogan
Copy link
Collaborator

Thanks, @labkey-jeckels! @Ohsudev has a different deploy ready for tonight, but I hope to get this one out this coming Monday.

@brentlogan brentlogan self-assigned this Jun 9, 2025
@brentlogan brentlogan self-requested a review June 9, 2025 20:13
Copy link
Collaborator

@brentlogan brentlogan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Josh, this looks good and we're finally ready to deploy. I was able to test and get no errors, so we're squashing and merging and deploying tonight.

@brentlogan brentlogan merged commit 332bf00 into release24.11-SNAPSHOT Jun 9, 2025
7 checks passed
@brentlogan brentlogan deleted the 24.11_fb_ssrsSessionId branch June 9, 2025 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants