check for active clients before deleting provider. #229

app/controllers/concerns/countable.rb

@@ -27,6 +27,14 @@ def client_count(provider_id: nil)
       response.results.total > 0 ? facet_by_cumulative_year(response.response.aggregations.cumulative_years.buckets) : []
     end
 
+    # count active clients by provider. Provider can only be deleted when there are no active clients.
+    def active_client_count(provider_id: nil)
+      return 0 unless provider_id.present?
+
+      response = Client.query(nil, provider_id: provider_id, page: { number: 1, size: 0 })
+      response.results.total
+    end
+
     # show provider count for admin
     # count until the previous year if provider has been deleted
     def provider_count(provider_id: nil)

app/controllers/providers_controller.rb

@@ -146,8 +146,8 @@ def totals
   # a provider with clients or prefixes can't be deleted
   def destroy
     logger = Logger.new(STDOUT)
-    if @provider.client_count.present?
-      message = "Can't delete provider that has clients."
+    if @provider.active_client_count > 0
+      message = "Can't delete provider that has active clients."
       status = 400
       logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status