changing names and deprecating fields

proto/viam/app/v1/billing.proto

@@ -79,38 +79,25 @@ message UsageCost {
   double cost = 2;
 }
 
-message GroupedCosts {
+message ResourceUsageCosts {
   repeated UsageCost usage_costs = 1;
-  double subtotal = 2;
-  double discount = 3;
+  double discount = 2;
+  double total_with_discount = 3;
+  double total_without_discount = 4;
 }
 
-message FragmentCosts {
+message FragmentUsageCosts {
   string fragment_id = 1;
-  GroupedCosts breakdown = 2;
+  ResourceUsageCosts resource_usage_costs = 2;
 }
 
 message GetCurrentMonthUsageResponse {
   google.protobuf.Timestamp start_date = 1;
   google.protobuf.Timestamp end_date = 2;
 
-  // This will be deprecated soon as it no longer
-  // reflects fragment cost structure
-  double cloud_storage_usage_cost = 3;
-  double data_upload_usage_cost = 4;
-  double data_egres_usage_cost = 5;
-  double remote_control_usage_cost = 6;
-  double standard_compute_usage_cost = 7;
-  double discount_amount = 8;
-  double total_usage_with_discount = 9;
-  double total_usage_without_discount = 10;
-  double per_machine_usage_cost = 11;
-  double binary_data_cloud_storage_usage_cost = 12;
-  double other_cloud_storage_usage_cost = 13;
-
-  repeated GroupedCosts org_breakdown = 14;
-  repeated FragmentCosts fragment_breakdown = 15;
-  double subtotal = 16; // total for all org + fragment costs
+  ResourceUsageCosts org_usage = 14;
+  repeated FragmentUsageCosts fragment_usage_costs = 15;
+  double subtotal = 16;
 }
 
 message GetOrgBillingInformationRequest {