Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding merge functionality for eps to regular appointments #19754

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a7c7ab2
adding merge functionality for eps to regular appointments
lee-delarm6 Dec 5, 2024
7b9caa6
rubocop fixes
lee-delarm6 Dec 5, 2024
f9d0a36
revert controller, move logic to service
lee-delarm6 Dec 12, 2024
0577b6e
update test
lee-delarm6 Dec 12, 2024
6401a1f
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Dec 12, 2024
a749327
moved controller logic to service
lee-delarm6 Dec 12, 2024
36cbafd
dropping and fixing a few items
lee-delarm6 Dec 12, 2024
170d535
removing unused function
lee-delarm6 Dec 12, 2024
8a362ce
update to master
lee-delarm6 Dec 12, 2024
c565abd
fixes
lee-delarm6 Dec 12, 2024
26804f8
more fixes
lee-delarm6 Dec 12, 2024
7631136
last fix
lee-delarm6 Dec 12, 2024
fbde9be
maybe last fix
lee-delarm6 Dec 12, 2024
3c9df3b
Updated fix?
lee-delarm6 Dec 12, 2024
5822040
Fixed linting issues
lee-delarm6 Dec 19, 2024
91d4dbc
Changing naming, removing empty line
lee-delarm6 Dec 19, 2024
a755e2d
Lint fixes again
lee-delarm6 Dec 19, 2024
0b84443
Remove line
lee-delarm6 Dec 19, 2024
e7b6f30
eps serializer
lee-delarm6 Dec 20, 2024
76b38cb
rubocop fix
lee-delarm6 Dec 20, 2024
10a0b0f
Unfixed test
lee-delarm6 Dec 30, 2024
37add43
Fix tests and code
lee-delarm6 Dec 30, 2024
699e013
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 7, 2025
fabfda6
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 9, 2025
7445cac
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 10, 2025
beeb062
Fix data issues with appointments
lee-delarm6 Jan 15, 2025
a785508
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 15, 2025
22bd92c
Rubocop fixes
lee-delarm6 Jan 15, 2025
0c3691e
Add start time stamp for uniqueness
lee-delarm6 Jan 16, 2025
1e6bf3e
VCR update, spec updates, block updates
lee-delarm6 Jan 21, 2025
2a333fd
Rubocop fixes
lee-delarm6 Jan 21, 2025
80347b3
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 21, 2025
eb8d591
Updated line too long offenses
lee-delarm6 Jan 21, 2025
0694ff9
Merge branch '96412_merge_eps_appointments' of https://github.com/dep…
lee-delarm6 Jan 21, 2025
b8f3ebc
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 22, 2025
3fadd7d
Not needed anymore
lee-delarm6 Jan 23, 2025
deea80d
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 23, 2025
77cd91c
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 23, 2025
e3fc186
Moved status to serialize step
lee-delarm6 Jan 27, 2025
246ed56
Update modules/vaos/app/serializers/vaos/v2/eps_appointment.rb
lee-delarm6 Jan 28, 2025
5f05d5b
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 29, 2025
6fea526
rubocop fix
lee-delarm6 Jan 29, 2025
0b4093c
Merge branch '96412_merge_eps_appointments' of https://github.com/dep…
lee-delarm6 Jan 29, 2025
5e9be5f
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 29, 2025
303da0c
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 29, 2025
f817cac
Fixed testing and rubocop errors
lee-delarm6 Jan 29, 2025
6348a6b
Moving file locations
lee-delarm6 Jan 30, 2025
5581d55
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved status to serialize step
Moved status to serialize step, altered status method slightly
  • Loading branch information
lee-delarm6 committed Jan 27, 2025
commit e3fc1867599d2730fb31342e18439dfad468a41b
6 changes: 3 additions & 3 deletions modules/vaos/app/serializers/vaos/v2/eps_appointment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
referral_details = params[:referral]

@id = params[:id]&.to_s
@status = determine_status(appointment_details[:status])
@status = appointment_details[:status],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest removing the comma from here

@patient_icn = params[:patient_id]

Check failure on line 12 in modules/vaos/app/serializers/vaos/v2/eps_appointment.rb

View workflow job for this annotation

GitHub Actions / Linting and Security

Layout/ArrayAlignment: Align the elements of an array literal if they span more than one line.
@created = appointment_details[:last_retrieved]
@location_id = params[:network_id]
@clinic = params[:provider_service_id]
Expand All @@ -22,7 +22,7 @@
def serializable_hash
{
id: @id,
status: @status,
status: determine_status(@status),
patient_icn: @patient_icn,
created: @created,
location_id: @location_id,
Expand All @@ -37,7 +37,7 @@
private

def determine_status(status)
status ? 'booked' : 'proposed'
status || 'proposed'
lee-delarm6 marked this conversation as resolved.
Show resolved Hide resolved
end
end
end
Expand Down
Loading