Skip to content

Commit abc24c2

Browse files
authored
Merge branch 'master' into vi-1179
2 parents db74626 + 92d6960 commit abc24c2

File tree

417 files changed

+25466
-6702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+25466
-6702
lines changed

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ app/controllers/concerns/pdf_s3_operations.rb @department-of-veterans-affairs/ba
3636
app/controllers/concerns/sign_in @department-of-veterans-affairs/octo-identity
3737
app/controllers/concerns/third_party_transaction_logging.rb @department-of-veterans-affairs/backend-review-group
3838
app/controllers/concerns/traceable.rb @department-of-veterans-affairs/backend-review-group
39+
app/controllers/concerns/tooltips.rb @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
3940
app/controllers/concerns/vet360 @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
4041
app/controllers/flipper_controller.rb @department-of-veterans-affairs/backend-review-group
4142
app/controllers/gids_controller.rb @department-of-veterans-affairs/backend-review-group
@@ -104,6 +105,7 @@ app/controllers/v0/id_card_announcement_subscription_controller.rb @department-o
104105
app/controllers/v0/id_card_attributes_controller.rb @department-of-veterans-affairs/backend-review-group
105106
app/controllers/v0/in_progress_forms_controller.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/benefits-dependents-management
106107
app/controllers/v0/intent_to_files_controller.rb @department-of-veterans-affairs/disability-benefits @department-of-veterans-affairs/benefits-lifestage @department-of-veterans-affairs/pensions @department-of-veterans-affairs/backend-review-group
108+
app/controllers/v0/intents_to_file_controller.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/backend-review-group
107109
app/controllers/v0/letters_discrepancy_controller.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/backend-review-group
108110
app/controllers/v0/letters_generator_controller.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/backend-review-group
109111
app/controllers/v0/maintenance_windows_controller.rb @department-of-veterans-affairs/backend-review-group
@@ -118,6 +120,7 @@ app/controllers/v0/onsite_notifications_controller.rb @department-of-veterans-af
118120
app/controllers/v0/open_api_controller.rb @department-of-veterans-affairs/backend-review-group
119121
app/controllers/v0/preneeds @department-of-veterans-affairs/bah-mbs-selfserv @department-of-veterans-affairs/backend-review-group
120122
app/controllers/v0/profile @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
123+
app/controllers/v0/profile/contact_informations_controller.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
121124
app/controllers/v0/profile/contacts_controller.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
122125
app/controllers/v0/profile/payment_history_controller.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/vsa-debt-resolution @department-of-veterans-affairs/backend-review-group
123126
app/controllers/v0/profile/vet_verification_statuses_controller.rb @department-of-veterans-affairs/va-core-veteran-experiences @department-of-veterans-affairs/backend-review-group
@@ -204,6 +207,7 @@ app/models/concerns/pension_award_helper.rb @department-of-veterans-affairs/bene
204207
app/models/concerns/redis_caching.rb @department-of-veterans-affairs/backend-review-group
205208
app/models/concerns/redis_form.rb @department-of-veterans-affairs/backend-review-group
206209
app/models/concerns/set_guid.rb @department-of-veterans-affairs/backend-review-group
210+
app/models/concerns/signature_required.rb @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
207211
app/models/concerns/temp_form_validation.rb @department-of-veterans-affairs/backend-review-group
208212
app/models/datadog_metrics.rb @department-of-veterans-affairs/backend-review-group
209213
app/models/decision_review_evidence_attachment.rb @department-of-veterans-affairs/benefits-decision-reviews-be @department-of-veterans-affairs/backend-review-group
@@ -313,6 +317,7 @@ app/models/rate_limited_search.rb @department-of-veterans-affairs/backend-review
313317
app/models/saml_request_tracker.rb @department-of-veterans-affairs/octo-identity
314318
app/models/saved_claim.rb @department-of-veterans-affairs/backend-review-group
315319
app/models/saved_claim_group.rb @department-of-veterans-affairs/benefits-lifestage @department-of-veterans-affairs/dependents-benefits @department-of-veterans-affairs/backend-review-group
320+
app/models/saved_claim/coe_claim.rb @department-of-veterans-affairs/va-core-veteran-experiences @department-of-veterans-affairs/backend-review-group
316321
app/models/saved_claim/dependency_claim.rb @department-of-veterans-affairs/backend-review-group
317322
app/models/saved_claim/disability_compensation.rb @department-of-veterans-affairs/disability-benefits @department-of-veterans-affairs/backend-review-group
318323
app/models/saved_claim/education_benefits.rb @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/backend-review-group
@@ -408,6 +413,7 @@ app/serializers/backend_statuses_serializer.rb @department-of-veterans-affairs/b
408413
app/serializers/benefits_intake_submission_serializer.rb @department-of-veterans-affairs/benefits-dependents-management @department-of-veterans-affairs/backend-review-group
409414
app/serializers/cemetery_serializer.rb @department-of-veterans-affairs/bah-mbs-selfserv @department-of-veterans-affairs/backend-review-group
410415
app/serializers/communication_groups_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
416+
app/serializers/contact_information_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
411417
app/serializers/contact_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
412418
app/serializers/decision_review_evidence_attachment_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
413419
app/serializers/dependents_serializer.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
@@ -621,6 +627,7 @@ app/swagger/swagger/requests/hca_attachments.rb @department-of-veterans-affairs/
621627
app/swagger/swagger/requests/health_care_applications.rb @department-of-veterans-affairs/health-apps-backend @department-of-veterans-affairs/backend-review-group
622628
app/swagger/swagger/requests/in_progress_forms.rb @department-of-veterans-affairs/backend-review-group
623629
app/swagger/swagger/requests/intent_to_file.rb @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/disability-benefits
630+
app/swagger/swagger/requests/intents_to_file.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/backend-review-group
624631
app/swagger/swagger/requests/maintenance_windows.rb @department-of-veterans-affairs/backend-review-group
625632
app/swagger/swagger/requests/mdot @department-of-veterans-affairs/va-cto-health-products @department-of-veterans-affairs/backend-review-group
626633
app/swagger/swagger/requests/medical_copays.rb @department-of-veterans-affairs/vsa-debt-resolution @department-of-veterans-affairs/backend-review-group
@@ -1904,6 +1911,7 @@ spec/models/veteran_enrollment_system/form1095_b/form1095_b_spec.rb @department-
19041911
spec/models/veteran_onboarding_spec.rb @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-core-veteran-experiences
19051912
spec/models/concerns/ibm_data_dictionary_spec.rb @department-of-veterans-affairs/benefits-optimization-aquia @department-of-veterans-affairs/backend-review-group
19061913
spec/models/concerns/pension_award_helper_spec.rb @department-of-veterans-affairs/benefits-dependents-management @department-of-veterans-affairs/backend-review-group
1914+
spec/models/concerns/signature_required_spec.rb @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
19071915
spec/policies/appeals_policy_spec.rb @department-of-veterans-affairs/backend-review-group
19081916
spec/policies/bgs_policy_spec.rb @department-of-veterans-affairs/benefits-dependents-management @department-of-veterans-affairs/backend-review-group
19091917
spec/policies/coe_policy_spec.rb @department-of-veterans-affairs/benefits-non-disability @department-of-veterans-affairs/backend-review-group
@@ -1984,6 +1992,7 @@ spec/requests/v0/id_card/attributes_spec.rb @department-of-veterans-affairs/back
19841992
spec/requests/v0/in_progress_forms_controller_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
19851993
spec/requests/v0/in_progress_forms/5655_spec.rb @department-of-veterans-affairs/vsa-debt-resolution @department-of-veterans-affairs/backend-review-group
19861994
spec/requests/v0/intent_to_file_spec.rb @department-of-veterans-affairs/disability-benefits @department-of-veterans-affairs/benefits-lifestage @department-of-veterans-affairs/pensions @department-of-veterans-affairs/backend-review-group
1995+
spec/requests/v0/intents_to_file_spec.rb @department-of-veterans-affairs/benefits-management-tools-be @department-of-veterans-affairs/backend-review-group
19871996
spec/requests/v0/maintenance_windows_spec.rb @department-of-veterans-affairs/backend-review-group
19881997
spec/requests/v0/map_services_spec.rb @department-of-veterans-affairs/octo-identity
19891998
spec/requests/v0/medical_copays_spec.rb @department-of-veterans-affairs/vsa-debt-resolution @department-of-veterans-affairs/backend-review-group
@@ -2027,6 +2036,7 @@ spec/serializers/benefits_intake_submission_serializer_spec.rb @department-of-ve
20272036
spec/serializers/cemetery_serializer_spec.rb @department-of-veterans-affairs/bah-mbs-selfserv @department-of-veterans-affairs/backend-review-group
20282037
spec/serializers/central_mail_submission_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
20292038
spec/serializers/communication_groups_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
2039+
spec/serializers/contact_information_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
20302040
spec/serializers/contact_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/vfs-mhv-integration @department-of-veterans-affairs/backend-review-group
20312041
spec/serializers/decision_review_evidence_attachment_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group
20322042
spec/serializers/dependents_serializer_spec.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/backend-review-group

