Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

APP-6580: Update billing protos for multiple billing tiers #564

Merged
merged 4 commits into from
Oct 10, 2024
Merged

APP-6580: Update billing protos for multiple billing tiers #564

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d014ae
APP-6580: Update billing protos for multiple billing tiers
jr22 Oct 10, 2024
ab56ae3
Built new protos from 6d014ae
github-actions[bot] Oct 10, 2024
54dc986
empty
jr22 Oct 10, 2024
ec6d2ce
Built new protos from 54dc986
github-actions[bot] Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 51 additions & 31 deletions proto/viam/app/v1/billing.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,6 @@ message InvoiceSummary {
google.protobuf.Timestamp paid_date = 6;
}

message BillableResourceEvent {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/viamrobotics/api/pull/563/files#r1795181636

string id = 1;
string type = 2;
double usage_quantity = 3;
string usage_quantity_unit = 4;
string usage_cost = 5;
google.protobuf.Timestamp occurred_at = 6;
string user_name = 7;
}

message Invoice {
string id = 1;
google.protobuf.Timestamp invoice_date = 2;
double invoice_amount = 3;
string status = 4;
google.protobuf.Timestamp due_date = 5;
repeated BillableResourceEvent items = 6;
string emailed_to = 7;
}

enum PaymentMethodType {
PAYMENT_METHOD_TYPE_UNSPECIFIED = 0;
PAYMENT_METHOD_TYPE_CARD = 1;
Expand All @@ -62,20 +42,60 @@ message GetCurrentMonthUsageRequest {
string org_id = 1;
}

enum UsageCostType {
USAGE_COST_TYPE_UNSPECIFIED = 0;
USAGE_COST_TYPE_DATA_UPLOAD = 1;
USAGE_COST_TYPE_DATA_EGRESS = 2;
USAGE_COST_TYPE_REMOTE_CONTROL = 3;
USAGE_COST_TYPE_STANDARD_COMPUTE = 4;
USAGE_COST_TYPE_CLOUD_STORAGE = 5;
USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE = 6;
USAGE_COST_TYPE_OTHER_CLOUD_STORAGE = 7;
USAGE_COST_TYPE_PER_MACHINE = 8;
}

enum SourceType {
SOURCE_TYPE_UNSPECIFIED = 0;
SOURCE_TYPE_ORG = 1;
SOURCE_TYPE_FRAGMENT = 2;
}

message UsageCost {
UsageCostType resource_type = 1;
double cost = 2;
}

message ResourceUsageCostsBySource {
SourceType source_type = 1;
ResourceUsageCosts resource_usage_costs = 2;
string tier_name = 3;
}

message ResourceUsageCosts {
repeated UsageCost usage_costs = 1;
double discount = 2;
double total_with_discount = 3;
double total_without_discount = 4;
}

message GetCurrentMonthUsageResponse {
google.protobuf.Timestamp start_date = 1;
google.protobuf.Timestamp end_date = 2;
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 ResourceUsageCostsBySource resource_usage_costs_by_source = 14;
double subtotal = 15;

// all fields below are deprecated
double cloud_storage_usage_cost = 3 [deprecated = true];
double data_upload_usage_cost = 4 [deprecated = true];
double data_egres_usage_cost = 5 [deprecated = true];
double remote_control_usage_cost = 6 [deprecated = true];
double standard_compute_usage_cost = 7 [deprecated = true];
double discount_amount = 8 [deprecated = true];
double total_usage_with_discount = 9 [deprecated = true];
double total_usage_without_discount = 10 [deprecated = true];
double per_machine_usage_cost = 11 [deprecated = true];
double binary_data_cloud_storage_usage_cost = 12 [deprecated = true];
double other_cloud_storage_usage_cost = 13 [deprecated = true];
}

message GetOrgBillingInformationRequest {
Expand Down
Loading