his_emr_api_lab 2.4.6 → 2.4.8.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac3fb7e82f896ac9c5f0545aa1c7e97290e7aaf11cc149fd6e8f385938397dc
-  data.tar.gz: 707411853618c5b391c99ecdc043bdbc71ef5df5a1b801567869d279b068c6d7
+  metadata.gz: c976558db9507288b37c309d50e9b45ccb70b9848483c86c980e605906464823
+  data.tar.gz: 88223e508a7f67c51afa7c40f6b2fb2d758c9afe868c32e8a56dd44b567db8f9
 SHA512:
-  metadata.gz: e0ae79db2d3cb66121a3daf92c1fb0e141a09309dc148f604da49cb167203fe22c77e50c843a9a10e6531fe505cb8241c5212668a643bff38ef5f851d8232a72
-  data.tar.gz: 32ec983d0e45aa6af8b280ae1850544ad42bb250465cdfa45a597818e589c3ff9238d7ebea7ba7cdc7c613ae4f2368fc05c2c854809fa2f1d2d8b76ed82c1bcf
+  metadata.gz: 357768b64d3e2bd5308e71816b7e38f17883a504376a41275bd609f06d66d5ec21fa51ff9ce0734a6abce99b1aeb103dec484a87623e45f1a61e9bcac76a4c3e
+  data.tar.gz: 7e27bf14bc5ece4ab4a4a55145d8ec3492c7b677f7bfd40530fb978cd40492b72579ccea8c4023fd64cc3976d949ddc37993af8195cbdfcbd90f25a0ecc87bdd

data/app/controllers/lab/orders_controller.rb

@@ -95,7 +95,8 @@ module Lab
       end_date = params[:end_date].present? ? params[:end_date].to_date.end_of_day : 24.hours.ago.end_of_day
       concept_id = params[:concept_id]
       include_data = params[:include_data]
-      orders = OrdersService.lab_orders(start_date, end_date, concept_id, include_data: include_data)
+      location_id = params[:location_id]
+      orders = OrdersService.lab_orders(start_date, end_date, concept_id, include_data: include_data, location_id: location_id)
       render json: orders, status: :ok
     end
 

data/app/controllers/lab/tests_controller.rb

@@ -10,7 +10,7 @@ module Lab
 
     # Add a specimen to an existing order
     def create
-      test_params = params.slice(:order_id, :date, tests: [:concept_id])
+      test_params = params.permit(:order_id, :date, tests: %i[concept_id concept])
       order_id, test_concepts = test_params.require(%i[order_id tests])
       date = test_params[:date] || Date.today
 

data/app/controllers/lab/users_controller.rb

@@ -8,6 +8,12 @@ module Lab
     # create a LIMS User that will be responsible for sending lab results
     def create
       user_params = params.permit(:username, :password)
+      begin
+        User.current = Lab::Lims::Utils.lab_user
+        Location.current = User.current.location
+      rescue StandardError => e
+        Rails.logger.error("Failed to set current location: #{e.message}")
+      end
       service.create_lims_user(username: user_params['username'], password: user_params['password'])
       render json: { message: 'User successfully created' }, status: 200
     end

data/app/services/lab/orders_service.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'order_location_resolver'
+require_relative 'lims/exceptions'
 
 module Lab
   ##
@@ -240,16 +241,18 @@ module Lab
         Lab::Lims::PullWorker.new(nil).process_order(order_dto)
       end
 
-      def lab_orders(start_date, end_date, concept_id = nil, include_data: false)
-        tests = Lab::LabTest.where('date_created >= ? AND date_created <= ?', start_date, end_date)
+      def lab_orders(start_date, end_date, concept_id = nil, include_data: false, location_id: nil)
+        tests = Lab::LabTest.unscoped.where('date_created >= ? AND date_created <= ?', start_date, end_date)
+        tests = tests.where(voided: false, concept: ConceptName.where(name: Lab::Metadata::TEST_TYPE_CONCEPT_NAME))
         tests = tests.where(value_coded: concept_id) if concept_id
+        tests = tests.where(location_id: location_id) if location_id
         orders = Lab::LabOrder.where(order_id: tests.pluck(:order_id))
         data = {
           count: orders.count,
           last_order_date: Lab::LabOrder.last&.start_date&.to_date,
           lab_orders: []
         }
-        if include_data
+        if (include_data.present? && include_data == 'true')
           data[:lab_orders] = orders.map do |order|
             Lab::LabOrderSerializer.serialize_order(
               order, requesting_clinician: order.requesting_clinician,
@@ -374,7 +377,11 @@ module Lab
       end
 
       def nlims_accession_number_exists?(accession_number)
-        config = YAML.load_file('config/application.yml')
+        # No config file means NLIMS is not configured, same as no lims_api entry.
+        config_path = Rails.root.join('config', 'application.yml')
+        return false unless File.exist?(config_path)
+
+        config = YAML.load_file(config_path)
         return false unless config['lims_api']
 
         # fetch from the rest api and check if it exists

data/app/services/lab/tests_service.rb

@@ -15,7 +15,7 @@ module Lab
         Lab::UpdatePatientOrdersJob.perform_later(patient_id) if patient_id
 
         tests = filter_tests(tests, test_type_id: filters.delete(:test_type_id),
-                                    patient_id: filters.delete(:patient_id),
+                                    patient_id:,
                                     patient: filters.delete(:patient))
 
         tests = filter_tests_by_results(tests) if %w[1 true].include?(filters[:pending_results]&.downcase)

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.4.6'.freeze
+  VERSION = '2.4.8-alpha'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.8.pre.alpha
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-19 00:00:00.000000000 Z
+date: 2026-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.6
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: socket.io-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -109,35 +123,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.16.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
-  name: rswag-api
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: rswag-specs
+  name: rswag-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: rswag-ui
+  name: rswag-specs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -165,61 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.79.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.79.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rswag-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.0
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '5.3'
 description: |
   This adds a lab interface to the OpenMRS compatible core API provided by
   [HIS-EMR-API](https://github.com/EGPAFMalawiHIS/HIS-EMR-API).
@@ -342,9 +328,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.1
 signing_key: