Merge pull request sparc-request#195 from bmic-development/kg-refacto…

…r_has_human_subject_info KG - Refactor has_human_subjects_info? to reduce coupling
PBRCDev · Apr 6, 2017 · 95842bb · 95842bb
2 parents 1665d3e + b7daf64
commit 95842bb
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 113 deletions.
diff --git a/app/assets/javascripts/protocol_form.js.coffee b/app/assets/javascripts/protocol_form.js.coffee
@@ -28,15 +28,12 @@ $(document).ready ->
 
   if $('.human-subjects:checkbox:checked').length > 0
     $('.rm-id').addClass('required')
-    $('.has-human-subject-info').val('true')
 
   $(document).on 'click', '.human-subjects', ->
     if $('.rm-id').hasClass('required')
       $('.rm-id').removeClass('required')
-      $('.has-human-subject-info').val('false')
     else
       $('.rm-id').addClass('required')
-      $('.has-human-subject-info').val('true')
 
   $(document).on 'blur', '.research-master-field', ->
     rmId = $('.research-master-field').val()

diff --git a/app/controllers/dashboard/protocols_controller.rb b/app/controllers/dashboard/protocols_controller.rb
@@ -268,7 +268,6 @@ def protocol_params
         :type,
         :udak_project_number,
         :research_master_id,
-        :has_human_subject_info,
         research_types_info_attributes: [:human_subjects, :vertebrate_animals, :investigational_products, :ip_patents],
         study_types_attributes: [:name, :new, :position, :_destroy],
         vertebrate_animals_info_attributes: [:iacuc_number,

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
@@ -223,7 +223,6 @@ def protocol_params
         :type,
         :udak_project_number,
         :research_master_id,
-        :has_human_subject_info,
         {:study_phase_ids => []},
         research_types_info_attributes: [:human_subjects, :vertebrate_animals, :investigational_products, :ip_patents],
         study_types_attributes: [:name, :new, :position, :_destroy],

diff --git a/app/models/protocol.rb b/app/models/protocol.rb
@@ -93,7 +93,7 @@ class Protocol < ApplicationRecord
   end
 
   def has_human_subject_info?
-    self.has_human_subject_info == true
+    self.research_types_info.try(:human_subjects) || false
   end
 
   validate :existing_rm_id,

diff --git a/app/views/dashboard/protocols/form/study_form_sections/_study_information.html.haml b/app/views/dashboard/protocols/form/study_form_sections/_study_information.html.haml
@@ -31,7 +31,6 @@
           = link_to t(:protocols)[:studies][:information][:research_master_id], RESEARCH_MASTER_LINK, target: '_blank'
         .col-lg-3
           = form.text_field :research_master_id, class: 'form-control research-master-field', readonly: action_name == "edit" && admin
-          = form.hidden_field :has_human_subject_info, value: false, class: 'has-human-subject-info'
         - if action_name == "edit" && admin
           .btn.btn-warning.edit-rmid
             = t(:actions)[:edit]

diff --git a/app/views/protocols/form/study_form_sections/_study_information.html.haml b/app/views/protocols/form/study_form_sections/_study_information.html.haml
@@ -31,7 +31,6 @@
           = link_to t(:protocols)[:studies][:information][:research_master_id], RESEARCH_MASTER_LINK, target: '_blank'
         .col-lg-10
           = form.text_field :research_master_id, class: 'form-control research-master-field'
-          = form.hidden_field :has_human_subject_info, value: false, class: 'has-human-subject-info'
 
     .form-group.row
       = form.label :short_title, t(:protocols)[:studies][:information][:short_title],

diff --git a/db/migrate/20170405154523_remove_has_human_subjects_info_from_protocol.rb b/db/migrate/20170405154523_remove_has_human_subjects_info_from_protocol.rb
@@ -0,0 +1,5 @@
+class RemoveHasHumanSubjectsInfoFromProtocol < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :protocols, :has_human_subject_info
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/spec/api/v1/protocols/get_protocol_spec.rb b/spec/api/v1/protocols/get_protocol_spec.rb
@@ -66,7 +66,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id').
                                 sort
 
@@ -82,7 +82,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id', 'arms', 'service_requests', 'project_roles', 'human_subjects_info').
                                 sort
 

diff --git a/spec/api/v1/protocols/get_protocols_spec.rb b/spec/api/v1/protocols/get_protocols_spec.rb
@@ -77,7 +77,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id').
                                 sort
 
@@ -93,7 +93,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id', 'arms', 'service_requests', 'project_roles', 'human_subjects_info').
                                 sort
 

diff --git a/spec/api/v1/protocols/get_protocols_with_ids_spec.rb b/spec/api/v1/protocols/get_protocols_with_ids_spec.rb
@@ -78,7 +78,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id').
                                 sort
         expect(parsed_body['protocols'].map(&:keys).flatten.uniq.sort).to eq(expected_attributes)
@@ -93,7 +93,7 @@
         parsed_body         = JSON.parse(response.body)
         expected_attributes = build(:protocol).attributes.
                                 keys.
-                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id', 'has_human_subject_info'].include?(key) }.
+                                reject { |key| ['study_phase', 'id', 'created_at', 'updated_at', 'deleted_at', 'research_master_id'].include?(key) }.
                                 push('callback_url', 'sparc_id', 'arms', 'service_requests', 'project_roles', 'human_subjects_info').
                                 sort
 

diff --git a/spec/controllers/dashboard/protocols/put_update_spec.rb b/spec/controllers/dashboard/protocols/put_update_spec.rb
@@ -117,8 +117,7 @@
           @protocol       = create(:protocol_without_validations,
                                     primary_pi: @logged_in_user,
                                     funding_status: "funded",
-                                    funding_source: "foundation",
-                                    has_human_subject_info: true)
+                                    funding_source: "foundation")
           organization    = create(:organization)
           service_request = create(:service_request_without_validations, protocol: @protocol)
                             create(:sub_service_request_without_validations, organization: organization, service_request: service_request, status: 'draft', protocol_id: @protocol.id)
@@ -166,8 +165,7 @@
           @protocol       = create(:protocol_without_validations,
                                     primary_pi: @logged_in_user,
                                     funding_status: "funded",
-                                    funding_source: "foundation",
-                                    has_human_subject_info: true)
+                                    funding_source: "foundation")
           organization    = create(:organization)
           service_request = create(:service_request_without_validations, protocol: @protocol)
                             create(:sub_service_request_without_validations, organization: organization, service_request: service_request, status: 'draft', protocol_id: @protocol.id)

diff --git a/spec/features/dashboard/protocols/edit/user_edits_research_master_on_study.rb b/spec/features/dashboard/protocols/edit/user_edits_research_master_on_study.rb
@@ -31,8 +31,7 @@
                                 type: "Study",
                                 primary_pi: jug2,
                                 funding_status: "funded",
-                                funding_source: "foundation",
-                                has_human_subject_info: true)
+                                funding_source: "foundation")
       organization    = create(:organization)
       service_request = create(:service_request_without_validations, protocol: @protocol)
                         create(:sub_service_request_without_validations, organization: organization, service_request: service_request, status: 'draft')
@@ -59,8 +58,7 @@
                                 type: "Study",
                                 primary_pi: jug2,
                                 funding_status: "funded",
-                                funding_source: "foundation",
-                                has_human_subject_info: true)
+                                funding_source: "foundation")
       stub_const("RESEARCH_MASTER_ENABLED", true)
 
       visit edit_dashboard_protocol_path(@protocol)