mahis_emr_api_lab 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1564986977bbbb02dab3359307faa412965cecb2a0aaa3d0cc97b9e2ef068f92
-  data.tar.gz: 42fcee721977f3cbc1fd29f8f184b23e532cde82bf9846494c90bf1285f0d773
+  metadata.gz: 114c56e62980ef6a721d63240bb14fe640076d26cafb7d4c3fe41483786c9466
+  data.tar.gz: 4cdd59a7566f7128e0b6bfa6589d3525559a981891879c42b37e208489e7ca35
 SHA512:
-  metadata.gz: 91179c762c1d91c33d6ca6c6c751ff73102b8a4e8ac9f191e3eb2aa00e0ccfa9a1e16f69accb3f19ec9d1a54f25b0066f17de4d47560c0c976d47859ad9240b9
-  data.tar.gz: f91bb3ab835a5ec653fdaa9666475b2d26f1e0acc2d43d8d753456c748137051d6ef364bf5709bc9569f774ecd0758022f798f1a5786b59c638d878c473b2fac
+  metadata.gz: 1a73a0cd671d283d5cda912c1ee324eaa6fe5ba15ea25e2864fb50c40e7bf474b2bd517b243a664dca1a15a8850f6a4cef503b114f0db333a3aaa6b807739366
+  data.tar.gz: 20e8eb0cda6e7840b38015ee6c25fb1833e07da1fce05e27e30111e29e5efc94b633902068cc2c2dbc3479574cc8291cc863b122c9e547d5e6b45c6f84a470a2

data/app/controllers/lab/labels_controller.rb

@@ -2,7 +2,8 @@
 
 module Lab
   class LabelsController < ApplicationController
-    skip_before_action :authenticate
+    _callbacks = _process_action_callbacks.map(&:filter)
+    skip_before_action :authenticate if _callbacks.include?(:authenticate)
 
     def print_order_label
       order_id = params.require(:order_id)

data/app/controllers/lab/users_controller.rb

@@ -3,7 +3,8 @@
 # This controller handles creation and authentication of LIMS User
 module Lab
   class UsersController < ::ApplicationController
-    skip_before_action :authenticate
+     _callbacks = _process_action_callbacks.map(&:filter)
+    skip_before_action :authenticate if _callbacks.include?(:authenticate)
     # create a LIMS User that will be responsible for sending lab results
     def create
       user_params = params.permit(:username, :password)

data/app/models/lab/lab_result.rb

@@ -2,6 +2,10 @@
 
 module Lab
   class LabResult < Observation
+    def children
+      Observation.where(obs_group_id: obs_id, voided: 0)
+    end
+    
     alias measures children
 
     default_scope do

data/app/serializers/lab/lab_order_serializer.rb

@@ -2,9 +2,10 @@
 
 module Lab
   module LabOrderSerializer
-    def self.serialize_order(order, tests: nil, requesting_clinician: nil, reason_for_test: nil, target_lab: nil)
+    def self.serialize_order(order, tests: nil, requesting_clinician: nil, reason_for_test: nil, target_lab: nil, comment_to_fulfiller: nil)
       tests ||= order.voided == 1 ? voided_tests(order) : order.tests
       requesting_clinician ||= order.requesting_clinician
+      comment_to_fulfiller ||= order.comment_to_fulfiller
       reason_for_test ||= order.reason_for_test
       target_lab = target_lab&.value_text || order.target_lab&.value_text || Location.current_health_center&.name
       ActiveSupport::HashWithIndifferentAccess.new(
@@ -21,6 +22,7 @@ module Lab
           },
           requesting_clinician: requesting_clinician&.value_text,
           target_lab: target_lab,
