his_emr_api_lab 2.4.2.pre.beta → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c709c42cf59eed483429321c58ddf08678dc809850c2d59cb58ca8d8bf4f3c3
-  data.tar.gz: 3f54225c34b8547665dfa5d553971e7d0b299d6744496d9e457184f3c7c105b8
+  metadata.gz: 87bb2fa74878c6f69d4f52ec514e1e03118608be3e466f0b80a43df7cb0d51dc
+  data.tar.gz: 65227f424e63b2f179f74339e34ec2cb3437d8068b219cfb9a94754a1e511cb0
 SHA512:
-  metadata.gz: c53d18764e2dd4d99e4881855778acec6c8a2852744eb8bba144aea85249d8a0d5555f6c6e85773333367439606fa8652104d14169cb0290964bd308c23f5e7a
-  data.tar.gz: 45a1847d5591bbd4e352d15d320651cbaa2b2d774b5752cc17caceb8416a3fa56c505efd230b3c4635bb334c4d2bd3d2e885de5996324e94da1f5a82d01260c6
+  metadata.gz: bdba5bc2908c3eaeb1389f1dd746fe0ebd9728c75e70ccc84553a0b3a25e54b238f36298367e927eeac87feea4d01d4283e11ef70a919a31553197156a4d8a68
+  data.tar.gz: 0c18b7c2ccc0e5ea5c1bb775aa286990bcd1ea254ececc70d35b386e5b6dde885c72b0b276aa9b524a9cccb2fbdbb673439c68ee6b046085c320cfe8becd8905

data/app/serializers/lab/lab_order_serializer.rb

@@ -87,21 +87,17 @@ module Lab
       concept = ConceptName.where(name: Lab::Metadata::TEST_TYPE_CONCEPT_NAME)
                            .select(:concept_id)
       LabTest.unscoped.where(concept_id: concept, order_id: order.order_id, voided: 0)
-             .order(:date_created, :obs_id)
     end
 
     def self.voided_tests(order)
       concept = ConceptName.where(name: Lab::Metadata::TEST_TYPE_CONCEPT_NAME)
                            .select(:concept_id)
       LabTest.unscoped.where(concept_id: concept, order_id: order.order_id, voided: 1)
-             .order(:date_voided, :obs_id)
     end
 
     def self.order_observation(order, concept_name)
       concept = ConceptName.where(name: concept_name).select(:concept_id)
-      Observation.unscoped.where(order_id: order.order_id, concept_id: concept, voided: 0)
-                 .order(:date_created, :obs_id)
-                 .first
+      Observation.unscoped.find_by(order_id: order.order_id, concept_id: concept, voided: 0)
     end
 
     def self.latest_order_status(order)

data/app/services/lab/notification_service.rb

@@ -52,14 +52,13 @@ class Lab::NotificationService
       ) do |new_alert|
         # Only set these attributes on creation
         new_alert.text = alert_message.to_json
-        new_alert.date_to_expire = Time.now + not_period.days
+        new_alert.date_to_expire = Time.now + notification_period.days
         new_alert.creator = lab
         new_alert.changed_by = lab
         new_alert.date_created = Time.now
       end
 
-      # Only notify if this is a new record (not a duplicate)
-      notify(alert, User.joins(:roles).uniq) if alert.previously_new_record?
+      notify(alert, users(order_location(alert.order_id)))
     rescue ActiveRecord::RecordNotUnique
       # Handle race condition if unique constraint exists
       Rails.logger.info("Duplicate notification prevented for test_type: #{test_type_id}, order: #{order_id}, specimen: #{specimen_id}")
@@ -70,15 +69,29 @@ class Lab::NotificationService
     end
   end
 
-  def not_period
+  def notification_period
     result = GlobalProperty.where(property: 'notification.period')&.first
     return result.property_value.to_i if result.present?
 
     7 # default to 7 days
   end
 
-  def notify(notification_alert, recipients)
+  def users(location_id = nil)
+    return User.joins(:roles).where(location_id: location_id).uniq if location_id.present? && User.column_names.include?('location_id')
+
+    User.joins(:roles).uniq
+  end
+
+  def order_location(order_id)
+    return nil unless Observation.column_names.include?('location_id')
+
+    Observation.find_by(order_id: order_id)&.location_id
+  end
+
+  def notify(notification_alert, recipients)    
     recipients.each do |recipient|
+      next if recipient.notification_alert_recipients.exists?(alert_id: notification_alert.id)
+
       recipient.notification_alert_recipients.create(
         alert_id: notification_alert.id
       )

data/app/services/lab/results_service.rb

@@ -63,7 +63,7 @@ module Lab
 
       def process_result_completion(results_obs, serializer, result_enter_by)
         process_acknowledgement(results_obs, result_enter_by)
-        precess_notification_message(results_obs, serializer, result_enter_by)
+        process_notification_message(results_obs, serializer, result_enter_by)
       rescue StandardError => e
         Rails.logger.error("Lab::ResultsService: Error in post-result processing: #{e.message}")
         Rails.logger.error(e.backtrace.join("\n"))
@@ -72,7 +72,7 @@ module Lab
 
       private
 
-      def precess_notification_message(result, values, result_enter_by)
+      def process_notification_message(result, values, result_enter_by)
         order = Order.find(result.order_id)
         test_concept_id = result.test&.value_coded
         uniq_checkers = {

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.4.2-beta'.freeze
+  VERSION = '2.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.4.2.pre.beta
+  version: 2.4.3
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -342,9 +342,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: