Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[bot] Fast-forward for 23.11.4 #491

Merged
merged 13 commits into from
Jan 9, 2024
Merged

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jan 9, 2024

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=23.11_ff_bot_23.11.4

dnicolalde and others added 13 commits December 13, 2023 21:40
…ailserver updated Postfix to 3.6 (#469)

* Updating postfix configuration for newer version

* Adding log file to postfix

* Fixing problems with postfix

* Updating MSSQL to use new driver

* Adding variable for printable URL

This adds a variable used to generate the URL for sending emails.

* Revert "Updating MSSQL to use new driver"

This reverts commit 092d9ad.

* Adding variable to compose and production yaml files

* Adding ; to the end of line

* Adding one more file

* Typo to the netrc file

* Removing tls for sending email via Labkey

* Removing supervisord from docker file
* Created a query for matching dam and sire suffixes.  Added qview.xml, sql, and query.xml files.

* Added URL query when clicking on Dam or Sire.  Updated SQL query to filter by only Rhesus.

* Created four validationSuite queries for checking the rh and suffix of dams, sires, and ids.

* Saving test alert.

* Created a test email notification.

* Added SMTP to test alert.

* Enabled a secondary water monitoring notification to test with new method.

* Created the NotificationToolkit and used it to create ValidationSuiteNotification.java.  Updated WNPRC_EHRModule.java with the new notification.

* This is the NotificationTookit basics.  More functions will be added to this file as notifications are updated via the revamp.

* Added ValidationSuite notification for testing.

* Added notification validationSuiteSuffixCheckerRhesusDamSire qview for testing.  Need to add qviews for the other 3 suffix checkers if this works.

* Undid changes to queries.

* Added fully working 'Validation Suite' notification.

* Added DeathNotification and AnimalRequestNotification, added 2 necropsy qviews, updated ValidationSuiteNotification and NotificationToolkit.  Also moved the deaths and prenatal trigger scripts to the correct location.  On wnprc_triggers, I muted the code loading the incorrectly placed deaths and prenatal scripts.

* Fixed a function in NotificationToolkit, then fixed it's uses in other files.  Also added 2 automated tests to check the prenatal notification and death notification.

* Corrected a few typos on WNPRC_EHRTest.java

* Updated sendDeathNotification in TriggerScriptHelper.  Registered new revamp notification in WNPRC_EHRModule.  Reverted DeathNotification.java back to original version.  Added DeathNotificationRevamp as separate revamped version.

* Added console logs to notify when onComplete executes for incorrectly placed files: PrenatalDeaths.js and Deaths.js and correctly placed files: prenatal.js and deaths.js.  Fixed wnprc_ehr/TriggerScriptHelper.java so it sends both death notifications: original and revamped correctly.  Updated NotificationToolkit's getTableRowAsList so it checks for an empty table before executing.  Updated NotificationTooolkit's getSexFromAnimalID function so it gets sex of prenatal ids as well.  Added dam/sire/conception to prenatal notification.  Added placeholders for empty data in the notifications.  Still need to fix issue with automated test.

* Updated category for ValidationSuiteNotification.  Restored original AnimalRequestNotification and added revamped version as AnimalRequestNotificationRevamp, revamped version also fixes error with the URL in the original version.  Updated TriggerScriptHelper.java calls to send animal request notification with check to verify notification service is active and specific notification is enabled.  Still need to write automated tests for AnimalRequestNotificationRevamp.

* Unmuted 2 automated test functions: uploadBillingDataAndVerify and updateEHRFormFrameworkTypes.

* Updated automated tests to call DeathNotificationRevamp instead of DeathNotification after renaming.

* Made changes suggested by the pull request comments.
* Updating postfix configuration for newer version

* Adding log file to postfix

* Fixing problems with postfix

* Updating MSSQL to use new driver

* Adding variable for printable URL

This adds a variable used to generate the URL for sending emails.

* Revert "Updating MSSQL to use new driver"

This reverts commit 092d9ad.

* Adding variable to compose and production yaml files

* Adding ; to the end of line

* Adding one more file

* Typo to the netrc file

* Removing tls for sending email via Labkey

* Removing supervisord from docker file

* Fixing problem with DNS from the postfix container

* Updating nginx and using secrets to access certs

* Using variable in the nginx configuration

* change extension of compose file
* Use current time for delete source, to always delete, update ETL timestamp column to fix null pointer

* Update jdbc driver for arrow connection
@github-actions github-actions bot merged commit ed16143 into release23.11 Jan 9, 2024
9 of 10 checks passed
@github-actions github-actions bot deleted the 23.11_ff_bot_23.11.4 branch January 9, 2024 20:24
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.

7 participants