+          comment_to_fulfiller: comment_to_fulfiller&.value_text,
           reason_for_test: {
             concept_id: reason_for_test&.value_coded,
             name: concept_name(reason_for_test&.value_coded)

data/app/services/lab/lims/api/{couchdb_api.rb → couch_db_api.rb}

@@ -33,7 +33,7 @@ module Lab
           bum.binge_changes(since: from, limit: limit, include_docs: true) do |change|
             next unless change['doc']['type']&.casecmp?('Order')
 
-            yield OrderDTO.new(change['doc']), self
+            yield OrderDto.new(change['doc']), self
           end
         end
 

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

@@ -162,7 +162,7 @@ module Lab
           drawn_by_first_name, drawn_by_last_name = specimen['drawn_by_name']&.split
           patient_first_name, patient_last_name = patient['name'].split
 
-          OrderDTO.new(
+          OrderDto.new(
             _id: specimen['doc_id'].blank? ? SecureRandom.uuid : specimen['doc_id'],
             _rev: '0',
             tracking_number: specimen['tracking_number'],

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

@@ -198,7 +198,7 @@ class Lab::Lims::Api::RestApi
   end
 
   ##
-  # Converts an OrderDTO to parameters for POST /create_order
+  # Converts an OrderDto to parameters for POST /create_order
   def make_create_params(order_dto)
     {
       tracking_number: order_dto.fetch(:tracking_number),
@@ -227,7 +227,7 @@ class Lab::Lims::Api::RestApi
   end
 
   ##
-  # Converts an OrderDTO to parameters for POST /update_order
+  # Converts an OrderDto to parameters for POST /update_order
   def make_update_params(order_dto)
     date_updated, status = sample_drawn_status(order_dto)
 
@@ -255,7 +255,7 @@ class Lab::Lims::Api::RestApi
   end
 
   ##
-  # Extracts sample drawn status from an OrderDTO
+  # Extracts sample drawn status from an OrderDto
   def sample_drawn_status(order_dto)
     order_dto[:sample_statuses].each do |trail_entry|
       date, status = trail_entry.each_pair.find { |_date, status| status['status'].casecmp?('Drawn') }
@@ -268,13 +268,13 @@ class Lab::Lims::Api::RestApi
   end
 
   ##
-  # Extracts a sample drawn date from a LIMS OrderDTO.
+  # Extracts a sample drawn date from a LIMS OrderDto.
   def sample_drawn_date(order_dto)
     sample_drawn_status(order_dto).first
   end
 
   ##
-  # Extracts the requesting clinician from a LIMS OrderDTO
+  # Extracts the requesting clinician from a LIMS OrderDto
   def requesting_clinician(order_dto)
     orderer = order_dto[:who_order_test]
 

data/app/services/lab/lims/exceptions.rb

@@ -2,10 +2,12 @@
 
 module Lab
   module Lims
-    class LimsException < StandardError; end
-    class DuplicateNHID < LimsException; end
-    class MissingAccessionNumber < LimsException; end
-    class UnknownSpecimenType < LimsException; end
-    class UnknownTestType < LimsException; end
+    module Exceptions
+      class LimsException < StandardError; end
+      class DuplicateNHID < LimsException; end
+      class MissingAccessionNumber < LimsException; end
+      class UnknownSpecimenType < LimsException; end
+      class UnknownTestType < LimsException; end
+    end
   end
 end

data/app/services/lab/lims/migrator.rb

@@ -29,7 +29,7 @@ require 'lab/lab_test'
 require 'lab/lims_order_mapping'
 require 'lab/lims_failed_import'
 
-require_relative './api/couchdb_api'
+require_relative './api/couch_db_api'
 require_relative './config'
 require_relative './pull_worker'
 require_relative './utils'
@@ -82,7 +82,7 @@ module Lab
               next unless row['doc']['type']&.casecmp?('Order')
 
               User.current = Utils.lab_user
-              yield OrderDTO.new(row['doc']), OpenStruct.new(last_seq: (from || 0) + limit, current_seq: from)
+              yield OrderDto.new(row['doc']), OpenStruct.new(last_seq: (from || 0) + limit, current_seq: from)
             end
 
             from += orders.size

data/app/services/lab/lims/order_dto.rb

@@ -6,7 +6,7 @@ module Lab
   module Lims
     ##
     # LIMS' Data Transfer Object for orders
-    class OrderDTO < ActiveSupport::HashWithIndifferentAccess
+    class OrderDto < ActiveSupport::HashWithIndifferentAccess
       include Utils
 
       ##

data/app/services/lab/lims/order_serializer.rb

@@ -7,14 +7,14 @@ require_relative './utils'
 module Lab
   module Lims
     ##
-    # Serializes a LabOrder into a LIMS OrderDTO.
+    # Serializes a LabOrder into a LIMS OrderDto.
     module OrderSerializer
       class << self
         include Utils
 
         def serialize_order(order)
           serialized_order = Lims::Utils.structify(Lab::LabOrderSerializer.serialize_order(order))
-          Lims::OrderDTO.new(
+          Lims::OrderDto.new(
             _id: Lab::LimsOrderMapping.find_by(order: order)&.lims_id || serialized_order.accession_number,
             tracking_number: serialized_order.accession_number,
             sending_facility: current_facility_name,

data/app/services/lab/lims/worker.rb

@@ -2,7 +2,7 @@
 
 require 'logger_multiplexor'
 
-require_relative './api/couchdb_api'
+require_relative './api/couch_db_api'
 
 module Lab
   module Lims

data/app/services/lab/metadata.rb

@@ -5,6 +5,7 @@ module Lab
     # Concepts
     REASON_FOR_TEST_CONCEPT_NAME = 'Reason for test'
     REQUESTING_CLINICIAN_CONCEPT_NAME = 'Person making request'
+    COMMENT_TO_FULFILLER_CONCEPT_NAME = 'Comment to fulfiller'
     SPECIMEN_TYPE_CONCEPT_NAME = 'Specimen type'
     TARGET_LAB_CONCEPT_NAME = 'Lab'
     TEST_RESULT_CONCEPT_NAME = 'Lab test result'

data/app/services/lab/orders_service.rb

@@ -63,7 +63,8 @@ module Lab
           Lab::LabOrderSerializer.serialize_order(
             order, requesting_clinician: add_requesting_clinician(order, order_params),
                    reason_for_test: add_reason_for_test(order, order_params),
-                   target_lab: add_target_lab(order, order_params)
+                   target_lab: add_target_lab(order, order_params),
+                   comment_to_fulfiller: add_comment_to_fulfiller(order, order_params)
           )
         end
       end
@@ -97,11 +98,12 @@ module Lab
       end
 
       def void_order(order_id, reason)
-        order = Lab::LabOrder.includes(%i[requesting_clinician reason_for_test target_lab], tests: [:result])
+        order = Lab::LabOrder.includes(%i[requesting_clinician reason_for_test target_lab comment_to_fulfiller], tests: [:result])
                              .find(order_id)
 
         order.requesting_clinician&.void(reason)
         order.reason_for_test&.void(reason)
+        order.comment_to_fulfiller&.void(reason)
         order.target_lab&.void(reason)
 
         order.tests.each { |test| test.void(reason) }
@@ -224,6 +226,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]
+        order.comment_to_fulfiller = params[:comment_to_fulfiller] if params[:comment_to_fulfiller]
         order.accession_number = access_number
         order.orderer = User.current&.user_id
 
@@ -256,6 +259,15 @@ module Lab
         )
       end
 
+      def add_comment_to_fulfiller(order, params)
+        create_order_observation(
+          order,
+          Lab::Metadata::COMMENT_TO_FULFILLER_CONCEPT_NAME,
+          params[:date],
+          value_text: params['comment_to_fulfiller']
+        )
+      end
+
       ##
       # Attach a reason for the order/test
       #

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '1.2.4'
+  VERSION = '1.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mahis_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.7'
 description: |
   This adds a lab interface to the OpenMRS compatible core API provided by
   [HIS-EMR-API](https://github.com/EGPAFMalawiHIS/HIS-EMR-API).
@@ -254,7 +254,7 @@ files:
 - app/services/lab/lims/acknowledgement_serializer.rb
 - app/services/lab/lims/acknowledgement_worker.rb
 - app/services/lab/lims/api/blackhole_api.rb
-- app/services/lab/lims/api/couchdb_api.rb
+- app/services/lab/lims/api/couch_db_api.rb
 - app/services/lab/lims/api/mysql_api.rb
 - app/services/lab/lims/api/rest_api.rb
 - app/services/lab/lims/api/ws_api.rb
@@ -309,7 +309,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EGPAFMalawiHIS/his_emr_api_lab
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -324,8 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []