Create unified slots service for CC Hybrid scheduling by JunTaoLuo · Pull Request #27602 · department-of-veterans-affairs/vets-api

JunTaoLuo · 2026-04-06T19:42:21Z

Keep your PR as a Draft until it's ready for Platform review. A PR is ready for Platform review when it has a teammate approval and tests, linting, and settings checks pass CI. See these tips on how to avoid common delays in getting your PR merged.

Summary

This work is behind a feature toggle (flipper): NO
(Summarize the changes that have been made to the platform)
Unified appointments experience

Related issue(s)

[BE] Create unified availability adapter, correct slot fetch chain and return normalized BaseSlot results va.gov-team#135755

Testing done

New code is covered by unit tests

What areas of the site does it impact?

Appointments

Acceptance criteria

I fixed|updated|added unit tests and integration tests for each feature (if applicable).
No error nor warning in the console.
Events are being sent to the appropriate logging solution
Documentation has been updated (link to documentation)
No sensitive information (i.e. PII/credentials/internal URLs/etc.) is captured in logging, hardcoded, or specs
Feature/bug has a monitor built into Datadog (if applicable)
If app impacted requires authentication, did you login to a local build and verify all authenticated routes work as expected
I added a screenshot of the developed feature

Replace facility-level from_lighthouse_facility with clinic construction from a Lighthouse facility plus a VAOS clinic payload.

After filtering Lighthouse facilities by referral category_of_care, fetch VAOS clinics per facility and build VAProvider with from_facility_and_clinic.

Add AvailabilityAdapter for VA clinic and EPS slot fetches.

JunTaoLuo · 2026-04-06T21:42:40Z

