[Automated] Merged master into target k8s

modules/mobile/app/controllers/mobile/v1/messages_controller.rb

@@ -8,7 +8,9 @@ def thread
         resource = client.get_messages_for_thread(message_id)
         raise Common::Exceptions::RecordNotFound, message_id if resource.blank?
 
-        resource.data = resource.data.filter { |m| m.message_id.to_s != params[:id] } if params[:excludeProvidedMessage]
+        if ActiveModel::Type::Boolean.new.cast(params[:excludeProvidedMessage])
+          resource.data = resource.data.filter { |m| m.message_id.to_s != params[:id] }
+        end
         resource.metadata.merge!(message_counts(resource))
 
         render json: resource.data,

modules/mobile/spec/request/v1/messages_request_spec.rb

@@ -153,7 +153,7 @@
         expect(response.parsed_body['data'].any? { |m| m['id'] == thread_id.to_s }).to be true
       end
 
-      it 'filters the provided message' do
+      it 'filters the provided message when excludeProvidedMessage is true' do
         VCR.use_cassette('mobile/messages/v1_get_thread') do
           get "/mobile/v1/messaging/health/messages/#{thread_id}/thread",
               headers: sis_headers,
@@ -165,6 +165,18 @@
         expect(response.parsed_body['data'].any? { |m| m['id'] == thread_id.to_s }).to be false
       end
 
+      it 'does not filter the provided message when excludeProvidedMessage is false' do
+        VCR.use_cassette('mobile/messages/v1_get_thread') do
+          get "/mobile/v1/messaging/health/messages/#{thread_id}/thread",
+              headers: sis_headers,
+              params: { excludeProvidedMessage: false }
+        end
+
+        expect(response).to be_successful
+        expect(response.parsed_body).to eq(thread_response)
+        expect(response.parsed_body['data'].any? { |m| m['id'] == thread_id.to_s }).to be true
+      end
+
       it 'provides a count in the meta of read' do
         VCR.use_cassette('mobile/messages/v1_get_thread') do
           get "/mobile/v1/messaging/health/messages/#{thread_id}/thread",