Fix available_tags count to scope by active contributors

app/models/organization.rb

@@ -95,7 +95,7 @@ def contributors_tags_with_count
     ActsAsTaggableOn::Tag
       .for_tenant(id)
       .joins(:taggings)
-      .where(taggings: { taggable_type: Contributor.name })
+      .where(taggings: { taggable_type: Contributor.name, taggable_id: Contributor.active })
       .select('tags.id, tags.name, count(taggings.id) as taggings_count')
       .group('tags.id')
       .all

spec/models/organization_spec.rb

@@ -95,6 +95,14 @@
         let!(:request) { create(:request, tag_list: %w[Homeowner], organization: organization) }
         it { should eq([['Homeowner', 1]]) }
       end
+
+      context 'given an inactive contributor with the same tag' do
+        before { create(:contributor, tag_list: %w[Homeowner], organization: organization, deactivated_at: 1.day.ago) }
+
+        it "does not count inactive contributor's tags" do
+          expect(subject).to eq([['Homeowner', 1]])
+        end
+      end
     end
   end
 end