fixup! Add commands to manage credits

crate · Nov 23, 2023 · 9865e5b · 9865e5b
1 parent 8ea1db7
commit 9865e5b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/croud/organizations/commands.py b/croud/organizations/commands.py
@@ -268,7 +268,7 @@ def _transform_file_size(size_bytes):
 def org_credits_create(args: Namespace) -> None:
     client = Client.from_args(args)
     payload = {
-        "amount": args.amount,
+        "amount": int(args.amount * 100),
         "expiration_date": args.expiration_date,
         "comment": args.comment,
     }
@@ -287,14 +287,17 @@ def org_credits_create(args: Namespace) -> None:
         ],
         success_message="Credit created.",
         output_fmt=get_output_format(args),
+        transforms={
+            "original_amount": _transform_credits_amount_to_usd,
+        },
     )
 
 
 def org_credits_edit(args: Namespace) -> None:
     client = Client.from_args(args)
     payload = {}
     if getattr(args, "amount") is not None:
-        payload["amount"] = args.amount
+        payload["amount"] = int(args.amount * 100)
     if args.expiration_date:
         payload["expiration_date"] = args.expiration_date
     if args.comment:
@@ -318,6 +321,9 @@ def org_credits_edit(args: Namespace) -> None:
         ],
         output_fmt=get_output_format(args),
         success_message="Credit edited.",
+        transforms={
+            "original_amount": _transform_credits_amount_to_usd,
+        },
     )
 
 
@@ -341,10 +347,19 @@ def org_credits_list(args: Namespace) -> None:
             "status",
         ],
         output_fmt=get_output_format(args),
-        success_message="Credit expired.",
+        transforms={
+            "original_amount": _transform_credits_amount_to_usd,
+            "remaining_amount": _transform_credits_amount_to_usd,
+        },
     )
 
 
+def _transform_credits_amount_to_usd(amount_cents):
+    if not amount_cents:
+        return 0
+    return f"${round(amount_cents / 100, 2)}"
+
+
 def org_credits_expire(args: Namespace) -> None:
     client = Client.from_args(args)
     data, errors = client.delete(

diff --git a/docs/commands/organizations.rst b/docs/commands/organizations.rst
@@ -424,11 +424,11 @@ Example
 
    sh$ croud organizations credits list \
        --org-id f6c39580-5719-431d-a508-0cee4f9e8209
-   +--------------------------------------+-------------------+---------------------+------------+----------+
-   | id                                   |   original_amount | expiration_date     | comment    | status   |
-   |--------------------------------------+-------------------+---------------------+------------+----------|
-   | f8207787-8458-4cab-94c1-4ca84a702154 |               300 | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
-   +--------------------------------------+-------------------+---------------------+------------+----------+
+   +--------------------------------------+-----------------+------------------+---------------------+------------+----------+
+   | id                                   | original_amount | remaining_amount | expiration_date     | comment    | status   |
+   |--------------------------------------+-----------------+------------------+---------------------+------------+----------|
+   | f8207787-8458-4cab-94c1-4ca84a702154 | $300.0          | $300.0           | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
+   +--------------------------------------+-----------------+------------------+---------------------+------------+----------+
 
 
 ``organizations credits create``
@@ -451,11 +451,11 @@ Example
        --expiration-date 2023-12-24T12:34:56 \
        --comment "Free Trial" \
        --sudo
-   +--------------------------------------+-------------------+---------------------+------------+----------+
-   | id                                   |   original_amount | expiration_date     | comment    | status   |
-   |--------------------------------------+-------------------+---------------------+------------+----------|
-   | f8207787-8458-4cab-94c1-4ca84a702154 |               300 | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
-   +--------------------------------------+-------------------+---------------------+------------+----------+
+   +--------------------------------------+-----------------+---------------------+------------+----------+
+   | id                                   | original_amount | expiration_date     | comment    | status   |
+   |--------------------------------------+-----------------+---------------------+------------+----------|
+   | f8207787-8458-4cab-94c1-4ca84a702154 | $300.0          | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
+   +--------------------------------------+-----------------+---------------------+------------+----------+
    ==> Success: Credit created.
 
 .. note::
@@ -482,11 +482,11 @@ Example
        --credit-id f8207787-8458-4cab-94c1-4ca84a702154
        --amount 500
        --sudo
-   +--------------------------------------+-------------------+---------------------+------------+----------+
-   | id                                   |   original_amount | expiration_date     | comment    | status   |
-   |--------------------------------------+-------------------+---------------------+------------+----------|
-   | f8207787-8458-4cab-94c1-4ca84a702154 |               500 | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
-   +--------------------------------------+-------------------+---------------------+------------+----------+
+   +--------------------------------------+-----------------+---------------------+------------+----------+
+   | id                                   | original_amount | expiration_date     | comment    | status   |
+   |--------------------------------------+-----------------+---------------------+------------+----------|
+   | f8207787-8458-4cab-94c1-4ca84a702154 | $500.0          | 2023-12-24T11:34:56 | Free Trial | ACTIVE   |
+   +--------------------------------------+-----------------+---------------------+------------+----------+
    ==> Success: Credit edited.
 
 .. note::

diff --git a/tests/commands/test_organizations.py b/tests/commands/test_organizations.py
@@ -581,7 +581,7 @@ def test_organizations_credits_create(mock_request):
         RequestMethod.POST,
         f"/api/v2/organizations/{org_id}/credits/",
         body={
-            "amount": amount,
+            "amount": amount * 100,
             "expiration_date": expiration_date.isoformat(),
             "comment": comment,
         },
@@ -634,7 +634,7 @@ def test_organizations_credits_edit(mock_request):
         RequestMethod.PATCH,
         f"/api/v2/organizations/{org_id}/credits/my_credit_id/",
         body={
-            "amount": 234.56,
+            "amount": 23456,
             "expiration_date": expiration_date.isoformat(),
             "comment": "Starter Package",
         },
@@ -660,7 +660,7 @@ def test_organizations_credits_edit_amount(mock_request):
         mock_request,
         RequestMethod.PATCH,
         f"/api/v2/organizations/{org_id}/credits/my_credit_id/",
-        body={"amount": 234.56},
+        body={"amount": 23456},
     )