-              svc.to_s.downcase.gsub(/[\s_-]+/, '') == normalized
-            end
+          facilities.select do |facility|
+            eligibility_service.check_eligibility(


FYI I updated this section to use the eligibility checks instead since this is closer to the production behavior.

JunTaoLuo · 2026-04-06T21:57:36Z

-          providers = facilities.map { |f| VAOS::V2::Unified::VAProvider.from_lighthouse_facility(f) }
-          providers.each { |p| assign_distance(p, user_address) }
-          filter_va_by_category_of_care(providers, referral.category_of_care)
+          fetch_providers_for_facilities(facilities, referral, user_address)


Looking at the UX flow and guessing at how this service is to be used, we'll want to produce a list of VA providers which are clinics not facilities. There really isn't any use for raw VA facilities so I'm updating the logic here to:

check eligibility at each facility

fetch clinics at each eligible facility

PhilipDeFraties

left some in-line comments

JunTaoLuo

PR updated to address feedback.

lee-delarm6

Looks good, thanks for reviewing it first Phil as well

Copilot

Pull request overview

Adds a unified “slots” abstraction and updates unified provider search to return VA clinics (from VAOS) alongside EPS community care providers, aligning the unified appointments experience with CC Hybrid scheduling needs.

Changes:

Introduces VAOS::V2::Unified::SlotsService to fetch/normalize availability from VAOS (VA clinics) and EPS (community care).
Updates unified provider search to build VA providers from Lighthouse facilities + VAOS clinics and to filter VA facilities via direct-scheduling eligibility when the referral category maps to a VAOS service.
Updates unified provider model/serializer surface area (e.g., facility_name, removal of schedulable_services) and adjusts specs accordingly.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
modules/vaos/app/services/vaos/v2/unified/slots_service.rb	New unified slots fetcher for VAOS + EPS providers.
modules/vaos/spec/services/vaos/v2/unified/slots_service_spec.rb	Unit coverage for SlotsService behavior and parameter validation.
modules/vaos/app/services/vaos/v2/unified/provider_search_service.rb	VA search now returns clinic-level providers and adds eligibility-based facility filtering.
modules/vaos/spec/services/vaos/v2/unified/provider_search_service_spec.rb	Updates/expands provider search specs for clinic + eligibility behavior.
modules/vaos/app/services/vaos/v2/unified/eligibility_service.rb	Changes API to accept `facility_id:` keyword (vs provider object).
modules/vaos/spec/services/vaos/v2/unified/eligibility_service_spec.rb	Updates specs to match new EligibilityService signature.
modules/vaos/app/serializers/vaos/v2/unified_provider_serializer.rb	Adds `facilityName`, removes `schedulableServices`.
modules/vaos/spec/serializers/vaos/v2/unified_provider_serializer_spec.rb	Updates serializer expectations for new fields/shape.
modules/vaos/app/models/vaos/v2/unified/base_provider.rb	Adds `facility_name`, removes `schedulable_services`.
modules/vaos/app/models/vaos/v2/unified/va_provider.rb	VA provider now represents a clinic at a facility (`from_facility_and_clinic`).
modules/vaos/spec/models/vaos/v2/unified/va_provider_spec.rb	Updates VA provider factory expectations for clinic+facility composition.
modules/vaos/app/models/vaos/v2/unified/eps_provider.rb	Adds `appointment_types` and helper to select self-schedulable type id.
modules/vaos/spec/models/vaos/v2/unified/eps_provider_spec.rb	Adds coverage for `facility_name`, `appointment_types`, and selection helper.
modules/vaos/spec/controllers/v2/providers_controller_index_spec.rb	Updates controller spec fixtures for new provider attributes.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

PhilipDeFraties

small change to an error message, no other changes since last approval, still g2g

JunTaoLuo force-pushed the jtluo/cc-hybrid-unified-availability branch from 2964501 to 14616ab Compare April 6, 2026 19:43

VAOS: model VAProvider as a clinic with from_facility_and_clinic

30d8775

Replace facility-level from_lighthouse_facility with clinic construction from a Lighthouse facility plus a VAOS clinic payload.

JunTaoLuo force-pushed the jtluo/cc-hybrid-unified-availability branch from 14616ab to 30d8775 Compare April 6, 2026 19:46

VAOS: expand unified VA search to clinics via SystemsService

9bbc0cd

After filtering Lighthouse facilities by referral category_of_care, fetch VAOS clinics per facility and build VAProvider with from_facility_and_clinic.

JunTaoLuo commented Apr 6, 2026

View reviewed changes

Comment thread modules/vaos/app/models/vaos/v2/unified/va_provider.rb

github-actions Bot added the require-backend-approval label Apr 6, 2026

VAOS: add AvailabilityAdapter

762942d

Add AvailabilityAdapter for VA clinic and EPS slot fetches.

github-actions Bot added the test-failure label Apr 6, 2026

JunTaoLuo force-pushed the jtluo/cc-hybrid-unified-availability branch from 51d82e0 to 762942d Compare April 6, 2026 20:43

github-actions Bot removed the test-failure label Apr 6, 2026

JunTaoLuo commented Apr 6, 2026

View reviewed changes

Comment thread modules/vaos/app/services/vaos/v2/unified/slot_adapter.rb Outdated

JunTaoLuo added 2 commits April 6, 2026 17:33

Implement eligibility check

836c310

Remove unused attribute

7a6c052

github-actions Bot added the lint-failure label Apr 6, 2026

Cleanup eligibility service

4c2a17f

JunTaoLuo commented Apr 6, 2026

View reviewed changes

Comment thread modules/vaos/app/services/vaos/v2/unified/slots_service.rb

github-actions Bot added the test-failure label Apr 6, 2026

JunTaoLuo commented Apr 6, 2026

View reviewed changes

PhilipDeFraties reviewed Apr 7, 2026

View reviewed changes

Comment thread modules/vaos/app/services/vaos/v2/unified/slots_service.rb Outdated

PhilipDeFraties reviewed Apr 7, 2026

View reviewed changes

Comment thread modules/vaos/app/models/vaos/v2/unified/va_provider.rb Outdated

PhilipDeFraties reviewed Apr 7, 2026

View reviewed changes

JunTaoLuo changed the title ~~Create unified availability adapter~~ Create unified slots service for CC Hybrid scheduling Apr 7, 2026

PR feedback: renames and base provider fields

df3ed6c

JunTaoLuo commented Apr 7, 2026

View reviewed changes

Comment thread modules/vaos/app/models/vaos/v2/unified/eps_provider.rb

Comment thread modules/vaos/app/models/vaos/v2/unified/base_provider.rb

github-actions Bot removed the test-failure label Apr 7, 2026

JunTaoLuo added 2 commits April 7, 2026 13:29

Update method signature

7b6d00d

Extract appointment_type_id from provider

eff8e60

JunTaoLuo commented Apr 7, 2026

View reviewed changes

Comment thread modules/vaos/app/models/vaos/v2/unified/eps_provider.rb

Comment thread modules/vaos/app/services/vaos/v2/unified/slots_service.rb

Fix lint

77defde

github-actions Bot removed the lint-failure label Apr 7, 2026

PhilipDeFraties self-requested a review April 7, 2026 19:11

PhilipDeFraties previously approved these changes Apr 7, 2026

View reviewed changes

lee-delarm6 previously approved these changes Apr 7, 2026

View reviewed changes

lee-delarm6 marked this pull request as ready for review April 7, 2026 19:38

lee-delarm6 requested review from a team as code owners April 7, 2026 19:38

Copilot AI review requested due to automatic review settings April 7, 2026 19:38

lee-delarm6 enabled auto-merge (squash) April 7, 2026 19:38

Copilot started reviewing on behalf of lee-delarm6 April 7, 2026 19:39 View session

Copilot AI reviewed Apr 7, 2026

View reviewed changes

Update modules/vaos/app/services/vaos/v2/unified/slots_service.rb

aa5a76a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

JunTaoLuo dismissed stale reviews from lee-delarm6 and PhilipDeFraties via aa5a76a April 7, 2026 20:54

PhilipDeFraties self-requested a review April 7, 2026 21:20

PhilipDeFraties approved these changes Apr 7, 2026

View reviewed changes

lee-delarm6 approved these changes Apr 7, 2026

View reviewed changes

platform-support-slack-integration Bot mentioned this pull request Apr 8, 2026

Good Morning Platform! I'd like an expedited review of this ... department-of-veterans-affairs/va.gov-team#138881

Closed

stiehlrod approved these changes Apr 8, 2026

View reviewed changes

github-actions Bot removed the require-backend-approval label Apr 8, 2026

lee-delarm6 merged commit 97d7728 into master Apr 8, 2026
42 of 46 checks passed

lee-delarm6 deleted the jtluo/cc-hybrid-unified-availability branch April 8, 2026 14:27

Conversation

JunTaoLuo commented Apr 6, 2026

Summary

Related issue(s)

Testing done

What areas of the site does it impact?

Acceptance criteria

Uh oh!

Uh oh!

Uh oh!

JunTaoLuo Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JunTaoLuo Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

PhilipDeFraties left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JunTaoLuo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lee-delarm6 left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PhilipDeFraties left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants