his_emr_api_lab 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59744a50921b0f2244c94e052d4d66cbf39096485f99755e84f9cb66c311a0b
-  data.tar.gz: 989cc056aa59acbcd9d24977d3fc34b330cd1793db5d35908ccce44ca08dab34
+  metadata.gz: 5430975d278d3f06b169b906ca5c471f0ad632dc158540f358545f4da2aa05d1
+  data.tar.gz: e75574b9ac3023e974d70ef021ae158ded0614a8d379eec120124f9e45891479
 SHA512:
-  metadata.gz: 22429cb56bfb9c5af91e5b44e2da11b66551ac89d084eeea45f5b16bb06daf5cc4f99d41cb5f2e4f3d5a38443fb62c15e5a30a14c5e5fff85006a3233d8f71de
-  data.tar.gz: 622a040596dc790f1d5a3c05469f7afe131badeca6313eb2412f8da378e632b7b28643c6a12eba6f02c618b9bed680722a635ce6e2e57ea6863872eb5e9b0966
+  metadata.gz: b3f869dd69e746a19f35be7741f717c1b657ae6d8df6a55cf72a427f70fbdee62c76d61af605ac81f248a376428db8fab67bd6ef9fa623ceb2ca0bec45678cd6
+  data.tar.gz: a7c3ef0003f803d83f47337f3d4ba4f9388a4b40962f6b95b36d14c904ab361280971e6689f8fcbb3cd48f41ba4863722d422c6d884e44e346f0e48626cacedc

data/app/jobs/lab/process_lab_result_job.rb

@@ -7,8 +7,11 @@ module Lab
     queue_as :default
     def perform(results_obs_id, serializer, result_enter_by)
       Rails.logger.info("Lab::ProcessLabResultJob: Processing result completion for #{serializer}")
+      # set location context for the job based on the order's encounter to ensure proper context for any operations performed in the job
       results_obs = Lab::LabResult.unscoped.find(results_obs_id)
+      encounter = Encounter.unscoped.find_by(encounter_id: results_obs.encounter_id)
+      Location.current = Location.find(encounter.location_id) if encounter&.location_id
       Lab::ResultsService.process_result_completion(results_obs, serializer, result_enter_by)
     end
   end
-end
+end

data/app/jobs/lab/update_patient_orders_job.rb

@@ -10,7 +10,8 @@ module Lab
       Rails.logger.info('Initialising LIMS REST API...')
 
       User.current = Lab::Lims::Utils.lab_user
-      Location.current = Location.find_by_name('ART clinic')
+      # Set location from patient's most recent encounter to ensure proper context
+      set_location_from_patient_encounter(patient_id)
 
       lockfile = Rails.root.join('tmp', "update-patient-orders-#{patient_id}.lock")
 
@@ -28,5 +29,53 @@ module Lab
 
       File.unlink(lockfile) if done
     end
+
+    private
+
+    def set_location_from_patient_encounter(patient_id)
+      Rails.logger.info("Setting location context for patient #{patient_id}")
+
+      # Strategy 1: Find location from patient's most recent order (ANY order type)
+      recent_order = Order.unscoped
+                          .where(patient_id: patient_id)
+                          .order(start_date: :desc)
+                          .first
+
+      if recent_order
+        encounter = Encounter.unscoped.find_by(encounter_id: recent_order.encounter_id)
+        if encounter&.location_id
+          Location.current = Location.find(encounter.location_id)
+          Rails.logger.info("Location set from patient's recent order: #{Location.current.name} (ID: #{Location.current.location_id})")
+          return
+        end
+      end
+
+      # Strategy 2: Find location from patient's most recent encounter
+      recent_encounter = Encounter.unscoped
+                                  .where(patient_id: patient_id)
+                                  .order(encounter_datetime: :desc)
+                                  .first
+
+      if recent_encounter&.location_id
+        Location.current = Location.find(recent_encounter.location_id)
+        Rails.logger.info("Location set from patient's recent encounter: #{Location.current.name} (ID: #{Location.current.location_id})")
+        return
+      end
+
+      # Fallback chain: Try multiple options to ensure location is ALWAYS set
+      Location.current ||= begin
+        Location.current_health_center
+      rescue StandardError
+        nil
+      end
+      Location.current ||= Location.first
+
+      if Location.current
+        Rails.logger.info("Location set to fallback: #{Location.current.name} (ID: #{Location.current.location_id})")
+      else
+        Rails.logger.error('CRITICAL: Could not set Location.current - no locations found in database!')
+        raise 'No locations available in database'
+      end
+    end
   end
 end

data/app/jobs/lab/void_order_job.rb

@@ -8,10 +8,14 @@ module Lab
       Rails.logger.info("Voiding order ##{order_id} in LIMS")
 
       User.current = Lab::Lims::Utils.lab_user
