WIP

Author: compwron

app/controllers/case_contacts_controller.rb

@@ -20,11 +20,17 @@ def index
     ) || return
 
     @pagy, @filtered_case_contacts = pagy(@filterrific.find)
-    case_contacts = CaseContact.case_hash_from_cases(@filtered_case_contacts)
-    case_contacts = case_contacts.select { |k, _v| current_user.casa_cases.pluck(:id).include?(k) } if current_user.volunteer?
-    case_contacts = case_contacts.select { |k, _v| k == params[:casa_case_id].to_i } if params[:casa_case_id].present?
+    
+    casa_case_id_to_case_contacts = CaseContact.case_hash_from_cases(@filtered_case_contacts)
+    if params[:casa_case_id].present?
+      casa_case_id_to_case_contacts = casa_case_id_to_case_contacts.select { |k, _v| k == params[:casa_case_id].to_i } 
+    end
+    if current_user.volunteer?
+      current_user_casa_case_ids = current_user.casa_cases.pluck(:id)
+      casa_case_id_to_case_contacts = casa_case_id_to_case_contacts.select { |case_contact_id, _cases| current_user_casa_case_ids.include?(case_contact_id) }
+    end
 
-    @presenter = CaseContactPresenter.new(case_contacts)
+    @presenter = CaseContactPresenter.new(casa_case_id_to_case_contacts)
   end
 
   def drafts

spec/requests/casa_cases_spec.rb

@@ -1,5 +1,5 @@
 require "rails_helper"
-
+# hi
 RSpec.describe "/casa_cases", type: :request do
   let(:date_in_care) { Date.today }
   let(:organization) { build(:casa_org) }

spec/requests/case_contacts_spec.rb

@@ -1,5 +1,5 @@
 require "rails_helper"
-
+# hi
 RSpec.describe "/case_contacts", type: :request do
   let(:organization) { build(:casa_org) }
   let(:admin) { create(:casa_admin, casa_org: organization) }
@@ -21,21 +21,24 @@
 
     it { is_expected.to have_http_status(:success) }
 
-    it "returns all case contacts" do
-      page = request.parsed_body.to_html
-      expect(page).to include(past_contact.creator.display_name, recent_contact.creator.display_name)
-    end
-
-    context "with filters applied" do
-      let(:filterrific) { {occurred_starting_at: 1.week.ago} }
-
+    context "when logged in as an admin" do
       it "returns all case contacts" do
         page = request.parsed_body.to_html
-        expect(page).to include(recent_contact.creator.display_name)
-        expect(page).not_to include(past_contact.creator.display_name)
+        expect(page).to include(past_contact.creator.display_name, recent_contact.creator.display_name)
+      end
+
+      context "with filters applied" do
+        let(:filterrific) { {occurred_starting_at: 1.week.ago} }
+
+        it "returns all case contacts" do
+          page = request.parsed_body.to_html
+          expect(page).to include(recent_contact.creator.display_name)
+          expect(page).not_to include(past_contact.creator.display_name)
+        end
       end
     end
 
+
     context "when logged in as a volunteer" do
       let(:assigned_case) { create(:casa_case, :with_one_case_assignment, casa_org: organization) }
       let(:unassigned_case) { casa_case }