.github/instructions/my-health-messaging.instructions.md

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
applyTo: "modules/my_health/app/controllers/my_health/sm_controller.rb,modules/my_health/app/controllers/my_health/v1/messages_controller.rb,modules/my_health/app/controllers/my_health/v1/message_drafts_controller.rb,modules/my_health/app/controllers/my_health/v1/folders_controller.rb,modules/my_health/app/controllers/my_health/v1/threads_controller.rb,modules/my_health/app/controllers/my_health/v1/triage_teams_controller.rb,modules/my_health/app/controllers/my_health/v1/all_triage_teams_controller.rb,modules/my_health/app/controllers/my_health/v1/attachments_controller.rb,modules/my_health/app/controllers/my_health/v1/messaging_preferences_controller.rb,modules/my_health/app/serializers/my_health/v1/message_serializer.rb,modules/my_health/app/serializers/my_health/v1/messages_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_details_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_draft_serializer.rb,modules/my_health/app/serializers/my_health/v1/folder_serializer.rb,modules/my_health/app/serializers/my_health/v1/triage_team_serializer.rb,modules/my_health/app/serializers/my_health/v1/all_triage_teams_serializer.rb,modules/my_health/app/serializers/my_health/v1/attachment_serializer.rb,modules/my_health/app/serializers/my_health/v1/category_serializer.rb,modules/my_health/app/serializers/my_health/v1/messaging_preference_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_signature_serializer.rb,modules/my_health/app/serializers/my_health/v1/threads_serializer.rb,modules/my_health/config/routes.rb,modules/my_health/spec/requests/my_health/v1/messaging/**/*,lib/sm/**/*,app/models/message.rb,app/models/message_draft.rb,app/models/folder.rb,app/models/attachment.rb,app/models/triage_team.rb,app/models/message_search.rb,app/models/messaging_preference.rb,app/models/messaging_signature.rb,app/policies/mhv_messaging_policy.rb,spec/models/message*,spec/lib/sm/**/*"
2+
applyTo: "modules/my_health/app/controllers/my_health/sm_controller.rb,modules/my_health/app/controllers/my_health/v1/messages_controller.rb,modules/my_health/app/controllers/my_health/v1/message_drafts_controller.rb,modules/my_health/app/controllers/my_health/v1/folders_controller.rb,modules/my_health/app/controllers/my_health/v1/threads_controller.rb,modules/my_health/app/controllers/my_health/v1/triage_teams_controller.rb,modules/my_health/app/controllers/my_health/v1/all_triage_teams_controller.rb,modules/my_health/app/controllers/my_health/v1/attachments_controller.rb,modules/my_health/app/controllers/my_health/v1/messaging_preferences_controller.rb,modules/my_health/app/serializers/my_health/v1/message_serializer.rb,modules/my_health/app/serializers/my_health/v1/messages_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_details_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_draft_serializer.rb,modules/my_health/app/serializers/my_health/v1/folder_serializer.rb,modules/my_health/app/serializers/my_health/v1/triage_team_serializer.rb,modules/my_health/app/serializers/my_health/v1/all_triage_teams_serializer.rb,modules/my_health/app/serializers/my_health/v1/attachment_serializer.rb,modules/my_health/app/serializers/my_health/v1/category_serializer.rb,modules/my_health/app/serializers/my_health/v1/messaging_preference_serializer.rb,modules/my_health/app/serializers/my_health/v1/message_signature_serializer.rb,modules/my_health/app/serializers/my_health/v1/threads_serializer.rb,modules/my_health/config/routes.rb,modules/my_health/spec/requests/my_health/v1/messaging/**/*,lib/sm/**/*,app/models/message.rb,app/models/message_draft.rb,app/models/folder.rb,app/models/attachment.rb,app/models/triage_team.rb,app/models/all_triage_teams.rb,app/models/concerns/signature_required.rb,app/models/message_search.rb,app/models/messaging_preference.rb,app/models/messaging_signature.rb,app/policies/mhv_messaging_policy.rb,spec/models/message*,spec/models/triage_team*,spec/models/all_triage_teams*,spec/models/concerns/signature_required*,spec/lib/sm/**/*,modules/mobile/app/serializers/mobile/v0/triage_team_serializer.rb,modules/mobile/app/serializers/mobile/v0/all_triage_teams_serializer.rb"
33
---
44