-      Location.current = Location.find_by_name('ART clinic')
+      # Set location from order's encounter to ensure proper context
+      order = Lab::LabOrder.unscoped.find(order_id)
+      encounter = Encounter.unscoped.find_by(encounter_id: order.encounter_id)
+      Location.current = Location.find(encounter.location_id) if encounter&.location_id
+      Location.current ||= Location.find_by_name('ART clinic')
 
       worker = Lab::Lims::PushWorker.new(Lab::Lims::ApiFactory.create_api)
-      worker.push_order(Lab::LabOrder.unscoped.find(order_id))
+      worker.push_order(order)
     end
   end
 end

data/app/serializers/lab/result_serializer.rb

@@ -11,9 +11,9 @@ module Lab
         concept_name = get_test_catalog_concept_name(measure.concept_id)
         program_id = ''
         if measure.obs_id.present?
-          obs = Observation.unscope(where: :obs_group_id).find(measure.obs_id)
-          encounter = Encounter.find(obs.encounter_id)
-          program_id = encounter.program_id
+          obs = Observation.unscope(where: :obs_group_id).find_by(obs_id: measure.obs_id)
+          encounter = Encounter.find_by(encounter_id: obs&.encounter_id)
+          program_id = encounter&.program_id
         end
 
         {

data/app/services/lab/lims/api/rest_api.rb

@@ -294,7 +294,7 @@ module Lab
           {
             order: {
               tracking_number: order_dto.fetch(:tracking_number),
-              district: current_district,
+              district: order_dto.fetch(:districy),
               health_facility_name: order_dto.fetch(:sending_facility),
               sending_facility: order_dto.fetch(:sending_facility),
               arv_number: order_dto.fetch(:patient).fetch(:arv_number),
@@ -348,24 +348,17 @@ module Lab
             status: 'specimen_collected',
             time_updated: date_updated,
             sample_type: order_dto.fetch(:sample_type_map),
-            updated_by: status.fetch(:updated_by)
+            updated_by: status.fetch(:updated_by),
+            status_trail: [
+              updated_by: {
+                first_name: status.fetch(:updated_by).fetch(:first_name),
+                last_name: status.fetch(:updated_by).fetch(:last_name),
+                id_number: status.fetch(:updated_by).fetch(:id)
+              }
+            ]
           }
         end
 
-        def current_district
-          health_centre = Location.current_health_center
-          raise 'Current health centre not set' unless health_centre
-
-          district = health_centre.district || Lab::Lims::Config.application['district']
-
-          unless district
-            health_centre_name = "##{health_centre.id} - #{health_centre.name}"
-            raise "Current health centre district not set: #{health_centre_name}"
-          end
-
-          district
-        end
-
         ##
         # Extracts sample drawn status from an OrderDto
         def sample_drawn_status(order_dto)
@@ -511,23 +504,25 @@ module Lab
           order_dto['test_results'].each do |test_name, results|
             Rails.logger.info("Pushing result for order ##{order_dto['tracking_number']}")
             in_authenticated_session do |headers|
-              params = make_update_test_params(order_dto['tracking_number'], test_name, results)
+              params = make_update_test_params(order_dto, test_name, results)
 
-              RestClient.post(expand_uri("tests/#{order_dto['tracking_number']}", api_version: 'v2'), params, headers)
+              RestClient.put(expand_uri("tests/#{order_dto['tracking_number']}", api_version: 'v2'), params, headers)
             end
           end
         end
 
-        def make_update_test_params(_tracking_number, test, results, test_status = 'Drawn')
+        def make_update_test_params(order_dto, test, results, test_status = 'Drawn')
+          # Find the concept from the test name (which is a string)
+          concept = ::ConceptName.find_by(name: test)&.concept
           {
             test_status:,
             time_updated: results['result_date'],
             test_type: {
-              name: ::Concept.find(test.concept_id).test_catalogue_name,
-              nlims_code: ::Concept.find(test.concept_id).nlims_code
+              name: concept&.test_catalogue_name,
+              nlims_code: concept&.nlims_code
             },
-            test_results: results['results'].map do |measure, _value|
-              measure_name, measure_value = measure
+            test_results: results['results'].map do |measure_name, value|
+              measure_value = value['result_value']
               {
                 measure: {
                   name: measure_name,
@@ -539,6 +534,18 @@ module Lab
                   result_date: results['result_date']
                 }
               }
+            end,
+            status_trail: order_dto['sample_statuses'].map do |trail_entry|
+              date, status = trail_entry.each_pair.first
+              {
+                status: status['status'],
+                timestamp: date,
+                updated_by: {
+                  first_name: status.fetch('updated_by').fetch('first_name'),
+                  last_name: status.fetch('updated_by').fetch('last_name'),
+                  id_number: status.fetch('updated_by').fetch('id')
+                }
+              }
             end
           }
         end
@@ -763,7 +770,7 @@ module Lab
   def make_create_params(order_dto)
     {
       tracking_number: order_dto.fetch(:tracking_number),
-      district: current_district,
+      district: order_dto.fetch(:districy),
       health_facility_name: order_dto.fetch(:sending_facility),
       first_name: order_dto.fetch(:patient).fetch(:first_name),
       last_name: order_dto.fetch(:patient).fetch(:last_name),
@@ -801,20 +808,6 @@ module Lab
     }
   end
 
-  def current_district
-    health_centre = Location.current_health_center
-    raise 'Current health centre not set' unless health_centre
-
-    district = health_centre.district || Lab::Lims::Config.application['district']
-
-    unless district
-      health_centre_name = "##{health_centre.id} - #{health_centre.name}"
-      raise "Current health centre district not set: #{health_centre_name}"
-    end
-
-    district
-  end
-
   ##
   # Extracts sample drawn status from an OrderDto
   def sample_drawn_status(order_dto)

data/app/services/lab/lims/order_serializer.rb

@@ -14,15 +14,17 @@ module Lab
 
         def serialize_order(order)
           serialized_order = Lims::Utils.structify(Lab::LabOrderSerializer.serialize_order(order))
+          location = get_location(serialized_order.location_id, order)
+
           Lims::OrderDto.new(
             _id: Lab::LimsOrderMapping.find_by(order: order)&.lims_id || serialized_order.accession_number,
             tracking_number: serialized_order.accession_number,
-            sending_facility: current_facility_name,
+            sending_facility: location.name,
             receiving_facility: serialized_order.target_lab,
             tests: serialized_order.tests.map { |test| format_test_name(test.name) },
             tests_map: serialized_order.tests,
             patient: format_patient(serialized_order.patient_id),
-            order_location: format_order_location(serialized_order.encounter_id),
+            order_location: location.name,
             sample_type: format_sample_type(serialized_order.specimen.name),
             sample_type_map: {
               name: format_sample_type(serialized_order.specimen.name),
@@ -32,7 +34,7 @@ module Lab
             sample_statuses: format_sample_status_trail(order),
             test_statuses: format_test_status_trail(order),
             who_order_test: format_orderer(order),
-            districy: current_district, # yes districy [sic]...
+            districy: get_district(location), # yes districy [sic]...
             priority: format_sample_priority(serialized_order.reason_for_test.name),
             date_created: serialized_order.order_date,
             test_results: format_test_results(serialized_order),
@@ -43,13 +45,26 @@ module Lab
 
         private
 
-        def format_order_location(encounter_id)
-          location_id = Encounter.select(:location_id).where(encounter_id:)
-          location = Location.select(:name)
-                             .where(location_id:)
-                             .first
+        def get_location(location_id, order)
+          # Try to get location from the location_id first
+          location = Location.find_by(location_id: location_id) if location_id.present?
+
+          # Fallback to current health center
+          location ||= Location.current_health_center
+
+          # Last fallback: try to get from order's observation encounter
+          # Use unscoped to find observations/encounters across all locations
+          if location.nil? && order.present?
+            obs = Observation.unscoped.find_by(order_id: order.order_id)
+            if obs.respond_to?(:encounter) && obs.encounter.respond_to?(:location)
+              encounter = Encounter.unscoped.find_by(encounter_id: obs.encounter_id)
+              location = encounter&.location
+            end
+          end
+
+          raise 'Current health center not set' unless location
 
-          location&.name
+          location
         end
 
         # Format patient into a structure that LIMS expects
@@ -123,11 +138,13 @@ module Lab
         def format_sample_status_trail(order)
           return [] if order.concept_id == ConceptName.find_by_name!('Unknown').concept_id
 
-          user = User.find(order.creator)
-          user = User.find(order.discontinued_by) if Order.columns_hash.key?('discontinued_by') && user.blank?
+          user = User.unscoped.find(order.creator)
+          user = User.unscoped.find(order.discontinued_by) if Order.columns_hash.key?('discontinued_by') && user.blank?
 
           drawn_by = PersonName.find_by_person_id(user.user_id)
-          drawn_date = order.discontinued_date || order.start_date if ['discontinued_date', 'start_date'].all? { |column| order.respond_to?(column) }
+          drawn_date = order.discontinued_date || order.start_date if %w[discontinued_date start_date].all? do |column|
+            order.respond_to?(column)
+          end
           drawn_date ||= order.date_created
 
           [
@@ -179,13 +196,15 @@ module Lab
           order.tests&.each_with_object({}) do |test, results|
             next if test.result.nil? || test.result.empty?
 
-            result_obs = Observation.find_by(obs_id: test.result.first.id)
+            # Use unscoped to find observations across locations
+            result_obs = Observation.unscoped.find_by(obs_id: test.result.first.id)
             unless result_obs
               Rails.logger.warn("Observation with obs_id=#{test.result.first.id} not found for test #{test.name} in order #{order.accession_number}")
               next
             end
 
-            test_creator = User.find(result_obs.creator)
+            # Use unscoped to find user regardless of location
+            test_creator = User.unscoped.find(result_obs.creator)
             test_creator_name = PersonName.find_by_person_id(test_creator.person_id)
 
             results[format_test_name(test.name)] = {
@@ -208,7 +227,7 @@ module Lab
         end
 
         def format_test_name(test_name)
-          return test_name
+          test_name
         end
 
         def format_sample_priority(priority)
@@ -217,16 +236,11 @@ module Lab
           priority&.titleize
         end
 
-        def current_health_center
-          health_center = Location.current_health_center
-          raise 'Current health center not set' unless health_center
-
-          health_center
-        end
+        def get_district(location)
+          return nil unless location
 
-        def current_district
-          district = current_health_center.city_village \
-                       || current_health_center.parent&.name \
+          district = location.city_village \
+                       || location.parent&.name \
                        || GlobalProperty.find_by_property('current_health_center_district')&.property_value
 
           return district if district
@@ -238,12 +252,8 @@ module Lab
           Config.application['district']
         end
 
-        def current_facility_name
-          current_health_center.name
-        end
-
         def find_user(user_id)
-          user = User.find(user_id)
+          user = User.unscoped.find(user_id)
           person_name = PersonName.find_by(person_id: user.person_id)
           phone_number = PersonAttribute.find_by(type: PersonAttributeType.where(name: 'Cell phone number'),
                                                  person_id: user.person_id)

data/app/services/lab/lims/utils.rb

@@ -43,7 +43,8 @@ module Lab
       end
 
       def self.lab_user
-        user = User.find_by_username('lab_daemon')
+        # Use unscoped to find user regardless of location context
+        user = User.unscoped.find_by_username('lab_daemon')
         return user if user
 
         god_user = User.first

data/app/services/lab/notification_service.rb

@@ -30,7 +30,8 @@ class Lab::NotificationService
   def create_notification(alert_type, alert_message)
     return if alert_type != 'LIMS'
 
-    lab = User.find_by(username: 'lab_daemon')
+    # Use unscoped to find user regardless of location context
+    lab = User.unscoped.find_by(username: 'lab_daemon')
     ActiveRecord::Base.transaction do
       alert = NotificationAlert.create!(text: alert_message.to_json, date_to_expire: Time.now + not_period.days,
                                         creator: lab, changed_by: lab, date_created: Time.now)

data/app/services/lab/orders_service.rb

@@ -385,7 +385,8 @@ module Lab
       end
 
       def create_order_observation(order, concept_name, date, **values)
-        creator = User.find_by(username: 'lab_daemon')
+        # Use unscoped to find user regardless of location context
+        creator = User.unscoped.find_by(username: 'lab_daemon')
         User.current ||= creator
         Observation.create!(
           order:,

data/app/services/lab/results_service.rb

@@ -65,7 +65,7 @@ module Lab
                  order_date: Order.columns.include?('start_date') ? order.start_date : order.date_created,
                  'ARV-Number': find_arv_number(result.person_id),
                  PatientID: result.person_id,
-                 'Ordered By': Order.columns.include?('provider_id') ? order&.provider&.person&.name : Person.find(order.creator)&.name,
+                 'Ordered By': Order.columns.include?('provider_id') ? order&.provider&.person&.name : Person.find(User.unscoped.find(order.creator).person_id)&.name,
                  Result: values }.as_json
         NotificationService.new.create_notification(result_enter_by, data)
       end

data/app/services/lab/tests_service.rb

@@ -130,7 +130,6 @@ module Lab
           concept_id: test_status_concept.concept_id,
           value_text: 'Drawn', # Store status as text
           obs_datetime: timestamp,
-          status: 'FINAL',
           comments: {
             'first_name' => User.current&.person&.names&.first&.given_name,
             'last_name' => User.current&.person&.names&.first&.family_name,

data/app/services/lab/user_service.rb

@@ -15,7 +15,8 @@ module Lab
       end
 
       def authenticate_user(username:, password:, user_agent:, request_ip:)
-        user = User.find_by_username username
+        # Use unscoped for authentication - should not be location-dependent
+        user = User.unscoped.find_by_username username
         encrypted_pass = Password.new(user.password)
         if encrypted_pass == password
           generate_token(user, user_agent, request_ip)
@@ -30,7 +31,7 @@ module Lab
       ##
       # Validate that the username doesn't already exists
       def validate(username:)
-        raise UnprocessableEntityError, 'Username already exists' if User.find_by_username username
+        raise UnprocessableEntityError, 'Username already exists' if User.unscoped.find_by_username username
       end
 
       def create_lims_person

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi