his_emr_api_lab 2.3.8 → 2.3.9.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7a7342538d7d538f428dcdd2b275fdb344c58fd357d54e8582f4e838c2a12f
-  data.tar.gz: b18f15f0c432db303b3b7ebde6987a58333e1117b7f292062ba3650efdb07fb1
+  metadata.gz: 765ba6c202e8acbcc7b4c527f825712faaa90dcf6065652b8af1af697ad95a43
+  data.tar.gz: 7c669c0d903dd3f55269a771faf3987f92c35b2d4e6c6f9ff0649bf886ad44c9
 SHA512:
-  metadata.gz: e0cec0ece1963d176983de30fcc5fd28c284c147daa48657b04461f7ffc202bb78fef7d3e15e51a33d5f0cfb6ac597ba6134bbbe78b910afb1175a7d5b017bce
-  data.tar.gz: baeae9fa92dd7be44cf7659650799f6672e22be67aa34138d171b9affc88d4cba2b401cc1483eda52a419456df83b88173253afcf66f296d1b815ecc0f6ce445
+  metadata.gz: b86dd7203397f49373d56a54738f17959732e2b8a334da57c24a62396c86f4b125d8bc52aabcab0e21dc34fd661e10ecec49f58c82967ebc9b77a6b6a1afd785
+  data.tar.gz: 0131d1135c05cbe03b41ce3e05993087607cffbc28c7845c530df10a740ff16f0c6697880142816dc656c280b8766a4bed47e2cbcbef093a4cd0ab40629152e1

data/app/services/lab/notification_service.rb

@@ -27,22 +27,46 @@ class Lab::NotificationService
     end
   end
 
-  def create_notification(alert_type, alert_message)
+  def create_notification(alert_type, alert_message,
+                          uniq_checkers: { test_type_id: nil, order_id: nil, specimen_id: nil })
     return if alert_type != 'LIMS'
 
-    # Use unscoped to find user regardless of location context
-    lab = Lab::Lims::Utils.lab_user
+    test_type_id = uniq_checkers[:test_type_id]
+    order_id = uniq_checkers[:order_id]
+    specimen_id = uniq_checkers[:specimen_id]
+
+    return unless test_type_id.present? && order_id.present? && specimen_id.present?
 
+    lab = Lab::Lims::Utils.lab_user
     unless lab
       Rails.logger.warn('NotificationService: lab_daemon user not found, skipping notification creation')
       return
     end
 
     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)
-      notify(alert, User.joins(:roles).uniq)
-      # ActionCable.server.broadcast('nlims_channel', alert)
+      # Atomic find or create - checks and creates in one operation
+      alert = NotificationAlert.find_or_create_by!(
+        test_type_id: test_type_id,
+        order_id: order_id,
+        specimen_id: specimen_id
+      ) 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.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?
+    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}")
+    rescue ActiveRecord::InvalidForeignKey => e
+      Rails.logger.error("Invalid foreign key: #{e.message}")
+    rescue StandardError => e
+      Rails.logger.error("Unexpected error: #{e.message}")
     end
   end
 

data/app/services/lab/results_service.rb

@@ -74,6 +74,11 @@ module Lab
       def precess_notification_message(result, values, result_enter_by)
         order = Order.find(result.order_id)
         test_concept_id = result.test&.value_coded
+        uniq_checkers = {
+          test_type_id: test_concept_id,
+          order_id: order&.order_id,
+          specimen_id: order.concept_id
+        }
 
         data = { Type: result_enter_by,
                  Specimen: get_test_catalog_name(order.concept_id) || ConceptName.find_by(concept_id: order.concept_id)&.name,
@@ -84,7 +89,7 @@ module Lab
                  PatientID: result.person_id,
                  '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)
+        NotificationService.new.create_notification(result_enter_by, data, uniq_checkers: uniq_checkers)
       end
 
       def process_acknowledgement(results, results_enter_by)

data/lib/lab/version.rb

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

metadata

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