adding merge functionality for eps to regular appointments

config/settings.yml

@@ -1837,4 +1837,5 @@ vaos:
     api_url: "https://api.wellhive.com"
     base_path: "care-navigation/v1"
     scopes: "care-nav"
+    fake_patient_id: "fake_patient_id"
 

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

@@ -21,14 +21,16 @@ class AppointmentsController < VAOS::BaseController
       COMMENT = 'comment'
 
       def index
-        appointments[:data].each do |appt|
+        merged_appointments = appointments_service.merge_appointments(eps_appointments, appointments)
+
+        merged_appointments.each do |appt|
           set_facility_error_msg(appt) if include_index_params[:facilities]
           scrape_appt_comments_and_log_details(appt, index_method_logging_name, PAP_COMPLIANCE_TELE)
           log_appt_creation_time(appt)
         end
 
         serializer = VAOS::V2::VAOSSerializer.new
-        serialized = serializer.serialize(appointments[:data], 'appointments')
+        serialized = serializer.serialize(merged_appointments, 'appointments')
 
         if !appointments[:meta][:failures]&.empty?
           StatsDMetric.new(key: STATSD_KEY).save
@@ -82,6 +84,11 @@ def appointments_service
           VAOS::V2::AppointmentsService.new(current_user)
       end
 
+      def eps_appointments_service
+        @eps_appointments_service ||=
+          Eps::AppointmentService.new(current_user)
+      end
+
       def mobile_facility_service
         @mobile_facility_service ||=
           VAOS::V2::MobileFacilityService.new(current_user)
@@ -92,6 +99,11 @@ def appointments
           appointments_service.get_appointments(start_date, end_date, statuses, pagination_params, include_index_params)
       end
 
+      def eps_appointments
+        @eps_appointments ||=
+          eps_appointments_service.get_appointments(patient_id: Settings.vaos.eps.fake_patient_id)
+      end
+
       def appointment
         @appointment ||=
           appointments_service.get_appointment(appointment_id, include_show_params)
@@ -261,6 +273,7 @@ def create_params
           )
         end
       end
+
       # rubocop:enable Metrics/MethodLength
 
       def start_date

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

@@ -204,6 +204,54 @@ def get_facility_timezone_memoized(facility_location_id)
         facility_info[:timezone]&.[](:time_zone_id)
       end
 
+      def normalize_eps_appointment(appt)
+        {
+          id: appt[:id].to_s,
+          status: map_state_to_status(appt[:state]),
+          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
+
+      # rubocop:disable Lint/DuplicateBranch
+      def map_state_to_status(state)
+        case state&.downcase
+        when 'draft'
+          'proposed'
+        when 'submitted'
+          'booked'
+        else
+          'proposed'
+        end
+      end
+
+      # rubocop:enable Lint/DuplicateBranch
+
+      def calculate_end_time(start_time)
+        return nil unless start_time
+
+        Time.zone.parse(start_time) + 60.minutes
+      end
+
+      def merge_appointments(new_appointments, basic_appointments)
+        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]) }
+        sorted_data = merged_data.sort_by { |appt| appt.dig(:requestedPeriods, 0, :start) || '' }
+
+        { data: sorted_data }
+      end
+
       memoize :get_facility_timezone_memoized
 
       private
@@ -234,6 +282,7 @@ def parse_possible_token_related_errors(e)
           { message:, status:, icn: sanitized_icn, context: }
         end
       end
+
       # rubocop:enable Metrics/MethodLength
 
       # Modifies the appointment, extracting individual fields from the appointment. This currently includes: