malawi_hiv_program_reports 1.0.20 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d2d8f58b51e76a9e2338c73f4649128827925aaea7bed0bf5c072fe047877a
-  data.tar.gz: 190ec9f058e23928a2295663cdea975eaf0a819860382728539bdb9d80b69895
+  metadata.gz: 9c5eda4737dd9269c63b370e6cb50a0189778b2bf740b26891dd69765356a81a
+  data.tar.gz: 9b9ddbc36fdd5b5e0c16c909c5dfd8ea979a69c9ea7736abe1fddb4bb6af4ca7
 SHA512:
-  metadata.gz: e615fa021b3a87a7c40832513d64f9746ef35eaeb49ff60cb7c5ad4ffdd3d3f27f8672e86bc1fae3a5a7c2903f4faf49e1cbf7d912457d56a1358c6803fb6378
-  data.tar.gz: cb09473dc350e4afaafecda703f65958823a3ff91c06c0538bfb1dfbb6f955b873473d568e9cb3c2a56d09105cb008610224e9ae474b259f187b164952c60f01
+  metadata.gz: 22544af6a23a6e6babe971dcbd9ce6a1366150e61f80e24f94ed2f4570c19a93417f7d3a05db3d2e60df6634ad04663be428af3bfe4ca52c7700a68d72b07dda
+  data.tar.gz: 1c2bf313e182a4bcfa73fa3ee3bd9c497ae99f172cf12fefbc4ec371e6ac0219de847b5280b5d4c2ed355b36056ce3a3df8d795700ea9fe57098d09d47653d6c

data/app/services/malawi_hiv_program_reports/moh/cumulative_cohort.rb

@@ -69,6 +69,7 @@ module MalawiHivProgramReports
       # rubocop:enable Metrics/MethodLength
 
       def process_data(location)
+        start_time = Time.now
         cdr_other_patient_types location
         external_clients location
         transfer_ins location
@@ -78,6 +79,9 @@ module MalawiHivProgramReports
         cohort_members location
         outcome = MalawiHivProgramReports::Moh::CumulativeOutcome.new(end_date:, location:, definition:, rebuild:)
         outcome.find_report
+        end_time = Time.now
+        time_taken = ((end_time - start_time) / 60).round(2)
+        save_completed_site(location:, time_taken:)
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
@@ -89,9 +93,30 @@ module MalawiHivProgramReports
         create_external_clients_table unless check_if_table_exists('cdr_temp_external_clients')
         create_temp_cohort_members_table unless check_if_table_exists('cdr_temp_cohort_members')
         create_cdr_reason_for_starting_art unless check_if_table_exists('cdr_reason_for_starting_art')
+        create_cdr_temp_cohort_status unless check_if_table_exists('cdr_temp_cohort_status')
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      def save_completed_site(location:, time_taken:)
+        ActiveRecord::Base.connection.execute <<~SQL
+          INSERT INTO cdr_temp_cohort_status
+          VALUES (#{location}, DATE(#{start_date}), DATE(#{end_date}), 'completed', #{time_taken})
+        SQL
+      end
+
+      def create_cdr_temp_cohort_status
+        ActiveRecord::Base.connection.execute <<~SQL
+          CREATE TABLE IF NOT EXISTS cdr_temp_cohort_status (
+            site_id INT NOT NULL,
+            start_date DATE NOT NULL,
+            end_date DATE NOT NULL,
+            status VARCHAR(50) NOT NULL,
+            time_taken DECIMAL(40,2) DEFAULT NULL,
+            PRIMARY KEY (site_id, start_date, end_date)
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+        SQL
+      end
+
       def create_external_clients_table
         ActiveRecord::Base.connection.execute <<~SQL
           CREATE TABLE IF NOT EXISTS cdr_temp_external_clients (
@@ -383,6 +408,7 @@ module MalawiHivProgramReports
           ActiveRecord::Base.connection.execute('TRUNCATE TABLE cdr_temp_cohort_members')
           ActiveRecord::Base.connection.execute('TRUNCATE TABLE cdr_temp_external_clients')
           ActiveRecord::Base.connection.execute('TRUNCATE TABLE cdr_reason_for_starting_art')
+          ActiveRecord::Base.connection.execute('TRUNCATE TABLE cdr_temp_cohort_status')
         else
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_other_patient_types WHERE site_id IN (#{locations.join(',')})")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_potential_cohort_members WHERE site_id IN (#{locations.join(',')})")
@@ -391,6 +417,7 @@ module MalawiHivProgramReports
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_cohort_members WHERE site_id IN (#{locations.join(',')})")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_external_clients WHERE site_id IN (#{locations.join(',')})")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_reason_for_starting_art WHERE site_id IN (#{locations.join(',')})")
+          ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_cohort_status WHERE site_id IN (#{locations.join(',')})")
         end
       end
     end

data/app/services/malawi_hiv_program_reports/moh/cumulative_outcome.rb

@@ -16,15 +16,10 @@ module MalawiHivProgramReports
       end
 
       def find_report
-        start_time = Time.now
         prepare_tables
         clear_tables if rebuild
         update_steps unless rebuild
         process_data
-        end_time = Time.now
-        total_time_in_minutes = ((end_time - start_time) / 60).round(2)
-        Rails.logger.info("Cumulative Outcome report completed in #{total_time_in_minutes} minutes for location: #{location}")
-        { cumulative_outcome_time: total_time_in_minutes, definition: }
       end
 
       private
@@ -531,12 +526,14 @@ module MalawiHivProgramReports
           ActiveRecord::Base.connection.execute('TRUNCATE cdr_temp_min_auto_expire_date')
           ActiveRecord::Base.connection.execute('TRUNCATE cdr_temp_max_patient_state')
           ActiveRecord::Base.connection.execute('TRUNCATE cdr_temp_max_patient_appointment')
+          ActiveRecord::Base.connection.execute('TRUNCATE cdr_temp_cohort_status')
         else
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_patient_outcomes WHERE site_id = #{location}")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_max_drug_orders WHERE site_id = #{location}")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_min_auto_expire_date WHERE site_id = #{location}")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_max_patient_state WHERE site_id = #{location}")
           ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_max_patient_appointment WHERE site_id = #{location}")
+          ActiveRecord::Base.connection.execute("DELETE FROM cdr_temp_cohort_status WHERE site_id = #{location}")
         end
       end
     end

data/lib/malawi_hiv_program_reports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MalawiHivProgramReports
-  VERSION = '1.0.20'
+  VERSION = '1.0.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails