renalware-core 2.0.86 → 2.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0619a3c5a98002ec8281db110db2468f2fec1a263ebe187f4633bdeec2128ee
-  data.tar.gz: a750c55b958f4f1d87248209e88d2b7b7e236a845cc572137568ada6b3d65b14
+  metadata.gz: 6862e9a5b2b690ebc9b8a96c8202b0b08227d0f2bc0aea9633e9405301da3d62
+  data.tar.gz: e2537d376ecacc0a4905382a8abe12fbf79af6dff901479a51aadf004cc71114
 SHA512:
-  metadata.gz: a5a356a8c8090597b1a2b1ed972a1ebe908cf77a412bcd55c2a54a7e0b069838a8c4b4858bf62995e93e23d1d95a1123205b2e42e656254e9a5e6d130d22abd1
-  data.tar.gz: 96719750e97f20df80adc68330d1a5a15c44519136411e60c8885fabddcd0e044e03a42a7bfa0ce7b7e9ab0bff9578c9bc1acf6434fe8e90598f550dea63608a
+  metadata.gz: 4d07603534caca499ceed69353afe2a694f39c8768286680e1773ba5ab0bd7b5f2e1122f9a91ee260f31521a94a01370cdd353e7d348c610862bad829d1af7e4
+  data.tar.gz: ffbb71aafaeda1f69c821f3ca00d5eb3ef7b22931b484fe7bcac80f33c6e082a393f1e35d7b7695854ddc8d41edf70ab4044115e6c660307b865f5ee1cfbb82e

data/app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb

@@ -8,7 +8,7 @@ module Renalware
     # Using a working folder with a timestamp name, find matching patients and for each, generate
     # an XML file (see UKRDC Schema) containing changes since the last time we sent the URDC data
     # about them. Encrypt the xml files and copy to an outgoing folder
-    # which might for example be a symlink to an outgoing folder in /mmedia/ukrdc which in turn
+    # which might for example be a symlink to an outgoing folder in /media/ukrdc which in turn
     # is mount on a remote share for example on an SFTP server.
     #
     class CreateEncryptedPatientXMLFiles

data/app/models/renalware/zip_archive.rb

@@ -9,7 +9,9 @@ module Renalware
     end
 
     def unzip
-      Dir.mktmpdir(nil, Rails.root.join("tmp").to_s) do |dir|
+      # Create a tmp dir and ensure PG has access to it.
+      Dir.mktmpdir do |dir|
+        `chmod a+rX #{dir}`
         files = unzip_to_tmp_dir_and_return_pathames_array(dir)
         yield(files)
       end

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -11,11 +11,14 @@ path = "renalware/api/ukrdc/patients" # or "."
 
 xml.Patient do
   xml.PatientNumbers do
-    xml.PatientNumber do
-      xml.Number patient.nhs_number
-      xml.Organization "NHS"
-      xml.NumberType "NI"
+    if patient.nhs_number.present?
+      xml.PatientNumber do
+        xml.Number patient.nhs_number
+        xml.Organization "NHS"
+        xml.NumberType "NI"
+      end
     end
+
     Renalware.config.patient_hospital_identifiers.values.each do |field|
       next if (number = patient.public_send(field)).blank?
 
@@ -65,7 +68,8 @@ xml.Patient do
     end
   end
 
-  if patient.language.present?
+  # Omit 'Other' language as it is not part of the ISO set, but we have it for some reason
+  if patient.language.present? && patient.language.code != "ot"
     xml.PrimaryLanguage do
       xml.CodingStandard "NHS_DATA_DICTIONARY_LANGUAGE_CODE" # ISO 639-1 plus braille and sign
       xml.Code patient.language&.code

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.86"
+  VERSION = "2.0.87"
 end

data/spec/factories/patients/languages.rb

@@ -19,5 +19,10 @@ FactoryBot.define do
       name { "Unknown" }
       code { "un" }
     end
+
+    trait :other do
+      name { "Other" }
+      code { "ot" }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.86
+  version: 2.0.87
 platform: ruby
 authors:
 - Airslie