adding merge functionality for eps to regular appointments #19754

lee-delarm6 · 2024-12-05T21:44:04Z

adding merge functionality for eps to regular appointments

Note: Delete the description statements, complete each step. None are optional, but can be justified as to why they cannot be completed as written. Provide known gaps to testing that may raise the risk of merging to production.

Summary

This work is behind a param
This change introduces EPS (Electronic Prescribing System) appointment integration into the VAOS (VA Online Scheduling) system.
Implementing EPS appointment normalization and merging functionality
Modifying appointment handling logic to incorporate EPS appointments
Cleaning up some code formatting and rubocop issues
The solution integrates EPS appointments with existing VAOS appointments by normalizing the EPS appointment data structure to match VAOS format and merging them while avoiding duplicates. This unified approach allows for consistent appointment handling across both systems.
Based on the code patterns and feature toggles present, this appears to be a gradual integration approach allowing for controlled rollout and testing.

Testing done

New code is covered by unit tests
New behavior: Both VAOS and EPS appointments are merged and displayed when the EPS include flag is present
Run this function with an without EPS appointments

What areas of the site does it impact?

VAOS (VA Online Scheduling) system, specifically:

Appointment retrieval and display
Configuration settings
Appointment service layer

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

adding merge functionality for eps to regular appointments

rubocop fixes

randomsync

I understand that this is a draft so just providing general feedback. There are other changes that would be needed to make sure the merged appointments are used in the rest of the controller method. Please add tests as well so it's easier to understand the changes and the desired effect.

modules/vaos/app/services/vaos/v2/appointments_service.rb

randomsync · 2024-12-09T22:59:54Z

modules/vaos/app/services/vaos/v2/appointments_service.rb

+      def calculate_end_time(start_time)
+        return nil unless start_time
+
+        Time.zone.parse(start_time) + 60.minutes


I believe this is going to use the timezone of the runtime, which might be different from the patient's timezone. And if that's the case and we're showing the start time in patient's timezone, the end time could be incorrect.

I'm using the start and end from the same data point though, shouldn't this match up? This is from where the method is entered:

start: appt.dig(:appointmentDetails, :start), end: calculate_end_time(appt.dig(:appointmentDetails, :start))

This timezone is in UTC we have found, so we will also inform the front end to change it to the user's time zone

modules/vaos/app/controllers/vaos/v2/appointments_controller.rb

modules/vaos/app/services/vaos/v2/appointments_service.rb

randomsync · 2024-12-09T23:09:16Z

modules/vaos/app/services/vaos/v2/appointments_service.rb

+        normalized_new = new_appointments[:appointments].map { |appt| normalize_eps_appointment(appt) }
+        basic_data = basic_appointments[:data].is_a?(Array) ? basic_appointments[:data] : [basic_appointments[:data]]
+        existing_ids = basic_data.to_set { |a| a[:referralId] }
+        merged_data = basic_data + normalized_new.reject { |a| existing_ids.include?(a[:referralId]) }


are we deduping by referralId?

Yes, just marking this as a confirmation

Could you please see if the vaos appointment data have referralId & is available under referralId key?

modules/vaos/app/controllers/vaos/v2/appointments_controller.rb

revert controller, move logic to service

update test

moved controller logic to service

dropping and fixing a few items with test and removing patient_id

removing unused function

update to master

fixes

more fixes

last fix

maybe last fix

Updated fix?

randomsync · 2024-12-17T23:07:05Z

@lee-delarm6 is this ready for review? there are no specs, and some of the other feedback is also un-addressed

kanchanasuriya · 2024-12-18T23:53:05Z

modules/vaos/app/services/vaos/v2/appointments_service.rb

+      def normalize_eps_appointment(appt)
+        {
+          id: appt[:id].to_s,
+          status: appt[:state] == 'submitted' ? 'booked' : 'proposed',
+          patientIcn: appt[:patientId],
+          created: appt.dig(:appointmentDetails, :lastRetrieved),
+          requestedPeriods: [
+            {
+              start: appt.dig(:appointmentDetails, :start),
+              end: calculate_end_time(appt.dig(:appointmentDetails, :start))
+            }
+          ].compact,
+          locationId: appt[:locationId],
+          clinic: appt[:clinic],
+          contact: appt[:contact]
+        }.compact
+      end


Please see if we can move this to a serializer for mapping the data to different fields for normalizing with vaos appointments

modules/vaos/app/services/vaos/v2/appointments_service.rb

kanchanasuriya · 2024-12-18T23:58:27Z

modules/vaos/app/services/vaos/v2/appointments_service.rb

+        normalized_new = new_appointments[:appointments].map { |appt| normalize_eps_appointment(appt) }
+        basic_data = basic_appointments[:data].is_a?(Array) ? basic_appointments[:data] : [basic_appointments[:data]]
+        existing_ids = basic_data.to_set { |a| a[:referralId] }
+        merged_data = basic_data + normalized_new.reject { |a| existing_ids.include?(a[:referralId]) }


