107600 update eps appt show endpoint response (#21780)

* update model to include is_latest and last_retrieved attrs

* update eps appts serializer as per requested format and content from FE

* update eps appt show endpoint

needed to pass referral object into the serializer

* remove old model

no longer needed

* rubocop fixes

* update model to take additional parameters to ingest and expose attributes for serialization

* update serializer to utilize updated object paremeter now wrapped by singular model

* update controller to utilize updated appointment model and serializer

* revert var names to cut down on LOC

* re-add model and spec to cut down on LOC, will remove in separate PR

* rubocop fix

* update req spec

* revert var names to cut down on LOC

* remove comment

* revert changes for LOC, will clean up in separate pr

Author: PhilipDeFraties

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

@@ -11,21 +11,29 @@ def show
 
         raise Common::Exceptions::RecordNotFound, message: 'Record not found' if appointment[:state] == 'draft'
 
-        referral_detail = fetch_referral_detail(appointment)
-        provider = fetch_provider(appointment)
-        enriched_provider = Eps::EnrichedProvider.from_referral(provider, referral_detail)
-
-        response = OpenStruct.new(
-          id: appointment[:id],
-          appointment:,
-          provider: enriched_provider
-        )
-
-        render json: Eps::EpsAppointmentSerializer.new(response)
+        response_object = assemble_appt_response_object(appointment)
+        render json: response_object
       end
 
       private
 
+      ##
+      # Assembles a structured response object for an EPS appointment by:
+      # 1. Fetching referral details if a referral number exists
+      # 2. Fetching provider information if a provider service ID exists
+      # 3. Creating a comprehensive EpsAppointment object with all related data
+      # 4. Serializing the appointment object
+      #
+      # @param appointment_data [Hash] Raw appointment data from the EPS service
+      # @return [Eps::EpsAppointmentSerializer] Serialized appointment with referral and provider data
+      def assemble_appt_response_object(appointment_data)
+        referral_detail = fetch_referral_detail(appointment_data)
+        provider = fetch_provider(appointment_data)
+        eps_appointment = VAOS::V2::EpsAppointment.new(appointment_data, referral_detail, provider)
+
+        Eps::EpsAppointmentSerializer.new(eps_appointment)
+      end
+
       ##
       # Retrieves referral details from CCRA service for the given appointment if a referral number is present.
       #

modules/vaos/app/models/vaos/v2/eps_appointment.rb

@@ -3,22 +3,34 @@
 module VAOS
   module V2
     class EpsAppointment
-      def initialize(params = {})
-        appointment_details = params[:appointment_details]
-        referral_details = params[:referral]
+      attr_reader :id, :status, :patient_icn, :created, :location_id, :clinic,
+                  :start, :is_latest, :last_retrieved, :contact, :referral_id,
+                  :referral, :provider_service_id, :provider_name,
+                  :provider, :type_of_care, :referral_phone_number
 
-        @id = params[:id]&.to_s
-        @status = appointment_details[:status]
-        @patient_icn = params[:patient_id]
+      def initialize(appointment_data = {}, referral_detail = nil, provider = nil)
+        appointment_details = appointment_data[:appointment_details]
+        referral_details = appointment_data[:referral]
+
+        @id = appointment_data[:id]&.to_s
+        @status = determine_status(appointment_details[:status])
+        @patient_icn = appointment_data[:patient_id]
         @created = appointment_details[:last_retrieved]
-        @location_id = params[:network_id]
-        @clinic = params[:provider_service_id]
-        @start = params.dig(:appointment_details, :start)
-        @contact = params[:contact]
+        @location_id = appointment_data[:network_id]
+        @clinic = appointment_data[:provider_service_id]
+        @start = appointment_data.dig(:appointment_details, :start)
+        @is_latest = appointment_data.dig(:appointment_details, :is_latest)
+        @last_retrieved = appointment_data.dig(:appointment_details, :last_retrieved)
+        @contact = appointment_data[:contact]
         @referral_id = referral_details[:referral_number]
         @referral = { referral_number: referral_details[:referral_number]&.to_s }
-        @provider_service_id = params[:provider_service_id]
-        @provider_name = params.dig(:provider, :name).presence || 'unknown'
+        @provider_service_id = appointment_data[:provider_service_id]
+        @provider_name = appointment_data.dig(:provider, :name).presence || 'unknown'
+
+        @type_of_care = referral_detail&.category_of_care
+        @referral_phone_number = referral_detail&.phone_number
+
+        @provider = provider
       end
 
       def serializable_hash
@@ -38,6 +50,21 @@ def serializable_hash
         }.compact
       end
 