55
# Copilot Instructions for My Health / Secure Messaging
@@ -789,6 +789,59 @@ The SM::Client automatically tracks:
789789

790790
---
791791

792+
## ⚠️ Adding Attributes to Triage Team Models
793+
794+
### Cross-Module Impact
795+
Triage team models (`TriageTeam`, `AllTriageTeams`) are shared between the **My Health** and **Mobile** modules. Each module has its own serializers, JSON schemas, and OpenAPI docs. Adding a new attribute requires updating files in **both** modules.
796+
797+
### Checklist
798+
When adding a new attribute to triage team API responses, update **all** of the following:
799+
800+
**Models (shared):**
801+
- `app/models/triage_team.rb` — add attribute or concern
802+
- `app/models/all_triage_teams.rb` — add attribute or concern
803+
804+
**MyHealth Serializers:**
805+
- `modules/my_health/app/serializers/my_health/v1/triage_team_serializer.rb`
806+
- `modules/my_health/app/serializers/my_health/v1/all_triage_teams_serializer.rb`
807+
808+
**Mobile Serializers:**
809+
- `modules/mobile/app/serializers/mobile/v0/triage_team_serializer.rb`
810+
- `modules/mobile/app/serializers/mobile/v0/all_triage_teams_serializer.rb`
811+
812+
**JSON Schemas (snake_case) — used by `match_response_schema` with `strict: true`:**
813+
- `spec/support/schemas/triage_team.json` (singular — attributes definition)
814+
- `spec/support/schemas/all_triage_team.json` (singular — attributes definition)
815+
- `spec/support/schemas/my_health/messaging/v1/triage_team.json`
816+
- `spec/support/schemas/my_health/messaging/v1/all_triage_team.json`
817+
818+
**JSON Schemas (camelized) — used by `match_camelized_response_schema`:**
819+
- `spec/support/schemas_camelized/triage_team.json`
820+
- `spec/support/schemas_camelized/all_triage_team.json`
821+
- `spec/support/schemas_camelized/my_health/messaging/v1/triage_team.json`
822+
- `spec/support/schemas_camelized/my_health/messaging/v1/all_triage_team.json`
823+
824+
**OpenAPI Docs:**
825+
- `modules/mobile/docs/schemas/SecureMessagingRecipients.yml`
826+
- `modules/mobile/docs/schemas/SecureMessagingAllRecipients.yml`
827+
- `modules/my_health/docs/schemas/TriageGroup.yml`
828+
829+
**Specs:**
830+
- `spec/models/triage_team_spec.rb`
831+
- `spec/models/all_triage_teams_spec.rb`
832+
- `modules/my_health/spec/serializer/v1/triage_teams_serializer_spec.rb`
833+
- `modules/my_health/spec/serializer/v1/all_triage_teams_serializer_spec.rb`
834+
- `modules/mobile/spec/serializers/mobile/v0/triage_team_spec.rb`
835+
836+
**Plural wrapper schemas** (`triage_teams.json`, `all_triage_teams.json`) use `$ref` to the singular schemas, so they don't need direct updates.
837+
838+
### Camelized Schema Warning
839+
**Do NOT blindly run `rake camelize_file:schema` on `all_triage_team`.** The top-level `all_triage_team.json` schemas have **different field sets** between snake_case and camelized versions because the mobile serializer exposes fewer fields than the my_health serializer. The rake task regenerates from the snake_case source and will **corrupt** the camelized schema by adding/removing fields. Instead, manually add the new camelized property to the camelized schema files.
840+
841+
The `triage_team.json` schemas (singular, for the simpler TriageTeam model) are safe to regenerate with the rake task since both versions have the same fields.
842+
843+
---
844+
792845
## 📖 Additional Resources
793846

