Merge pull request #178 from sparc-request/ac-spec-fixes

Ac spec fixes
sparc-request · Jun 16, 2016 · 5fd60e0 · 5fd60e0
2 parents 0b2b7eb + 801c2da
commit 5fd60e0
Show file tree

Hide file tree

Showing 75 changed files with 298 additions and 366 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,9 @@ sudo: false
 language: ruby
 cache: bundler
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - export TZ=America/New_York
 before_script:
   - cp config/database.yml.example config/database.yml
   - cp config/shards.yml.example config/shards.yml

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -219,14 +219,14 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.7)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     momentjs-rails (2.10.2)
       railties (>= 3.1)
     multi_json (1.11.0)
@@ -237,8 +237,9 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
@@ -252,6 +253,7 @@ GEM
       request_store (~> 1.1.0)
     paranoia (2.1.2)
       activerecord (~> 4.0)
+    pkg-config (1.1.7)
     progress_bar (1.0.3)
       highline (~> 1.6.1)
       options (~> 2.3.0)
@@ -283,18 +285,18 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (4.2.2)
       actionpack (= 4.2.2)
       activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (11.1.2)
     rdoc (4.2.0)
       json (~> 1.4)
     ref (1.0.5)
@@ -311,23 +313,23 @@ GEM
       rspec-mocks
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.2)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
     rubyzip (1.0.0)

diff --git a/app/controllers/arms_controller.rb b/app/controllers/arms_controller.rb
@@ -44,7 +44,7 @@ def destroy
       @arm.errors.add(:arm, "'#{@arm.name}' has completed procedures and cannot be deleted")
       @errors = @arm.errors
     else
-      @arm.delay.destroy
+      @arm.destroy_later
       flash.now[:alert] = t(:arm)[:deleted]
     end
   end

diff --git a/app/controllers/fulfillments_controller.rb b/app/controllers/fulfillments_controller.rb
@@ -65,7 +65,7 @@ def detect_changes_and_create_notes
       unless new_field.blank?
         unless current_field.blank?
           current_field = (field == :fulfilled_at ? current_field.to_date.to_s : current_field.to_s)
-          new_field = (field == :fulfilled_at ? Time.strptime(new_field, "%m-%d-%Y").to_date.to_s : new_field.to_s)
+          new_field = (field == :fulfilled_at ? Time.strptime(new_field, "%m/%d/%Y").to_date.to_s : new_field.to_s)
         end
         if current_field != new_field
           comment = t(:fulfillment)[:log_notes][field] + (field == :performer_id ? Identity.find(new_field).full_name : new_field.to_s)

diff --git a/app/controllers/line_items_controller.rb b/app/controllers/line_items_controller.rb
@@ -75,7 +75,7 @@ def detect_changes_and_create_notes
       unless new_field.blank?
         unless current_field.blank?
           current_field = (field == "started_at" ? current_field.to_date.to_s : current_field.to_s)
-          new_field = (field == "started_at" ? Time.strptime(new_field, "%m-%d-%Y").to_date.to_s : new_field)
+          new_field = (field == "started_at" ? Time.strptime(new_field, "%m/%d/%Y").to_date.to_s : new_field)
         end
         if current_field != new_field
           comment = t(:line_item)[:log_notes][field.to_sym] + (field == "service_id" ? Service.find(new_field).name : new_field.to_s)

diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb
@@ -74,6 +74,7 @@ def participant_params
   def find_participant
     participant_id = params[:id] || params[:participant_id]
     @participant = Participant.where(id: participant_id).first
+
     if @participant.present?
       @protocol = @participant.protocol
     else

diff --git a/app/controllers/procedures_controller.rb b/app/controllers/procedures_controller.rb
@@ -77,7 +77,7 @@ def create_note_before_update
 
   def change_in_completed_date_detected?
     if procedure_params[:completed_date]
-      Time.strptime(procedure_params[:completed_date], "%m-%d-%Y") != @procedure.completed_date
+      Time.strptime(procedure_params[:completed_date], "%m/%d/%Y") != @procedure.completed_date
     else
       return false
     end

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
@@ -14,7 +14,7 @@ def create
 
     @report = @report_type.classify.constantize.new(reports_params)
     @errors = @report.errors
-    
+
     if @report.valid?
       @reports_params = reports_params
       @documentable.documents.push @document

diff --git a/app/controllers/update_dropdowns_controller.rb b/app/controllers/update_dropdowns_controller.rb
@@ -2,13 +2,7 @@ class UpdateDropdownsController < ApplicationController
 
   def create
     org_ids = params[:org_ids]
-    @protocols = []
-    @protocols = org_ids.flat_map{ |id| find_protocols(id) }
-  end
-
-  private
-
-  def find_protocols(org_ids)
-    Protocol.find_protocols_by_org_id(org_ids)
+    ssrs = SubServiceRequest.where(organization_id: org_ids)
+    @protocols = ssrs.map(&:protocol)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -12,9 +12,12 @@ def generate_history_text url
         url
       end
     rescue Exception => e
-      puts "#"*20
-      puts e.message
-      puts "#"*20
+      #TODO do we want the message in test, this is just breadcrumbs
+      unless Rails.env.test?
+        puts "#"*20
+        puts e.message
+        puts "#"*20
+      end
       return url
     end
   end

diff --git a/app/jobs/delayed_destroy_job.rb b/app/jobs/delayed_destroy_job.rb
@@ -0,0 +1,7 @@
+class DelayedDestroyJob < ActiveJob::Base
+  queue_as :delayed_destroy
+
+  def perform(object)
+    object.destroy
+  end
+end
diff --git a/app/jobs/importer_job.rb b/app/jobs/importer_job.rb
@@ -1,15 +1,10 @@
-class ImporterJob < Struct.new(:sparc_id, :callback_url, :action)
+class ImporterJob < ActiveJob::Base
+  queue_as :sparc_api_requests
 
   class SparcApiError < StandardError
   end
 
-  def self.enqueue(sparc_id, callback_url, action)
-    job = new(sparc_id, callback_url, action)
-
-    Delayed::Job.enqueue job, queue: 'sparc_api_requests'
-  end
-
-  def perform
+  def perform sparc_id, callback_url, action
     skip_faye_callbacks
     yield
     set_faye_callbacks

diff --git a/app/jobs/protocol_importer_job.rb b/app/jobs/protocol_importer_job.rb
@@ -1,6 +1,6 @@
 class ProtocolImporterJob < ImporterJob
 
