dde_mahis 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f952383908647ed314df37a42487c17d0c8d2a6ae648d782e1ba3f7963b68bc
-  data.tar.gz: 6813646ff087268ac86ede1a612bbd7a629fb7995eb27fbf6766fc2ccde56929
+  metadata.gz: 69b7d105c7767e5989ec3b1617f6c985c322c298447cf33dd3560e9a8426d77d
+  data.tar.gz: 03351fd8551cbb69ea2dde9e6a1411d4330bf91c6e9708955a5863b8cf9e5de8
 SHA512:
-  metadata.gz: d4fa530c8a5e46a1e050eddf7ddc79c16ceeb5a0aa77aa4f3fef3908c71f1d7818aa70930af39f74e78fe545bc232b9b4a94bf115a8cb8843f4c057fd7fd878a
-  data.tar.gz: aa1ca19284efd2606d211f23c137d4293c88799fa074fefc3c568d54aee8fba70286c18b5ab48c86a31108cbf3efaf430a92728c28553d8292ebe3c0e7b0bafe
+  metadata.gz: 5736f44a360881606509b037ca814e96021a07db82a7ccff8d00815042a427619da7d6b0e126c4e232b105797e8b0e9fe75c9a198f33f70a396483f91d0e96fa
+  data.tar.gz: 4b4811eb1462631b358ac2a5468c5cd9cee3cdbb3eb96bf264bbae15d9371db43a387dd9665e0d0b43ffbf71c1d95e0174526b7615d4995743036d2cd8c92dcc

data/app/services/dde_service.rb

@@ -48,8 +48,8 @@ class DdeService
   # Registers local OpenMRS patient in DdeMahis
   #
   # On success patient get two identifiers under the types
-  # 'DdeMahis person document ID' and 'National id'. The
-  # 'DdeMahis person document ID' is the patient's record ID in the local
+  # 'Dde Person Document ID' and 'National id'. The
+  # 'Dde Person Document ID' is the patient's record ID in the local
   # DdeMahis instance and the 'National ID' is the national unique identifier
   # for the patient.
   def create_patient(patient)
@@ -139,7 +139,7 @@ class DdeService
 
   # Import patients from DdeMahis using doc id
   def import_patients_by_doc_id(doc_id)
-    doc_id_type = patient_identifier_type('DdeMahis person document id')
+    doc_id_type = patient_identifier_type('Dde Person Document ID')
     locals = patient_service.find_patients_by_identifier(doc_id, doc_id_type).limit(PATIENT_SEARCH_RESULTS_LIMIT)
     remotes = find_remote_patients_by_doc_id(doc_id)
 
@@ -189,7 +189,7 @@ class DdeService
   end
 
   def find_patient_updates(local_patient_id)
-    dde_doc_id_type = PatientIdentifierType.where(name: 'DdeMahis Person Document ID')
+    dde_doc_id_type = PatientIdentifierType.where(name: 'Dde Person Document ID')
     doc_id = PatientIdentifier.find_by(patient_id: local_patient_id, identifier_type: dde_doc_id_type)
                               &.identifier
     return nil unless doc_id
@@ -225,7 +225,7 @@ class DdeService
     response.collect do |match|
       doc_id = match['person']['id']
       patient = patient_service.find_patients_by_identifier(
-        doc_id, patient_identifier_type('DdeMahis person document id')
+        doc_id, patient_identifier_type('Dde Person Document ID')
       ).first
       match['person']['patient_id'] = patient&.id
       match
@@ -455,7 +455,7 @@ class DdeService
   # Checks if patient only exists on local database
   def local_only_patient?(patient)
     !(patient.patient_identifiers.where(identifier_type: patient_identifier_type('National id')).exists?\
-      && patient.patient_identifiers.where(identifier_type: patient_identifier_type('DdeMahis person document id')).exists?)
+      && patient.patient_identifiers.where(identifier_type: patient_identifier_type('Dde Person Document ID')).exists?)
   end
 
   # Matches local and remote patient