794847
For general vets-api patterns and guidelines, see:

.github/workflows/code_checks.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,23 @@ jobs:
5858
with:
5959
bundler-cache: true
6060

61+
- name: Check for Gemfile changes
62+
id: gemfile_changes
63+
if: github.event_name == 'pull_request'
64+
uses: tj-actions/changed-files@v47.0.4
65+
with:
66+
files: |
67+
Gemfile
68+
Gemfile.lock
69+
modules/*/Gemfile
70+
6171
- name: Run bundle-audit (checks gems for CVE issues)
6272
id: bundle_audit
73+
if: |
74+
(
75+
github.ref == 'refs/heads/master' ||
76+
(github.event_name == 'pull_request' && steps.gemfile_changes.outputs.any_changed == 'true')
77+
)
6378
continue-on-error: true
6479
run: bundle exec bundle-audit check --update
6580

@@ -99,7 +114,12 @@ jobs:
99114
env_variable_name: SLACK_BOT_TOKEN
100115

101116
- name: Slack notify - bundle-audit CVE failure
102-
if: steps.bundle_audit.outcome == 'failure'
117+
if: |
118+
steps.bundle_audit.outcome == 'failure' &&
119+
(
120+
github.ref == 'refs/heads/master' ||
121+
(github.event_name == 'pull_request' && steps.gemfile_changes.outputs.any_changed == 'true')
122+
)
103123
uses: ./.github/actions/vsp-github-actions/slack-socket
104124
with:
105125
slack_app_token: ${{ env.SLACK_APP_TOKEN }}

0 commit comments

Comments
 (0)