[COST-5148] filter out empty resource ids and SavingsPlanCoveredUsage…

… entries (#5206)

* [COST-5148] update insert sql
filter out empty resource ids
offset savings from SavingsPlanCoveredUsage

* closing CASE statement

* clean up comment

* remove case stmts in favor of filtering out SavingsPlanCoveredUsage

* clean up

koku/masu/database/trino_sql/reporting_awscostentrylineitem_summary_by_ec2_compute.sql

@@ -116,7 +116,13 @@ FROM (
         AND year = '{{year | sqlsafe}}'
         AND month = '{{month | sqlsafe}}'
         AND lineitem_productcode = 'AmazonEC2'
-        AND product_productfamily LIKE '%Compute%'
+        AND product_productfamily LIKE '%Compute Instance%'
+        AND lineitem_resourceid != ''
+        /* SavingsPlanCoveredUsage entries have corresponding SavingsPlanNegation line items
+           that offset that cost and usage.
+           https://docs.aws.amazon.com/cur/latest/userguide/cur-sp.html
+        */
+        AND lineitem_lineitemtype != 'SavingsPlanCoveredUsage'
     GROUP BY lineitem_resourceid,
         lineitem_usageaccountid,
         product_instancetype,