Report spending across billing periods for a service provider by service category

Postgres SQL, as run

select case when publisher_name is not null and publisher_name is distinct from invoice_issuer_name then publisher_name else provider_name end as service_provider_name,
       billing_account_name as billing_account_name,
       billing_account_id as billing_account_id,
       billing_currency as billing_currency,
       billing_period_start as billing_period_start,
       service_category as service_category,
       service_name as service_name,
       sum(billed_cost) as total_billed_cost
from focus.cost_and_usage
where charge_period_start >= $1::timestamptz
  and charge_period_end < $2::timestamptz
  and case when publisher_name is not null and publisher_name is distinct from invoice_issuer_name then publisher_name else provider_name end = $3::text
group by 1, billing_account_name, billing_account_id, billing_currency, billing_period_start, service_category, service_name
order by total_billed_cost desc nulls last, service_category, service_name
limit 500

Parameters: $1 = period_start, $2 = period_end, $3 = service_provider_name

Original FOCUS SQL

SELECT
ServiceProviderName,
BillingAccountName,
BillingAccountId,
BillingCurrency,
BillingPeriodStart,
ServiceCategory,
ServiceName,
SUM(BilledCost) AS TotalBilledCost
FROM focus_data_table
WHERE ChargePeriodStart >= ? and ChargePeriodEnd < ?
AND ServiceProviderName = ?
GROUP BY
ServiceProviderName,
BillingAccountName,
BillingAccountId,
BillingCurrency,
BillingPeriodStart,
ServiceCategory,
ServiceName
ORDER BY TotalBilledCost DESC