Merge pull request #163 from uma-universal-money-address/fix/getusedb…

…udget

Switch get_budget to used instead of remaining.

nwc_backend/event_handlers/__tests__/get_budget_test.py

@@ -64,8 +64,8 @@ async def test_get_budget_success__spending_limit_SAT_enabled(
         mock_get_budget_estimate.assert_not_called()
         spending_cycle = (await db.session.execute(select(SpendingCycle))).scalar_one()
         assert exclude_none_values(response.to_dict()) == {
-            "total_budget_msats": 1000000,
-            "remaining_budget_msats": 1000000,
+            "total_budget": 1000000,
+            "used_budget": 0,
             "renews_at": round(spending_cycle.end_time.timestamp()),
         }
 
@@ -104,13 +104,13 @@ async def test_pay_invoice_success__spending_limit_USD_enabled(
             headers=ANY,
         )
         assert exclude_none_values(response.to_dict()) == {
-            "total_budget_msats": estimated_budget_currency_amount * 1000,
-            "remaining_budget_msats": estimated_budget_currency_amount * 1000,
+            "total_budget": estimated_budget_currency_amount * 1000,
+            "used_budget": 0,
             "renews_at": ANY,
             "currency": {
                 "code": "USD",
                 "total_budget": total_budget_currency_amount,
-                "remaining_budget": total_budget_currency_amount,
+                "used_budget": 0,
                 "symbol": "$",
                 "name": "US Dollar",
                 "decimals": 2,

nwc_backend/event_handlers/get_budget_handler.py

@@ -20,9 +20,12 @@ async def get_budget(access_token: str, request: Nip47Request) -> Nip47BudgetRes
         round(current_cycle_end_time.timestamp()) if current_cycle_end_time else None
     )
     if budget_currency.code == "SAT":
+        used_budget_sats = (
+            current_spending_limit.amount - current_cycle_remaining_amount
+        )
         return Nip47BudgetResponse(
-            total_budget_msats=current_spending_limit.amount * 1000,
-            remaining_budget_msats=current_cycle_remaining_amount * 1000,
+            total_budget=current_spending_limit.amount * 1000,
+            used_budget=used_budget_sats * 1000,
             renews_at=current_cycle_renews_at,
         )
 
@@ -39,17 +42,18 @@ async def get_budget(access_token: str, request: Nip47Request) -> Nip47BudgetRes
         / current_spending_limit.amount
         * current_cycle_remaining_amount
     )
+    used_budget_sats = total_budget_sats - remaining_budget_sats
 
     return Nip47BudgetResponse(
         currency=Nip47BudgetCurrency(
             code=budget_currency.code,
             total_budget=current_spending_limit.amount,
-            remaining_budget=current_cycle_remaining_amount,
+            used_budget=current_spending_limit.amount - current_cycle_remaining_amount,
             symbol=budget_currency.symbol,
             name=budget_currency.name,
             decimals=budget_currency.decimals,
         ),
-        total_budget_msats=total_budget_sats * 1000,
-        remaining_budget_msats=remaining_budget_sats * 1000,
+        total_budget=total_budget_sats * 1000,
+        used_budget=used_budget_sats * 1000,
         renews_at=current_cycle_renews_at,
     )

nwc_backend/models/nip47_budget.py

@@ -8,18 +8,18 @@ class Nip47BudgetCurrency:
     symbol: str
     name: str
     decimals: int
-    remaining_budget: int
+    used_budget: int
     total_budget: int
 
 
 @dataclass
 class Nip47BudgetResponse:
-    remaining_budget_msats: Optional[int] = None
-    total_budget_msats: Optional[int] = None
+    used_budget: Optional[int] = None
+    total_budget: Optional[int] = None
     renews_at: Optional[int] = None
     currency: Optional[Nip47BudgetCurrency] = None
 
     def to_dict(self):
-        if self.remaining_budget_msats is None:
+        if self.used_budget is None:
             return {}
         return {k: v for k, v in asdict(self).items() if v is not None}