renalware-core 2.0.54 → 2.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850fb8d5f1245a54162eaa4fb6e075f272563bac0729d30d4209fbf34c3fd378
-  data.tar.gz: 90e3476b1530fb2d49447bd9a882e456bcdabe533004be2d060993b361b6c076
+  metadata.gz: 894fbb8d8d83ab547c7a25dec9e6d41eca0a9f9181bd55aef8ece1c65bc26523
+  data.tar.gz: 468716265e6688e6d1e66fa3c6d606948531853285cacb9a1249914c02d6cb21
 SHA512:
-  metadata.gz: 63f4a175065d5c917e9e12b70466482fd0a9b8dad17122024909e6eb6a13b1f82183520346755ca72dfc8e3dbd0c450cd95351e9dfd2d95ff0fcaa8788a44d27
-  data.tar.gz: cd8734fc777f8dc1fcb54ff4814aa6a9e23a0628e774c5224b427873455d937f6a173a62779ffbbdf4ea2dafd40f4ee795a259a1e3affbb09390f348066b178d
+  metadata.gz: 2c62a3d4fba4c48455a0882e1b7a3d4353b08a0c557858af1bc27f73387f63a24471d15b0915bf2246836b87b3d3f5478a37e8dc3b427d312ea56ef9a7e09cbc
+  data.tar.gz: 34a24963e66f3d60d6776e63b4233b4ebd36eff7a35ac384f5640442e07e2f32841204503329eb1e8b51e5ca9c1b479b4ec3d7bd94489e88a0b4248c2a942a5e

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+
+module Renalware
+  module UKRDC
+    class BatchNumber < ApplicationRecord
+      def self.next
+        new_batcher_number = new
+        new_batcher_number.save!
+        new_batcher_number.id.to_s.rjust(6, "0")
+      end
+    end
+  end
+end

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

@@ -12,7 +12,16 @@ module Renalware
     # is mount on a remote share for example on an SFTP server.
     #
     class CreateEncryptedPatientXMLFiles
-      attr_reader :patient_ids, :changed_since, :logger, :request_uuid, :paths, :timestamp, :summary
+      attr_reader(
+        :patient_ids,
+        :changed_since,
+        :logger,
+        :request_uuid,
+        :paths,
+        :timestamp,
+        :summary,
+        :batch_number
+      )
 
       def initialize(changed_since: nil, patient_ids: nil, logger: nil)
         @changed_since = Time.zone.parse(changed_since) if changed_since.present?
@@ -26,17 +35,22 @@ module Renalware
 
       def call
         logger.tagged(request_uuid) do
+          # Skipping transaction for now as worried about the quantity of rows and data invovled.
+          # ActiveRecord::Base.transaction do
+          @batch_number = BatchNumber.next
           summary.milliseconds_taken = Benchmark.ms do
             create_patient_xml_files
             encrypt_patient_xml_files
             copy_encrypted_xml_files_into_the_outgoing_folder
             paths.create_symlink_to_latest_timestamped_folder_so_it_is_easier_to_eyeball
           end
+          # end
           build_summary
           print_summary
           email_summary
         end
       rescue StandardError => exception
+        # TODO: if fails before copying to outgoing then we should roll back BatchNumber
         Engine.exception_notifier.notify(exception)
         raise exception
       end
@@ -52,6 +66,7 @@ module Renalware
             dir: paths.timestamped_xml_folder,
             changes_since: changed_since,
             request_uuid: request_uuid,
+            batch_number: batch_number,
             logger: logger
           ).call
         end
@@ -127,8 +142,7 @@ module Renalware
           recipient: config.ukrdc_gpg_recipient,
           keyring: config.ukrdc_gpg_keyring,
           homedir: config.ukrdc_gpg_homedir,
-          destination_folder: paths.timestamped_encrypted_folder,
-          timestamp: timestamp
+          destination_folder: paths.timestamped_encrypted_folder
         )
       end
     end

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

@@ -6,7 +6,15 @@ require "attr_extras"
 module Renalware
   module UKRDC
     class CreatePatientXMLFile
-      pattr_initialize [:patient!, :dir!, :request_uuid!, :renderer, :changes_since, :logger]
+      pattr_initialize [
+        :patient!,
+        :dir!,
+        :request_uuid!,
+        :renderer,
+        :changes_since,
+        :logger,
+        :batch_number
+      ]
 
       # rubocop:disable Metrics/AbcSize
       def call
@@ -90,10 +98,17 @@ module Renalware
       end
 
       def xml_filepath
-        raise(ArgumentError, "Patient has no ukrdc_external_id") if patient.ukrdc_external_id.blank?
+        File.join(dir, xml_filename)
+      end
+
+      def xml_filename
+        patient_identifier = patient.nhs_number || patient.local_patient_id
+        if patient_identifier.blank?
+          raise(ArgumentError, "Patient has no NHS number or local patient id")
+        end
 
-        filename = "#{patient.ukrdc_external_id}.xml"
-        File.join(dir, filename)
+        site_code = Renalware.config.ukrdc_site_code # e.g. RJZ
+        "#{site_code}_#{batch_number}_#{patient_identifier.upcase}.xml"
       end
 
       class Payload

data/db/migrate/20181026145459_create_ukrdc_batch_numbers.rb

@@ -0,0 +1,8 @@
+class CreateUKRDCBatchNumbers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ukrdc_batch_numbers do |t|
+      # no other columns, we just use the id as the batch number when sending data to the UKRDC.
+      t.timestamps null: false
+    end
+  end
+end

data/lib/gpg_encrypt_folder.rb

@@ -29,8 +29,8 @@ class GpgOptions
     :recipient,
     :keyring,
     :homedir,
-    :destination_folder,
-    :timestamp]
+    :destination_folder
+  ]
 end
 
 class GpgEncryptFile
@@ -72,12 +72,12 @@ class GpgCommand
     "--keyring #{options.keyring}"
   end
 
-  def filename_with_extension
+  def filename_without_extension
     File.basename(file, ".xml")
   end
 
   def output_filename
-    "#{options.timestamp}_#{filename_with_extension}.gpg"
+    "#{filename_without_extension}.gpg"
   end
 
   def encrypted_filename

data/lib/renalware/configuration.rb

@@ -64,6 +64,7 @@ module Renalware
     config_accessor(:ukrdc_working_path) do
       ENV.fetch("UKRDC_WORKING_PATH", File.join("/var", "ukrdc"))
     end
+    config_accessor(:ukrdc_site_code) { ENV.fetch("UKRDC_PREFIX", "RJZ") }
 
     # We override this in some tests as a means of getting wicked_Pdf to generate an HTML version
     # of the PDF so we can examine its content

data/lib/renalware/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.54
+  version: 2.0.55
 platform: ruby
 authors:
 - Airslie
@@ -1759,6 +1759,7 @@ files:
 - app/models/renalware/transplants/registrations/wait_list_query.rb
 - app/models/renalware/transplants/version.rb
 - app/models/renalware/ukrdc.rb
+- app/models/renalware/ukrdc/batch_number.rb
 - app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb
 - app/models/renalware/ukrdc/create_patient_xml_file.rb
 - app/models/renalware/ukrdc/export_summary.rb
@@ -3337,6 +3338,7 @@ files:
 - db/migrate/20181008145159_create_reporting_daily_ukrdc_view.rb
 - db/migrate/20181013115138_update_reporting_daily_pathology_view_to_v2.rb
 - db/migrate/20181025170410_add_ukrdc_helper_column_to_patients.rb
+- db/migrate/20181026145459_create_ukrdc_batch_numbers.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb