his_emr_api_lab 2.1.7.pre.beta.1 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d877b48426a5796cb14b763cb35844b3456c7682a45b42a5e23b0de5695da42
-  data.tar.gz: 96863f1a68b0b36f0e078294811886361ed1ed24780744e0976385814b029edf
+  metadata.gz: 44e72036503453b83d8f3cfcdff281e1085e461c476a8f793e24a3d72f12f223
+  data.tar.gz: 0100d95046a1a81db0fc8b7eace3e9fa02dc2f9be6f396f073954bbfa5578993
 SHA512:
-  metadata.gz: 3db7243ec7d3ebaa12a9202b8ecd07ac4198e52aa5bc120dc4c8dbcabaa385e458381240a89a458e6876ed932b66f43bedcd2c7ebf47abe02219581a2d601190
-  data.tar.gz: 67e61249cd7e3078f1ed00d7f94efa2ce31af43f23111a1c322e47a002cd7f9933bfae164ad573ea4d81aa537d2842755de2b5177f98fe0dbe2ea6bdfbbd5262
+  metadata.gz: 25cb61dabafa209680d649747e35a06e19ed3685c7730bc0c539a35357e9e9529794ed180714c626125ec6ab8104b107e90e6ad0ab0cbebfcaee2ae728ea7815
+  data.tar.gz: 0da64fc5aa9647ffcc3252ae597b0492bacb3b77ec97064c4433f72bcd122431e04114323f7f13dc602faa0ccdc7c2f836b098a1090e9a56fa8cae774503101f

data/README.md

@@ -22,25 +22,25 @@ For details on how to perform these operations please see the
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'lab', git: 'https://github.com/EGPAFMalawiHIS/HIS-EMR-API-Lab', branch: 'development'
+gem 'his_emr_api_lab', git: 'https://github.com/EGPAFMalawiHIS/HIS-EMR-API-Lab', branch: 'development'
 ```
 
 And then execute:
 
 ```bash
-$ bundle install lab
+$ bundle install 
 ```
 
 Or install it yourself as:
 
 ```bash
-$ gem install lab
+$ gem install his_emr_api_lab
 ```
 
 Finally run:
 
 ```bash
-$ bundle exec rails lab:install
+$ bundle exec rails his_emr_api_lab:install
 ```
 
 ## Configuration
@@ -66,6 +66,19 @@ but too much a departure from it is frowned upon. For example, you will be forgi
 for writing a method with 15 to 20 lines if you clearly justify why you couldn't
 break that method into multiple smaller methods.
 
+## Publishing
+
+To publish a new version of the gem, first update the version number in
+`lib/lab/version.rb` and then run the following command:
+
+```bash
+$ gem build his_emr_api_lab.gemspec
+$ gem push his_emr_api_lab-<version>.gem  
+```
+Make sure to replace `<version>` with the version number you set in `lib/lab/version.rb`.
+
+NB: You need to have an account on [rubygems.org](https://rubygems.org/) and permission to publish gems.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/jobs/lab/process_lab_result_job.rb

@@ -7,7 +7,7 @@ module Lab
     queue_as :default
     def perform(results_obs_id, serializer, result_enter_by)
       Rails.logger.info("Lab::ProcessLabResultJob: Processing result completion for #{serializer}")
-      results_obs = Lab::LabResult.unscoped.find(results_obs_id)
+      results_obs = Lab::LabResult.find(results_obs_id)
       Lab::ResultsService.process_result_completion(results_obs, serializer, result_enter_by)
     end
   end

data/app/services/lab/concepts_service.rb

@@ -34,11 +34,10 @@ module Lab
 
       unless specimen_type
         return ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
+          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
             FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
-          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
           AND ca.concept_id IN (#{test_types.select(:concept_id).to_sql})
           GROUP BY ca.concept_id
@@ -57,11 +56,10 @@ module Lab
       )
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
           FROM concept_attribute ca
         INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
           AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
-        INNER JOIN concept c ON c.concept_id = ca.concept_id
         WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
         AND ca.concept_id IN (#{concept_set.select(:concept_set).to_sql})
         GROUP BY ca.concept_id
@@ -74,11 +72,10 @@ module Lab
 
       unless test_type
         return ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
+          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
             FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
-          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
           AND ca.concept_id IN (#{specimen_types.select(:concept_id).to_sql})
           GROUP BY ca.concept_id
@@ -97,11 +94,10 @@ module Lab
       )
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
           FROM concept_attribute ca
         INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
           AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
-        INNER JOIN concept c ON c.concept_id = ca.concept_id
         WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
         AND ca.concept_id IN (#{concept_set.pluck(:concept_id).push(0).join(',')})
         GROUP BY ca.concept_id
@@ -118,16 +114,15 @@ module Lab
       measures = ConceptSet.find_members_by_name(Lab::Metadata::TEST_RESULT_INDICATOR_CONCEPT_NAME)
                            .select(:concept_id)
 
-      sets = ConceptSet.where(concept_set: test, concept_id: measures)
+      sets = ConceptSet.where(concept_set: measures, concept_id: test)
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
           FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
-          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
-          AND ca.concept_id IN (#{sets.pluck(:concept_id).push(0).join(',')})
+          AND ca.concept_id IN (#{sets.pluck(:concept_set).push(0).join(',')})
           GROUP BY ca.concept_id
       SQL
     end

data/app/services/lab/orders_service.rb

@@ -247,6 +247,7 @@ module Lab
 
         concept = params.dig(:specimen, :concept)
         concept ||= params.dig(:specimen, :concept_id)
+        concept ||= unknown_concept_id
 
         order_type = nil
         order_type = OrderType.find_by_order_type_id!(params[:order_type_id])&.id if params[:order_type_id].present?
@@ -259,8 +260,7 @@ module Lab
         order.date_created = params[:date]&.to_date || Date.today if order.respond_to?(:date_created)
         order.start_date = params[:date]&.to_date || Date.today if order.respond_to?(:start_date)
         order.auto_expire_date = params[:end_date]
-        # Note: comment_to_fulfiller is a has_one association, not a field
-        # It will be created via add_comment_to_fulfiller method
+        order.comment_to_fulfiller = params[:comment_to_fulfiller] if params[:comment_to_fulfiller]
         order.accession_number = access_number
         order.orderer = User.current&.user_id
 
@@ -348,7 +348,7 @@ module Lab
       end
 
       def unknown_concept_id
-        ConceptName.find_by_name!('Unknown').concept
+        ConceptName.find_by_name!('Unknown').concept_id
       end
 
       def update_reason_for_test(order, concept_id, force_update: false)

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.1.7-beta.1'
+  VERSION = '2.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.1.7.pre.beta.1
+  version: 2.1.8
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-19 00:00:00.000000000 Z
+date: 2026-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -340,9 +340,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.1
 signing_key: