his_emr_api_lab 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df320fe6cce133cd3cd516aebd842d8a9ab7320cb9cb5e2e79340f60b49539f
-  data.tar.gz: 3d6ce39059259b7ce8cf6d7c0bc8c80ebf6d5ffc8866acdf1eebe31fa525d4d1
+  metadata.gz: 6142a8351eea3dc6cc2dde34b014948bd95c5d4398355ddc29d2aa0ddff8c095
+  data.tar.gz: ca4493c370000ab13cae02629c8cc3ea840f9bf03a70dee35a3f8bc3574e12e3
 SHA512:
-  metadata.gz: 6aa3de66346efe68f9fd54cc1bea99867a7db756788d05e3e5bf642c5d4bd6ae54b50c075e99d8819f309e4649edfdbcda7cb9ff7130fa6175e29d2b585aa55d
-  data.tar.gz: ae44bc491a32582b695aad56c0abfbb21cbd4b1f40843ad9f17cd2ff4d05205fbb5226c1e1cedb24eab9d3700ac6d0e54ba5256f8abb99796cc7827772ff47ec
+  metadata.gz: b18abf5a9f7e00c213ff41bea37c924f7c5abafbfefd5f63727c76093d26e057391ddb047e4a2583fbfdb9d98bd05895387cc6b26aacfe54df4a290cb804f9b9
+  data.tar.gz: e7e23b2a1eb5d387855e7acc7e1bd60dcdfca08938245693a07833a6fc43314e1127a9108eaaf8e1536fa3e16acaaa74ecf104d107b3fb71a98ad9b0c4b8a875

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

@@ -209,7 +209,7 @@ module Lab
         raise MissingAccessionNumber if order_dto[:tracking_number].blank?
 
         logger.info("Importing LIMS order ##{order_dto[:tracking_number]}")
-        mapping = LimsOrderMapping.find_by(lims_id: order_dto[:_id])
+        mapping = find_order_mapping_by_lims_id(order_dto[:_id])
 
         ActiveRecord::Base.transaction do
           if mapping
@@ -221,7 +221,6 @@ module Lab
                                               order_id: order['id'],
                                               pulled_at: Time.now,
                                               revision: order_dto['_rev'])
-            byebug unless mapping.errors.empty?
           end
 
           order
@@ -339,6 +338,16 @@ module Lab
       def last_seq_path
         LIMS_LOG_PATH.join('last_seq.dat')
       end
+
+      def find_order_mapping_by_lims_id(lims_id)
+        mapping = Lab::LimsOrderMapping.find_by(lims_id: lims_id)
+        return nil unless mapping
+
+        return mapping if Lab::LabOrder.where(order_id: mapping.order_id).exists?
+
+        mapping.destroy
+        nil
+      end
     end
   end
 end

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest