renalware-core 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9df5d0937aca9913d07516b1d59836215499b54f8160d4a9fa5d6d811a5eb8
-  data.tar.gz: 4afe4555a5821f3c8464d95137fe5a28b8341f1db3e996083216c73b4780f85a
+  metadata.gz: 3ac09f0c3708048edefc8c1040650e7efee4de9209837d547e97bdf06e30ae38
+  data.tar.gz: 1029728c82c3f5cfe5c782fcebae7247fb5401815c2e2afbe8fb9ab35c230b15
 SHA512:
-  metadata.gz: e8f02ea880a57bc537775cc5addd1bea2d6fcf5bf3beae5c647d2cb36a88c6dc0007bed2d76215651d24a29e9cc9e30550fd77785ff3e9bfafbcd8cfdd0d1800
-  data.tar.gz: 9d7ba211614d195aff1d88d4faf32a6a83669c130fae96ecbedc69d5ec1be197cbf24749a6b05e3a148534e83fd1694e96a10d7ba246eb6a51699aadf21f78bd
+  metadata.gz: 48522cd5f0e8569574ea14b1933169821b1768c548b139cf14935a8c26839dd476a397cc2ba397291ba049091f9118e12f4ad32310741089da6a4a942eed8de7
+  data.tar.gz: fdff52784eba369df4e5dc806e9c083302372bdb327ba4c9df3adf057cee64396421e962d217a7b9593947a56f80ac8c1f3148c6de4cec2d46017a24f42ba0bc

data/app/jobs/renalware/hd/generate_monthly_statistics.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "month_period"
+
+# This job when executed will store a snapshot of last month's HD session statistics
+# for each HD patient.
+module Renalware
+  module HD
+    class GenerateMonthlyStatistics < ApplicationJob
+      attr_reader :period
+
+      def initialize(month: nil, year: nil)
+        validate_args(month: month, year: year)
+
+        @period = Renalware::MonthPeriod.new(
+          month: (month || default_month).to_i,
+          year:  (year || default_year).to_i
+        )
+      end
+
+      # :reek:UtilityFunction
+      def call
+        patients_with_a_closed_hd_session_in_period.each do |patient|
+          GenerateMonthlyStatisticsForPatientJob.perform_later(
+            patient: patient,
+            month: period.month,
+            year: period.year
+          )
+        end
+        Rails.logger.info(
+          "Enqueued GenerateMonthlyStatisticsForPatientJob jobs for "\
+          "#{patients_with_a_closed_hd_session_in_period.length} patients"
+        )
+      end
+
+      private
+
+      def validate_args(month:, year:)
+        if (month.present? && year.blank?) || (month.blank? && year.present?)
+          raise(ArgumentError, "Must supply both month and year if supplying one or the other")
+        end
+      end
+
+      def patients_with_a_closed_hd_session_in_period
+        @patients_with_a_closed_hd_session_in_period ||= begin
+          Sessions::AuditablePatientsInPeriodQuery.new(period: period).call
+        end
+      end
+
+      def default_month
+        date_falling_in_the_previous_month.month
+      end
+
+      def default_year
+        date_falling_in_the_previous_month.year
+      end
+
+      def date_falling_in_the_previous_month
+        @date_falling_in_the_previous_month ||= Time.zone.today - 1.month
+      end
+    end
+  end
+end

data/app/models/renalware/medications/terminate_all_patient_prescriptions.rb

@@ -17,7 +17,7 @@ module Renalware
       end
 
       def call
-        patient.prescriptions.each do |prescription|
+        patient.prescriptions.current.each do |prescription|
           prescription.terminate(by: by).save!
         end
       end

data/lib/renalware/version.rb

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

data/lib/tasks/audit.rake

@@ -1,8 +1,28 @@
 begin
   namespace :audit do
-    desc "Queues a delayed job to generate and store monthly patient HD Session statistics"
+    desc <<-DESC
+      Queues delayed jobs to generate monthly HD audits for each patient with a signed-off HD
+      Session in the specified month and year. If no year or month supplied, it will generate
+      stats for last month for each patient.
+
+      Example usage:
+
+      To generate monthly stats for last month:
+        bundle exec rake audit:patient_hd_statistics
+
+      To generate monthly stats for a specific month:
+        bundle exec rake audit:patient_hd_statistics year=2018 month=5
+
+    DESC
     task patient_hd_statistics: :environment do
-      Renalware::HD::GenerateMonthlyStatisticsJob.perform_later
+      logger           = Logger.new(STDOUT)
+      logger.level     = Logger::INFO
+      Rails.logger     = logger
+
+      Renalware::HD::GenerateMonthlyStatistics.new(
+        month: ENV["month"],
+        year: ENV["year"]
+      ).call
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -1277,8 +1277,8 @@ files:
 - app/jobs/application_job.rb
 - app/jobs/feed_job.rb
 - app/jobs/hl7_message_example.yml
+- app/jobs/renalware/hd/generate_monthly_statistics.rb
 - app/jobs/renalware/hd/generate_monthly_statistics_for_patient_job.rb
-- app/jobs/renalware/hd/generate_monthly_statistics_job.rb
 - app/jobs/renalware/hd/update_rolling_patient_statistics_job.rb
 - app/jobs/renalware/letters/save_pdf_letter_to_file_job.rb
 - app/jobs/renalware/reporting/refresh_audit_data_job.rb

data/app/jobs/renalware/hd/generate_monthly_statistics_job.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "month_period"
-
-# This job when executed will store a snapshot of last month's HD session statistics
-# for each HD patient.
-module Renalware
-  module HD
-    class GenerateMonthlyStatisticsJob < ApplicationJob
-      queue_as :hd_patient_statistics
-
-      # :reek:UtilityFunction
-      def perform
-        patients.each do |patient|
-          GenerateMonthlyStatisticsForPatientJob.perform_later(
-            patient: patient,
-            month: month,
-            year: year
-          )
-        end
-      end
-
-      private
-
-      def patients
-        @patients ||= Sessions::AuditablePatientsInPeriodQuery.new(period: period).call
-      end
-
-      def period
-        @period ||= Renalware::MonthPeriod.new(month: month, year: year)
-      end
-
-      def month
-        date_falling_in_the_previous_month.month
-      end
-
-      def year
-        date_falling_in_the_previous_month.year
-      end
-
-      def date_falling_in_the_previous_month
-        @date_falling_in_the_previous_month ||= Time.zone.today - 1.month
-      end
-    end
-  end
-end