@@ -501,7 +501,7 @@ class DdeService
     [PatientIdentifier.new(identifier: remote_patient['npid'],
                            identifier_type: patient_identifier_type('National ID')),
      PatientIdentifier.new(identifier: remote_patient['doc_id'],
-                           identifier_type: patient_identifier_type('DdeMahis Person Document ID'))]
+                           identifier_type: patient_identifier_type('Dde Person Document ID'))]
   end
 
   def localise_remote_patient_names(remote_patient)
@@ -578,7 +578,7 @@ class DdeService
       }
     )
 
-    doc_id = patient.patient_identifiers.where(identifier_type: patient_identifier_type('DdeMahis person document id')).first
+    doc_id = patient.patient_identifiers.where(identifier_type: patient_identifier_type('Dde Person Document ID')).first
     dde_patient[:doc_id] = doc_id.identifier if doc_id
 
     LOGGER.debug "Converted openmrs person to dde_patient: #{dde_patient}"
@@ -607,19 +607,19 @@ class DdeService
   def patient_doc_id(patient)
     PatientIdentifier
       .joins(:identifier_type)
-      .merge(PatientIdentifierType.where(name: 'DdeMahis person document id'))
+      .merge(PatientIdentifierType.where(name: 'Dde Person Document ID'))
       .where(patient: patient)
       .first
       &.identifier
   end
 
   def dde_doc_id_type
-    PatientIdentifierType.find_by_name('DdeMahis Person document ID')
+    PatientIdentifierType.find_by_name('Dde Person Document ID')
   end
 
   def find_patients_by_doc_id(doc_ids)
     identifiers = PatientIdentifier.joins(:identifier_type)
-                                   .merge(PatientIdentifierType.where(name: 'DdeMahis Person Document ID'))
+                                   .merge(PatientIdentifierType.where(name: 'Dde Person Document ID'))
                                    .where(identifier: doc_ids)
     Patient.joins(:identifiers).merge(identifiers).distinct
   end

data/app/services/merging_service.rb

@@ -81,7 +81,7 @@ class MergingService
 
     national_id_type = patient_identifier_type('National id')
     old_identifier = patient_identifier_type('Old Identification Number')
-    doc_id_type = patient_identifier_type('DdeMahis person document id')
+    doc_id_type = patient_identifier_type('Dde Person Document ID')
 
     local_patient.patient_identifiers.where(type: [national_id_type, doc_id_type, old_identifier]).each do |identifier|
       # We are now voiding all ids
@@ -93,7 +93,7 @@ class MergingService
       identifier.void("Assigned new id: #{remote_patient['doc_id']}")
     end
 
-    create_local_patient_identifier(local_patient, remote_patient['doc_id'], 'DdeMahis person document id')
+    create_local_patient_identifier(local_patient, remote_patient['doc_id'], 'Dde Person Document ID')
     create_local_patient_identifier(local_patient, find_remote_patient_npid(remote_patient), 'National id')
 
     local_patient.reload
@@ -107,7 +107,7 @@ class MergingService
     end
 
     identifier_exists['National id',
-                      remote_patient['npid']] && identifier_exists['DdeMahis person document id', remote_patient['doc_id']]
+                      remote_patient['npid']] && identifier_exists['Dde Person Document ID', remote_patient['doc_id']]
   end
 
   private

data/app/services/rollback_service.rb

@@ -18,7 +18,7 @@ class RollbackService
         @merge_type = record['merge_type']
         Rails.logger.debug("Processing rollback for patients: #{primary_patient} <=> #{secondary_patient}")
         process_rollback
-        MergeAudit.find(record['id']).void("Rolling back to #{secondary_patient}")
+        ::MergeAudit.find(record['id']).void("Rolling back to #{secondary_patient}")
         @common_void_reason = nil
       end
     end
@@ -47,7 +47,7 @@ class RollbackService
       SELECT identifier
       FROM patient_identifier
       WHERE patient_id = #{patient_id}
-      AND identifier_type = #{PatientIdentifierType.find_by_name!('DdeMahis person document ID').id}
+      AND identifier_type = #{PatientIdentifierType.find_by_name!('Dde Person Document ID').id}
     SQL
     result.blank? ? nil : result['identifier']
   end

data/lib/dde_mahis/version.rb

@@ -1,3 +1,3 @@
 module DdeMahis
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dde_mahis
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - brian-mw
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-16 00:00:00.000000000 Z
+date: 2025-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails