his_emr_api_lab 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f50deefb7cbd1c86b4b08b3c22d173f48a1a8da57399051247a6cd71fdc631ae
-  data.tar.gz: 621cb083624e5fde98f425946a0efbfcf8104151140d72c9047a478fab4ca305
+  metadata.gz: ea9b8787072da5656c0ff4f6a2e42fa83681842bec516d07af6634798ccdb104
+  data.tar.gz: 9c691c8f25fffc12c055481698c90817f12ea667c622652cb55d9f74741c848d
 SHA512:
-  metadata.gz: dbf52fd1e2efb47895308e668f120de8ae39abbd4ca51ed3a9a32f494669db317dfb3be1b5fb86bd5a770311fb175a06ed127c29a0a8296c2d6275db3f57b4b9
-  data.tar.gz: 9379bc707799b2db5cca3d4033c3b845a802a7b811584ed057235e407a405ebc09d99a6614e7c21a2835494e0df64f06c6d02ca8e71ae6e6a02ad5ce074b8dfe
+  metadata.gz: 2799cfe52b7a0f01f9e07fa61fdf1a1355b8ddad2c2f6642bc731b82e25337936c1cea8c4100000e9787268ffd43504df2642faaf4a48281299403f1311692a3
+  data.tar.gz: a97f6b54b8a78a07a41740c01192d73ea779236ba9caeb34c5b884dd61cc74ac1256f5a728a64f2c76bdd3a260644443cd20af46ffb2b749473b715a0228cc06

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

@@ -607,11 +607,13 @@ module Lab
         end
 
         def orders_pending_updates(patient_id = nil, start_date: nil)
-          Rails.logger.info('Looking for orders that need to be updated...')
+          Rails.logger.info("Looking for orders that need to be updated... [patient_id=#{patient_id}] [start_date=#{start_date}]")
           orders = {}
-
+          Rails.logger.info("Fetching orders without specimen...")
           orders_without_specimen(patient_id, start_date: start_date).each { |order| orders[order.order_id] = order }
+          Rails.logger.info("Fetching orders without results...")
           orders_without_results(patient_id, start_date: start_date).each { |order| orders[order.order_id] = order }
+          Rails.logger.info("Fetching orders without reason...")
           orders_without_reason(patient_id, start_date: start_date).each { |order| orders[order.order_id] = order }
 
           orders.values

data/app/services/lab/notification_service.rb

@@ -88,13 +88,40 @@ class Lab::NotificationService
     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)
+  # Was one exists? + one create per recipient (2 round trips x N users,
+  # sequentially) - the slow part users() and order_location() were feeding
+  # into. notification_alert_recipient's primary key is (alert_id, user_id),
+  # so a single batched insert_all does the "notify each user at most once
+  # per alert" dedup at the DB level instead of a round trip per user.
+  #
+  # Plain insert_all, no unique_by/on_duplicate kwargs - verified live
+  # against this app's Rails 8.1/mysql2 combination:
+  #   - relation.rb's insert_all hardcodes InsertAll.execute(..., on_duplicate:
+  #     :skip, ...) internally; on_duplicate isn't a caller-facing keyword at
+  #     all (passing it raises "unknown keyword: :on_duplicate"), and skip-on-
+  #     duplicate is already what plain insert_all does by default.
+  #   - unique_by IS a caller-facing keyword, but only for adapters that need
+  #     to be told which constraint backs the ON CONFLICT target (e.g.
+  #     Postgres). Passing it here raises "Mysql2Adapter does not support
+  #     :unique_by" - MySQL's own INSERT IGNORE applies to any unique/primary
+  #     -key violation on the table, so it needs nothing extra to know that
+  #     (alert_id, user_id) is the key to dedup against.
+  #
+  # insert_all skips AR callbacks, so uuid - the one thing the model's
+  # before_create/before_save would have set - is generated here;
+  # alert_read/cleared/date_changed are left to their column defaults.
+  # Chunked so one notification fan-out to a very large recipient list
+  # doesn't become a single giant statement.
+  BATCH_SIZE = 1000
+
+  def notify(notification_alert, recipients)
+    rows = recipients.pluck(:user_id).map do |user_id|
+      { alert_id: notification_alert.id, user_id: user_id, uuid: SecureRandom.uuid }
+    end
+    return if rows.empty?
 
-      recipient.notification_alert_recipients.create(
-        alert_id: notification_alert.id
-      )
+    rows.each_slice(BATCH_SIZE) do |batch|
+      NotificationAlertRecipient.insert_all(batch)
     end
   end
 

data/app/services/lab/orders_search_service.rb

@@ -25,7 +25,14 @@ module Lab
       end
 
       def find_orders_without_results(patient_id: nil)
-        results_query = Lab::LabResult.all
+        # order_id IS NOT NULL matters here, not just there: SQL's NOT IN is
+        # poisoned by a single NULL in the subquery — `x NOT IN (1, NULL)` is
+        # never true for any x, because `x <> NULL` is unknown rather than
+        # true/false, and one unknown collapses the whole AND chain. Some
+        # legacy "Lab test result" observations have a NULL order_id, so
+        # without this filter, one such row for a patient silently zeroes out
+        # every order this returns for them, not just the row with the NULL.
+        results_query = Lab::LabResult.all.where.not(order_id: nil)
         results_query = results_query.where(person_id: patient_id) if patient_id
 
         query = Lab::LabOrder.where.not(order_id: results_query.select(:order_id))

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.4.4'.freeze
+  VERSION = '2.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-24 00:00:00.000000000 Z
+date: 2026-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest