incorporate enhancements for extensibility#875
Merged
josdem merged 3 commits intoMay 27, 2026
Conversation
Merged
khawaja-abdullah
changed the title
josdem
approved these changes
May 27, 2026
josdem
left a comment
josdem
left a comment
Owner
There was a problem hiding this comment.
Hi @khawaja-abdullah ; I like this solution, looks cleaner and easy to maintain, thanks for improving our code 👍
Contributor
There was a problem hiding this comment.
Pull request overview
This PR extends the vaccination “next vaccine” logic to support generating multiple follow-up vaccines from a single applied vaccine (notably TRICAT → TRICAT_BOOST and FeLV), and updates the associated unit tests accordingly.
Changes:
- Refactored next-vaccine configuration to allow multiple next vaccines (with offsets) per applied vaccine.
- Moved FeLV creation into
validateNextVaccinesflow and expanded criteria handling inisSpecificCriteriaSatisfiedForApplyingNextVaccine. - Updated/added tests for FeLV creation and non-creation scenarios.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/main/java/com/josdem/vetlog/helper/VaccinationHelper.java | Refactors next-vaccine mapping to support multiple follow-ups (TRICAT → TRICAT_BOOST + FeLV) and updates criteria logic. |
| src/test/java/com/josdem/vetlog/helper/VaccinationHelperTest.kt | Renames/adjusts tests and adds coverage for FeLV generation and suppression. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+115
to
+121
| } else if (TRICAT_VACCINE.equalsIgnoreCase(appliedName) && FELV_VACCINE.equalsIgnoreCase(nextName)) { | ||
| return Optional.ofNullable(pet) | ||
| .map(Pet::getBreed) | ||
| .map(Breed::getType) | ||
| .filter(PetType.CAT::equals) | ||
| .flatMap(type -> Optional.ofNullable(pet.getGoingOutOften())) | ||
| .orElse(false); |
Collaborator
Author
Owner
There was a problem hiding this comment.
Yes, however; do not worry, I asked copilot to address this for us, it did it here: #876
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
josdem
added a commit
that referenced
this pull request
May 28, 2026
* #847 Adding logic to create FeLV vaccination record * #847 Adding expected tests * #847 Setting release version :) * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * incorporate enhancements for extensibility (#875) * enhancements proposed for extensibility * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * address review feedback --------- Co-authored-by: Jose Morales <joseluis.delacruz@gmail.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Add 16-month age gate to FeLV eligibility after TRICAT (#876) * Initial plan * fix: require age check for FeLV eligibility --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Jose Morales <joseluis.delacruz@gmail.com> * #847 Fixing tests * #847 Applying suggestions --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Khawaja Abdullah Ansar <khawaja.abdullah.ansar@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
This file contains hidden or 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
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.
Extension to #874