-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into pensions-80659-schemaupdate
- Loading branch information
Showing
9 changed files
with
343 additions
and
6 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
db/migrate/20240411152758_drop_data_in_personal_information_log.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| class DropDataInPersonalInformationLog < ActiveRecord::Migration[7.1] | ||
| def change | ||
| safety_assured { remove_column :personal_information_logs, :data, :jsonb } | ||
| end | ||
| end |
33 changes: 33 additions & 0 deletions
33
db/migrate/20240411160306_create_accredited_organizations.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class CreateAccreditedOrganizations < ActiveRecord::Migration[7.1] | ||
| def change | ||
| create_table :accredited_organizations, id: :uuid do |t| | ||
| t.uuid :ogc_id, null: false | ||
| t.string :poa_code, limit: 3, null: false, index: { unique: true } | ||
| t.string :name, index: true | ||
| t.string :phone | ||
| t.string :address_type | ||
| t.string :address_line1 | ||
| t.string :address_line2 | ||
| t.string :address_line3 | ||
| t.string :city | ||
| t.string :country_code_iso3 | ||
| t.string :country_name | ||
| t.string :county_name | ||
| t.string :county_code | ||
| t.string :international_postal_code | ||
| t.string :province | ||
| t.string :state_code | ||
| t.string :zip_code | ||
| t.string :zip_suffix | ||
| t.jsonb :raw_address | ||
| t.float :lat | ||
| t.float :long | ||
| t.geography :location, limit: { srid: 4326, type: 'st_point', geographic: true } | ||
| t.timestamps | ||
|
|
||
| t.index :location, using: :gist | ||
| end | ||
| end | ||
| end |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
modules/check_in/app/serializers/check_in/vaos/vaos_appointment_data_serializer.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| module CheckIn | ||
| module VAOS | ||
| class VAOSAppointmentDataSerializer | ||
| include JSONAPI::Serializer | ||
|
|
||
| keys_to_serialize = %i[id identifier kind status serviceType locationId clinic start end extension] | ||
|
|
||
| set_id(&:id) | ||
|
|
||
| attribute :appointments do |object| | ||
| object.data.map do |data| | ||
| data.select { |key| keys_to_serialize.include?(key) } | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end |
249 changes: 249 additions & 0 deletions
249
modules/check_in/spec/serializers/vaos/vaos_appointment_data_serializer_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,249 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require 'rails_helper' | ||
|
|
||
| RSpec.describe CheckIn::VAOS::VAOSAppointmentDataSerializer do | ||
| subject { described_class } | ||
|
|
||
| let(:vaos_appointment_data) do | ||
| { | ||
| data: [ | ||
| { | ||
| id: '180765', | ||
| identifier: [ | ||
| { | ||
| system: 'Appointment/', | ||
| value: '413938333130383735' | ||
| }, | ||
| { | ||
| system: 'http://www.va.gov/Terminology/VistADefinedTerms/409_84', | ||
| value: '983:10875' | ||
| } | ||
| ], | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| patientIcn: '1013125218V696863', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-06T16:00:00Z', | ||
| end: '2023-11-06T16:30:00Z', | ||
| minutesDuration: 30, | ||
| created: '2023-08-02T00:00:00Z', | ||
| cancellable: true, | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'NO ACTION TAKEN' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| }, | ||
| { | ||
| id: '180766', | ||
| identifier: [ | ||
| { | ||
| system: 'Appointment/', | ||
| value: '413938333130383736' | ||
| }, | ||
| { | ||
| system: 'http://www.va.gov/Terminology/VistADefinedTerms/409_84', | ||
| value: '983:10876' | ||
| } | ||
| ], | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| patientIcn: '1013125218V696863', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-13T16:00:00Z', | ||
| end: '2023-11-13T16:30:00Z', | ||
| minutesDuration: 30, | ||
| created: '2023-08-02T00:00:00Z', | ||
| cancellable: true, | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'FUTURE' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| end | ||
|
|
||
| context 'For valid vaos appointment data' do | ||
| let(:appointment1) do | ||
| { | ||
| id: '180765', | ||
| identifier: [ | ||
| { | ||
| system: 'Appointment/', | ||
| value: '413938333130383735' | ||
| }, | ||
| { | ||
| system: 'http://www.va.gov/Terminology/VistADefinedTerms/409_84', | ||
| value: '983:10875' | ||
| } | ||
| ], | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-06T16:00:00Z', | ||
| end: '2023-11-06T16:30:00Z', | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'NO ACTION TAKEN' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| } | ||
| end | ||
| let(:appointment2) do | ||
| { | ||
| id: '180766', | ||
| identifier: [ | ||
| { | ||
| system: 'Appointment/', | ||
| value: '413938333130383736' | ||
| }, | ||
| { | ||
| system: 'http://www.va.gov/Terminology/VistADefinedTerms/409_84', | ||
| value: '983:10876' | ||
| } | ||
| ], | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-13T16:00:00Z', | ||
| end: '2023-11-13T16:30:00Z', | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'FUTURE' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| } | ||
| end | ||
|
|
||
| let(:serialized_hash_response) do | ||
| { | ||
| data: | ||
| { | ||
| id: nil, | ||
| type: :vaos_appointment_data, | ||
| attributes: | ||
| { | ||
| appointments: | ||
| [ | ||
| appointment1, appointment2 | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| end | ||
|
|
||
| it 'returns a serialized hash' do | ||
| appt_struct = OpenStruct.new(vaos_appointment_data) | ||
| appt_serializer = subject.new(appt_struct) | ||
| expect(appt_serializer.serializable_hash).to eq(serialized_hash_response) | ||
| end | ||
| end | ||
|
|
||
| context 'Missing serialization key' do | ||
| let(:vaos_appointment_data_without_identifier) do | ||
| { | ||
| data: [ | ||
| { | ||
| id: '180765', | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| patientIcn: '1013125218V696863', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-06T16:00:00Z', | ||
| end: '2023-11-06T16:30:00Z', | ||
| created: '2023-08-02T00:00:00Z', | ||
| cancellable: true, | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'NO ACTION TAKEN' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| end | ||
|
|
||
| let(:appointment_without_identifier) do | ||
| { | ||
| id: '180765', | ||
| kind: 'clinic', | ||
| status: 'booked', | ||
| serviceType: 'amputation', | ||
| locationId: '983GC', | ||
| clinic: '1081', | ||
| start: '2023-11-06T16:00:00Z', | ||
| end: '2023-11-06T16:30:00Z', | ||
| extension: { | ||
| ccLocation: { | ||
| address: {} | ||
| }, | ||
| vistaStatus: [ | ||
| 'NO ACTION TAKEN' | ||
| ], | ||
| preCheckinAllowed: true, | ||
| eCheckinAllowed: true | ||
| } | ||
| } | ||
| end | ||
| let(:serialized_hash_response) do | ||
| { | ||
| data: | ||
| { | ||
| id: nil, | ||
| type: :vaos_appointment_data, | ||
| attributes: | ||
| { | ||
| appointments: | ||
| [ | ||
| appointment_without_identifier | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| end | ||
|
|
||
| it 'identifier not present' do | ||
| appt_struct = OpenStruct.new(vaos_appointment_data_without_identifier) | ||
| appt_serializer = subject.new(appt_struct) | ||
| expect(appt_serializer.serializable_hash).to eq(serialized_hash_response) | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.