Skip to content

Commit

Permalink
Merge branch 'master' into mobile-remove-logs
Browse files Browse the repository at this point in the history
  • Loading branch information
Tonksthebear authored Mar 26, 2024
2 parents 143e39f + c2d9c5c commit d5b429b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 23 deletions.
6 changes: 0 additions & 6 deletions config/features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@ features:
actor_type: user
description: Enables access to the 10-10EZR application in prod for the purposes of conducting user reasearch
enable_in_development: true
cerner_transition_556_t30:
actor_type: user
description: This will control the content that will be in effect 30 days prior to transition.
cerner_transition_556_t5:
actor_type: user
description: This will control the content that will be in effect 5 days prior to transition.
cerner_override_653:
actor_type: user
description: This will show the Cerner facility 653 as `isCerner`.
Expand Down
10 changes: 4 additions & 6 deletions lib/rx/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Client < Common::Client::Base
client_session Rx::ClientSession

CACHE_TTL = 3600 * 1 # 1 hour cache
CACHE_TTL_ZERO = 0

def request(method, path, params = {}, headers = {}, options = {})
super(method, path, params, headers, options)
Expand All @@ -31,7 +32,7 @@ def request(method, path, params = {}, headers = {}, options = {})
# @return [Common::Collection[Prescription]]
#
def get_active_rxs
Common::Collection.fetch(::Prescription, cache_key: cache_key('getactiverx'), ttl: CACHE_TTL) do
Common::Collection.fetch(::Prescription, cache_key: cache_key('getactiverx'), ttl: CACHE_TTL_ZERO) do
perform(:get, 'prescription/getactiverx', nil, token_headers).body
end
end
Expand All @@ -53,7 +54,7 @@ def get_active_rxs_with_details
# @return [Common::Collection[Prescription]]
#
def get_history_rxs
Common::Collection.fetch(::Prescription, cache_key: cache_key('gethistoryrx'), ttl: CACHE_TTL) do
Common::Collection.fetch(::Prescription, cache_key: cache_key('gethistoryrx'), ttl: CACHE_TTL_ZERO) do
perform(:get, 'prescription/gethistoryrx', nil, token_headers).body
end
end
Expand Down Expand Up @@ -123,10 +124,7 @@ def get_tracking_history_rx(id)
# @return [Faraday::Env]
#
def post_refill_rxs(ids)
if (result = perform(:post, 'prescription/rxrefill', ids, token_headers))
Common::Collection.bust([cache_key('getactiverx'), cache_key('gethistoryrx')])
end
result
perform(:post, 'prescription/rxrefill', ids, token_headers)
end

##
Expand Down
23 changes: 12 additions & 11 deletions modules/mobile/spec/request/prescriptions_request_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,21 @@
end
end

context 'prescription cache is present on refill' do
it 'flushes prescription cache on refill' do
set_cache
# Temporarily removing test until we can figure out how to handle cache
# context 'prescription cache is present on refill' do
# it 'flushes prescription cache on refill' do
# set_cache

VCR.use_cassette('mobile/rx_refill/prescriptions/refills_prescriptions') do
put '/mobile/v0/health/rx/prescriptions/refill', params: { ids: %w[21530889 21539942] },
headers: sis_headers
end
# VCR.use_cassette('mobile/rx_refill/prescriptions/refills_prescriptions') do
# put '/mobile/v0/health/rx/prescriptions/refill', params: { ids: %w[21530889 21539942] },
# headers: sis_headers
# end

get '/mobile/v0/health/rx/prescriptions', headers: sis_headers
# get '/mobile/v0/health/rx/prescriptions', headers: sis_headers

assert_requested :get, upstream_mhv_history_url, times: 1
end
end
# assert_requested :get, upstream_mhv_history_url, times: 1
# end
# end
end

describe 'GET /mobile/v0/health/rx/prescriptions', :aggregate_failures do
Expand Down

0 comments on commit d5b429b

Please sign in to comment.