-  def perform
+  def perform sparc_id, callback_url, action
     super {
       case action
       when 'create'

diff --git a/app/jobs/service_importer_job.rb b/app/jobs/service_importer_job.rb
@@ -1,6 +1,6 @@
 class ServiceImporterJob < ImporterJob
 
-  def perform
+  def perform sparc_id, callback_url, action
     super {
       case action
       when 'create'
@@ -30,4 +30,4 @@ def update_components(callback_url)
       end
     end
   end
-end
+end
diff --git a/app/models/arm.rb b/app/models/arm.rb
@@ -13,4 +13,8 @@ class Arm < ActiveRecord::Base
   validates :name, presence: true
   validates_numericality_of :subject_count, greater_than_or_equal_to: 1
   validates_numericality_of :visit_count, greater_than_or_equal_to: 1
+
+  def destroy_later
+    DelayedDestroyJob.perform_later self
+  end
 end
diff --git a/app/models/core.rb b/app/models/core.rb
@@ -0,0 +1,2 @@
+class Core < Organization
+end
diff --git a/app/models/fulfillment.rb b/app/models/fulfillment.rb
@@ -27,7 +27,7 @@ class Fulfillment < ActiveRecord::Base
         where("fulfilled_at is not NULL AND fulfilled_at between ? AND ?", start_date, end_date)}
 
   def fulfilled_at=(date_time)
-    write_attribute(:fulfilled_at, Time.strptime(date_time, "%m-%d-%Y")) if date_time.present?
+    write_attribute(:fulfilled_at, Time.strptime(date_time, "%m/%d/%Y")) if date_time.present?
   end
 
   def total_cost

diff --git a/app/models/institution.rb b/app/models/institution.rb
@@ -0,0 +1,2 @@
+class Institution < Organization
+end
diff --git a/app/models/line_item.rb b/app/models/line_item.rb
@@ -62,7 +62,7 @@ def decrement_sparc_service_counter
   end
 
   def started_at=(date)
-    write_attribute(:started_at, Time.strptime(date, "%m-%d-%Y")) if date.present?
+    write_attribute(:started_at, Time.strptime(date, "%m/%d/%Y")) if date.present?
   end
 
   def quantity_remaining

diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -72,15 +72,3 @@ def all_child_services(scope)
     all_child_organizations_with_non_process_ssrs.map { |child| child.services.send(scope) }
   end
 end
-
-class Program < Organization
-end
-
-class Core < Organization
-end
-
-class Provider < Organization
-end
-
-class Institution < Organization
-end
diff --git a/app/models/participant.rb b/app/models/participant.rb
@@ -50,7 +50,7 @@ def self.title id
   end
 
   def date_of_birth=(dob)
-    write_attribute(:date_of_birth, Time.strptime(dob, "%m-%d-%Y")) if dob.present?
+    write_attribute(:date_of_birth, Time.strptime(dob, "%m/%d/%Y")) if dob.present?
   end
 
   def phone_number_format

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
@@ -150,7 +150,7 @@ def reset
 
   def completed_date=(completed_date)
     if completed_date.present?
-      write_attribute(:completed_date, Time.strptime(completed_date, "%m-%d-%Y"))
+      write_attribute(:completed_date, Time.strptime(completed_date, "%m/%d/%Y"))
     else
       write_attribute(:completed_date, nil)
     end

diff --git a/app/models/program.rb b/app/models/program.rb
@@ -0,0 +1,2 @@
+class Program < Organization
+end
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
@@ -58,11 +58,6 @@ def self.title id
     ["Protocol", Protocol.find(id).srid].join(' ')
   end
 
-  def self.find_protocols_by_org_id(org_ids)
-    joins(:sub_service_request).
-    where(sub_service_requests: { organization_id: org_ids })
-  end
-
   def sparc_uri
     [
       ENV.fetch('GLOBAL_SCHEME'),

diff --git a/app/models/provider.rb b/app/models/provider.rb
@@ -0,0 +1,3 @@
+class Provider < Organization
+end
+
diff --git a/app/models/task.rb b/app/models/task.rb
@@ -20,7 +20,7 @@ class Task < ActiveRecord::Base
   scope :mine, -> (identity) { incomplete.where(assignee: identity) }
 
   def due_at=(due_date)
-    write_attribute(:due_at, Time.strptime(due_date, "%m-%d-%Y")) if due_date.present?
+    write_attribute(:due_at, Time.strptime(due_date, "%m/%d/%Y")) if due_date.present?
   end
 
   private

diff --git a/app/views/multiple_procedures/update_procedures.js.coffee b/app/views/multiple_procedures/update_procedures.js.coffee
@@ -25,7 +25,7 @@ $('#modal_place').modal 'hide'
 
 $("tr.procedure[data-id='<%= procedure.id %>'] td.status .complete").addClass('active')
 $("tr.procedure[data-id='<%= procedure.id %>'] td.status .incomplete").removeClass('active')
-$("tr.procedure[data-id='<%= procedure.id %>'] div.completed_date_field input.datetimepicker").val("<%= @completed_date.strftime('%m-%d-%Y') %>").removeAttr("disabled")
+$("tr.procedure[data-id='<%= procedure.id %>'] div.completed_date_field input.datetimepicker").val("<%= @completed_date.strftime('%m/%d/%Y') %>").removeAttr("disabled")
 
 <% end %>
 <% end %>

diff --git a/lib/identity_organizations.rb b/lib/identity_organizations.rb
@@ -39,7 +39,8 @@ def super_user_protocols
   end
 
   def clinical_provider_protocols
-    Protocol.joins(:clinical_providers).where(clinical_providers: { identity_id: @id }).to_a
+    org_ids = ClinicalProvider.where(identity_id: @id).select(:organization_id).map(&:organization_id)
+    Protocol.joins(:sub_service_request).where(sub_service_requests: { organization_id: org_ids }).to_a
   end
 
   # returns protocols that clinical provider and super user have access to.
@@ -51,4 +52,4 @@ def fulfillment_access_protocols
   def fulfillment_organizations_with_protocols
     (clinical_provider_organizations_with_protocols + super_user_organizations_with_protocols).uniq
   end
-end
+end
diff --git a/lib/importers/sparc_fulfillment_importer.rb b/lib/importers/sparc_fulfillment_importer.rb
@@ -128,7 +128,7 @@ def create_line_item_fulfillment(sparc_line_item_fulfillment, fulfillment_line_i
     quantity = sparc_quantity * sparc_unit_quantity
 
     fulfillment_line_item_fulfillment = fulfillment_line_item.fulfillments.new(sparc_id: sparc_line_item_fulfillment.id,
-                                                                               fulfilled_at: sparc_line_item_fulfillment.date.strftime("%m-%d-%Y"),
+                                                                               fulfilled_at: sparc_line_item_fulfillment.date.strftime("%m/%d/%Y"),
                                                                                quantity:     quantity,
                                                                                performer_id: sparc_line_item_fulfillment_audit.user_id,
                                                                                service_id:   fulfillment_line_item.service_id,
@@ -168,7 +168,7 @@ def create_fulfillment_participant(name_parts, sparc_subject, fulfillment_arm)
                                                                      mrn:            sparc_subject.mrn,
                                                                      external_id:    sparc_subject.external_subject_id,
                                                                      status:         STATUS_OPTIONS[sparc_subject.status],
-                                                                     date_of_birth:  (sparc_subject.dob.present? ? sparc_subject.dob.strftime("%m-%d-%Y") : nil),
+                                                                     date_of_birth:  (sparc_subject.dob.present? ? sparc_subject.dob.strftime("%m/%d/%Y") : nil),
                                                                      gender:         sparc_subject.gender.capitalize,
                                                                      ethnicity:      'Unknown/Other/Unreported', 
                                                                      race:           RACE_OPTIONS[sparc_subject.ethnicity],
@@ -276,7 +276,7 @@ def generate_procedures(sparc_procedure, fulfillment_appointment, quantity, bill
           sparc_procedure_completed_by = sparc_procedure_completed_audit.user_id
 
           fulfillment_procedure.status = 'complete'
-          fulfillment_procedure.completed_date = sparc_procedure_completed_date.strftime("%m-%d-%Y")
+          fulfillment_procedure.completed_date = sparc_procedure_completed_date.strftime("%m/%d/%Y")
           fulfillment_procedure.service_cost = fulfillment_service.cost(fulfillment_procedure.protocol.sparc_funding_source, sparc_procedure_completed_date)
           fulfillment_procedure.performer_id = sparc_procedure_completed_by
         end