Merge pull request #574 from alphauslabs/list-invoice

billingd: list invoice
alphauslabs · Jan 20, 2025 · 48ed495 · 48ed495
2 parents 7450a25 + bcd68f7
commit 48ed495
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 98 deletions.
diff --git a/billing/v1/billing.proto b/billing/v1/billing.proto
@@ -573,12 +573,6 @@ service Billing {
     };
   }
 
-  rpc RippleV2InvoiceListing(RippleV2InvoiceListingRequest) returns (stream RippleV2InvoiceListingResponse) {
-    option (google.api.http) = {
-      get: "/v1/ripplev2/invoicing/invoice-listing"
-    };
-  }
-
 }
 
 message BillingGroup {
@@ -1375,7 +1369,7 @@ message DeleteAccessGroupRequest {
 
 // Request message for the ListInvoice rpc.
 message ListInvoiceRequest {
-  // Optional. billing internal id.
+  // Optional. billing internal id. If empty will list all the invoice status
   string groupId = 1;
 }
 
@@ -1386,13 +1380,20 @@ message ListInvoiceResponse {
   string billingInternalId = 1;
 
   // The billing group id.
-  string BillingGroupId = 2;
+  string billingGroupId = 2;
 
-  // The billing group name.
-  string BillingGroupName = 3;
+  // The billing group name. Used as invoice name on ripple v2
+  string billingGroupName = 3;
 
   // The date.
   string date = 4;
+
+  // Created || Not Created
+  string invoiceStatus = 5;
+  // In progress || Done
+  string finalizationStatus = 6;
+  // Published || Not published
+  string waveStatus = 7;
 }
 
 // request message for ListAbcBillingGroups
@@ -1827,22 +1828,6 @@ message FileChunk {
   bytes content = 1;
 }
 
-
-message RippleV2InvoiceListingRequest {
-  string yymmDate = 1;
-}
-
-message RippleV2InvoiceListingResponse {
-  string invoiceName = 1;
-  string invoiceId = 2;
-  string company = 3;
-  string status = 4;
-  string waveStatus = 5;
-  string billingAmountAws = 6;
-  string billingAmmountAzure = 7;
-  string billingAmountGcp = 8;
-}
-
 message GetBillingGroupInvoiceServiceDiscountsRequest {
   string groupId = 1;
 }

diff --git a/openapiv2/apidocs.swagger.json b/openapiv2/apidocs.swagger.json
@@ -9497,45 +9497,6 @@
         ]
       }
     },
-    "/v1/ripplev2/invoicing/invoice-listing": {
-      "get": {
-        "operationId": "Billing_RippleV2InvoiceListing",
-        "responses": {
-          "200": {
-            "description": "A successful response.(streaming responses)",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/v1RippleV2InvoiceListingResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
-                }
-              },
-              "title": "Stream result of v1RippleV2InvoiceListingResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/googlerpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "yymmDate",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "Billing"
-        ]
-      }
-    },
     "/v1/servicediscounts": {
       "post": {
         "summary": "WORK-IN-PROGRESS: Creates the invoice service discounts. Only available in Ripple.",
@@ -28844,7 +28805,7 @@
       "properties": {
         "groupId": {
           "type": "string",
-          "description": "Optional. billing internal id."
+          "title": "Optional. billing internal id. If empty will list all the invoice status"
         }
       },
       "description": "Request message for the ListInvoice rpc."
@@ -28856,17 +28817,29 @@
           "type": "string",
           "description": "The billing internal id."
         },
-        "BillingGroupId": {
+        "billingGroupId": {
           "type": "string",
           "description": "The billing group id."
         },
-        "BillingGroupName": {
+        "billingGroupName": {
           "type": "string",
-          "description": "The billing group name."
+          "title": "The billing group name. Used as invoice name on ripple v2"
         },
         "date": {
           "type": "string",
           "description": "The date."
+        },
+        "invoiceStatus": {
+          "type": "string",
+          "title": "Created || Not Created"
+        },
+        "finalizationStatus": {
+          "type": "string",
+          "title": "In progress || Done"
+        },
+        "waveStatus": {
+          "type": "string",
+          "title": "Published || Not published"
         }
       },
       "description": "Response message for the ListInvoice rpc."
@@ -30124,35 +30097,6 @@
       },
       "description": "Request message for the RestoreSavings rpc."
     },
-    "v1RippleV2InvoiceListingResponse": {
-      "type": "object",
-      "properties": {
-        "invoiceName": {
-          "type": "string"
-        },
-        "invoiceId": {
-          "type": "string"
-        },
-        "company": {
-          "type": "string"
-        },
-        "status": {
-          "type": "string"
-        },
-        "waveStatus": {
-          "type": "string"
-        },
-        "billingAmountAws": {
-          "type": "string"
-        },
-        "billingAmmountAzure": {
-          "type": "string"
-        },
-        "billingAmountGcp": {
-          "type": "string"
-        }
-      }
-    },
     "v1SaveNotificationSettingsRequest": {
       "type": "object",
       "properties": {