Could you please see if the vaos appointment data have referralId & is available under referralId key?

modules/vaos/app/services/vaos/v2/appointments_service.rb

Fixed linting issues

Changing naming, removing empty line

Lint fixes again

Remove line

eps serializer

rubocop fix

adding merge functionality for eps to regular appointments

a7c7ab2

adding merge functionality for eps to regular appointments

lee-delarm6 requested review from randomsync and kanchanasuriya December 5, 2024 21:44

github-actions bot added the lint-failure label Dec 5, 2024

va-vfs-bot temporarily deployed to 96412_merge_eps_appointments/main/main December 5, 2024 21:49 Inactive

github-actions bot added the test-failure label Dec 5, 2024

rubocop fixes

7b9caa6

rubocop fixes

github-actions bot removed the lint-failure label Dec 5, 2024

va-vfs-bot temporarily deployed to 96412_merge_eps_appointments/main/main December 5, 2024 22:07 Inactive

randomsync requested changes Dec 9, 2024

View reviewed changes

lee-delarm6 added 5 commits December 12, 2024 11:24

revert controller, move logic to service

f9d0a36

revert controller, move logic to service

update test

0577b6e

update test

Merge branch 'master' into 96412_merge_eps_appointments

6401a1f

moved controller logic to service

a749327

moved controller logic to service

dropping and fixing a few items

36cbafd

dropping and fixing a few items with test and removing patient_id

github-actions bot added the lint-failure label Dec 12, 2024

removing unused function

170d535

removing unused function

github-actions bot added the audit-service-failure label Dec 12, 2024

va-vfs-bot temporarily deployed to 96412_merge_eps_appointments/main/main December 12, 2024 19:32 Inactive

lee-delarm6 added 2 commits December 12, 2024 15:14

update to master

8a362ce

update to master

fixes

c565abd

fixes

github-actions bot removed the audit-service-failure label Dec 12, 2024

lee-delarm6 added 3 commits December 12, 2024 15:20

more fixes

26804f8

more fixes

last fix

7631136

last fix

maybe last fix

fbde9be

maybe last fix

github-actions bot added test-passing test-failure and removed test-failure labels Dec 12, 2024

Updated fix?

3c9df3b

Updated fix?

github-actions bot removed the test-passing label Dec 12, 2024

va-vfs-bot temporarily deployed to 96412_merge_eps_appointments/main/main December 12, 2024 21:21 Inactive

lee-delarm6 marked this pull request as ready for review December 16, 2024 16:30

lee-delarm6 requested review from a team as code owners December 16, 2024 16:30

github-actions bot added the require-backend-approval label Dec 16, 2024

kanchanasuriya reviewed Dec 19, 2024

View reviewed changes

Fixed linting issues

5822040

Fixed linting issues

github-actions bot removed the lint-failure label Dec 19, 2024

va-vfs-bot requested a deployment to 96412_merge_eps_appointments/main/main December 19, 2024 14:00 Pending

Changing naming, removing empty line

91d4dbc

Changing naming, removing empty line

github-actions bot added lint-failure test-passing and removed test-failure labels Dec 19, 2024

Lint fixes again

a755e2d

Lint fixes again

github-actions bot added ready-for-backend-review and removed lint-failure labels Dec 19, 2024

Remove line

0b84443

Remove line

va-vfs-bot temporarily deployed to 96412_merge_eps_appointments/main/main December 20, 2024 11:08 Inactive

lee-delarm6 added 2 commits December 20, 2024 16:53

eps serializer

e7b6f30

eps serializer

rubocop fix

76b38cb

rubocop fix

github-actions bot added test-failure and removed test-passing ready-for-backend-review labels Dec 20, 2024

va-vfs-bot deployed to 96412_merge_eps_appointments/main/main December 21, 2024 00:06 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding merge functionality for eps to regular appointments #19754

adding merge functionality for eps to regular appointments #19754

lee-delarm6 commented Dec 5, 2024 •

edited

Loading

randomsync left a comment

randomsync Dec 9, 2024

lee-delarm6 Dec 12, 2024

lee-delarm6 Dec 19, 2024

randomsync Dec 9, 2024

lee-delarm6 Dec 12, 2024

kanchanasuriya Dec 18, 2024

randomsync commented Dec 17, 2024

kanchanasuriya Dec 18, 2024

kanchanasuriya Dec 18, 2024

adding merge functionality for eps to regular appointments #19754

Are you sure you want to change the base?

adding merge functionality for eps to regular appointments #19754

Conversation

lee-delarm6 commented Dec 5, 2024 • edited Loading

Summary

Testing done

What areas of the site does it impact?

Acceptance criteria

randomsync left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

randomsync commented Dec 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lee-delarm6 commented Dec 5, 2024 •

edited

Loading