+      # Provide proper encapsulation of provider data
+      def provider_details
+        return nil if provider.nil?
+
+        {
+          id: provider.id,
+          name: provider.name,
+          is_active: provider.is_active,
+          organization: provider.provider_organization,
+          location: provider.location,
+          network_ids: provider.network_ids,
+          phone_number: referral_phone_number
+        }.compact
+      end
+
       private
 
       def determine_status(status)

modules/vaos/app/serializers/eps/eps_appointment_serializer.rb

@@ -4,30 +4,25 @@ module Eps
   class EpsAppointmentSerializer
     include JSONAPI::Serializer
 
-    attribute :appointment do |object|
-      next if object.appointment.nil?
+    attribute :id, &:id
 
-      VAOS::V2::EpsAppointment.new(object.appointment).serializable_hash
-    end
+    attribute :status, &:status
+
+    attribute :start, &:start
+
+    attribute :type_of_care, &:type_of_care
 
-    attribute :provider do |object|
-      next if object.provider.nil?
-
-      {
-        id: object.provider.id,
-        name: object.provider.name,
-        is_active: object.provider.is_active,
-        individual_providers: object.provider.individual_providers,
-        provider_organization: object.provider.provider_organization,
-        location: object.provider.location,
-        network_ids: object.provider.network_ids,
-        scheduling_notes: object.provider.scheduling_notes,
-        appointment_types: object.provider.appointment_types,
-        specialties: object.provider.specialties,
-        visit_mode: object.provider.visit_mode,
-        features: object.provider.features,
-        phone_number: object.provider.phone_number
-      }.compact
+    attribute :is_latest, &:is_latest
+
+    attribute :last_retrieved, &:last_retrieved
+
+    attribute :modality do |_object|
+      # NOTE: this is intentionally hardcoded for now for prototype,
+      # will be updated once confirmed that the data will be available
+      # from the referral object
+      'OV'
     end
+
+    attribute :provider, &:provider_details
   end
 end

modules/vaos/spec/requests/vaos/v2/eps_appointments_spec.rb

@@ -42,57 +42,26 @@
             'id' => 'qdm61cJ5',
             'type' => 'eps_appointment',
             'attributes' => {
-              'appointment' => {
-                'id' => 'qdm61cJ5',
-                'status' => 'booked',
-                'patientIcn' => 'care-nav-patient-casey',
-                'created' => '2025-02-10T14:35:44Z',
-                'locationId' => 'sandbox-network-5vuTac8v',
-                'clinic' => 'Aq7wgAux',
-                'start' => '2024-11-21T18:00:00Z',
-                'referralId' => '12345',
-                'referral' => { 'referralNumber' => '12345' },
-                'providerServiceId' => 'Aq7wgAux',
-                'providerName' => 'unknown'
-              },
+              'id' => 'qdm61cJ5',
+              'status' => 'booked',
+              'start' => '2024-11-21T18:00:00Z',
+              'typeOfCare' => nil,
+              'isLatest' => true,
+              'lastRetrieved' => '2025-02-10T14:35:44Z',
+              'modality' => 'OV',
               'provider' => {
                 'id' => 'test-provider-id',
                 'name' => 'Timothy Bob',
                 'isActive' => true,
-                'individualProviders' => [
-                  {
-                    'name' => 'Timothy Bob', 'npi' => 'test-npi'
-                  }
-                ],
-                'providerOrganization' => {
-                  'name' => 'test-provider-org-name'
-                },
+                'organization' => { 'name' => 'test-provider-org-name' },
                 'location' => {
                   'name' => 'Test Medical Complex',
                   'address' => '207 Davishill Ln',
                   'latitude' => 33.058736,
                   'longitude' => -80.032819,
                   'timezone' => 'America/New_York'
                 },
-                'networkIds' => [
-                  'sandbox-network-test'
-                ],
-                'schedulingNotes' => 'New patients need to send their previous records to the office prior to their' \
-                                     ' appt.',
-                'appointmentTypes' => [
-                  {
-                    'id' => 'off',
-                    'name' => 'Office Visit',
-                    'isSelfSchedulable' => true
-                  }
-                ],
-                'specialties' => [
-                  {
-                    'id' => 'test-id',
-                    'name' => 'Urology'
-                  }
-                ],
-                'visitMode' => 'phone'
+                'networkIds' => ['sandbox-network-test']
               }
             }
           }