Counted working

2024-11-20 10:39:59 +01:00 · 2021-04-05 01:48:35 +01:00 · 2021-04-05 01:48:35 +01:00 · f5d06653a6
commit f5d06653a6
parent 744662fb63
5 changed files with 103 additions and 50 deletions
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@ -50,14 +50,16 @@ async def create_charge(user: str, description: Optional[str] = None, onchainwal
        )
        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        """,
-        (charge_id, user, description, onchainwallet, onchainaddress, lnbitswallet, payment_request, payment_hash, webhook, time, amount, 0, False),
+        (charge_id, user, description, onchainwallet, onchainaddress, lnbitswallet,
+         payment_request, payment_hash, webhook, time, amount, 0, False),
    )
    return await get_charge(charge_id)

+
 async def update_charge(charge_id: str, **kwargs) -> Optional[Charges]:
    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(f"UPDATE charges SET {q} WHERE id = ?", (*kwargs.values(), wallet_id))
-    row = await db.fetchone("SELECT * FROM charges WHERE id = ?", (wallet_id,))
+    await db.execute(f"UPDATE charges SET {q} WHERE id = ?", (*kwargs.values(), charge_id))
+    row = await db.fetchone("SELECT * FROM charges WHERE id = ?", (charge_id,))
    return Charges.from_row(row) if row else None


@ -74,6 +76,7 @@ async def get_charges(user: str) -> List[Charges]:
 async def delete_charge(charge_id: str) -> None:
    await db.execute("DELETE FROM charges WHERE id = ?", (charge_id,))

+
 async def check_address_balance(charge_id: str) -> List[Charges]:
    charge = await get_charge(charge_id)
    if charge.onchainaddress:
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@ -1,6 +1,7 @@
 from sqlite3 import Row
 from typing import NamedTuple

+
 class Charges(NamedTuple):
    id: str
    user: str
@ -18,5 +19,5 @@ class Charges(NamedTuple):
    timestamp: int

    @classmethod
-    def from_row(cls, row: Row) -> "Payments":
+    def from_row(cls, row: Row) -> "Charges":
        return cls(**dict(row))
--- a/lnbits/extensions/satspay/templates/satspay/_api_docs.html
+++ b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
@ -41,30 +41,82 @@
        </q-card-section>
      </q-card>
    </q-expansion-item>
-    <q-expansion-item group="api" dense expand-separator label="Get a pay link">
+    <q-expansion-item group="api" dense expand-separator label="Update charge">
      <q-card>
        <q-card-section>
          <code
-            ><span class="text-blue">GET</span>
-            /pay/api/v1/links/&lt;pay_id&gt;</code
+            ><span class="text-blue">PUT</span>
+            /satspay/api/v1/charge/&lt;charge_id&gt;</code
          >
          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-          <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
          <h5 class="text-caption q-mt-sm q-mb-none">
            Body (application/json)
          </h5>
          <h5 class="text-caption q-mt-sm q-mb-none">
-            Returns 201 CREATED (application/json)
+            Returns 200 OK (application/json)
          </h5>
-          <code>{"lnurl": &lt;string&gt;}</code>
+          <code>[&lt;charge_object&gt;, ...]</code>
          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
          <code
-            >curl -X GET {{ request.url_root }}pay/api/v1/links/&lt;pay_id&gt;
+            >curl -X POST {{ request.url_root }}api/v1/charge/&lt;charge_id&gt;
+            -d '{"onchainwallet": &lt;string, watchonly_wallet_id&gt;,
+            "description": &lt;string&gt;, "webhook":&lt;string&gt;, "time":
+            &lt;integer&gt;, "amount": &lt;integer&gt;, "lnbitswallet":
+            &lt;string, lnbits_wallet_id&gt;}' -H "Content-type:
+            application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+
+    <q-expansion-item group="api" dense expand-separator label="Get charge">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /satspay/api/v1/charge/&lt;charge_id&gt;</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;charge_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.url_root }}api/v1/charge/&lt;charge_id&gt;
            -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
          </code>
        </q-card-section>
      </q-card>
    </q-expansion-item>
+    <q-expansion-item group="api" dense expand-separator label="Get charges">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span> /satspay/api/v1/charges</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;charge_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.url_root }}api/v1/charges -H "X-Api-Key: {{
+            g.user.wallets[0].inkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
    <q-expansion-item
      group="api"
      dense
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@ -297,10 +297,10 @@
    }
    
    obj.displayUrl = ['/satspay/', obj.id].join('')
+
    return obj
  }

-
  new Vue({
    el: '#vue',
    mixins: [windowMixin],
@ -312,6 +312,7 @@
        checker: null,
        walletLinks: [],
        ChargeLinks: [],
+        ChargeLinksObj: [],
        onchainwallet: '',
        currentaddress: "",
        Addresses: {
@ -324,12 +325,7 @@

        ChargesTable: {
          columns: [
-          {
-              name: 'timeleft',
-              align: 'left',
-              label: 'Time left',
-              field: 'countdown'
-            },
+
            {
              name: 'id',
              align: 'left',
@ -342,6 +338,12 @@
              label: 'Title',
              field: 'description'
            },
+            {
+              name: 'timeleft',
+              align: 'left',
+              label: 'Time left',
+              field: 'date'
+            },
            {
              name: 'amount',
              align: 'left',
@ -354,6 +356,12 @@
              label: 'Balance',
              field: 'balance'
            },
+            {
+              name: 'time to pay',
+              align: 'left',
+              label: 'Time to Pay',
+              field: 'time'
+            },
            {
              name: 'onchain address',
              align: 'left',
@ -366,12 +374,6 @@
              label: 'LNbits wallet',
              field: 'lnbitswallet'
            },
-            {
-              name: 'time to pay',
-              align: 'left',
-              label: 'Time to Pay',
-              field: 'time'
-            },
          ],
          pagination: {
            rowsPerPage: 10
@ -391,19 +393,12 @@
        }
      }
    },
-
-    computed: {
-      updateCountdowns() {
-        console.log("whatever")
-      Object.mapWalletLink(this.data).forEach(row => {
-        let datem = moment(row.time).format('YYYY-MM-DD HH:mm');
-        row.countdown = countdown(new Date(datem).getTime()).toString();
-      })
-    }
-    },
-
    methods: {
+      updateCountdowns: function () {
+        setInterval(function(){ 
        
+        }, 1000)
+      },

      getWalletLinks: function () {
        var self = this
@ -494,7 +489,7 @@
      },
      sendFormDataCharge: function () {
        var self = this
-        var wallet = self.g.user.wallets[0].inkey
+        var wallet = self.g.user.wallets[0].adminkey
        var data = self.formDialogCharge.data
        console.log(data)
        data.amount = parseInt(data.amount)
@ -515,7 +510,7 @@
          .request(
            'PUT',
            '/satspay/api/v1/Charge/' + data.id,
-            wallet.inkey, data)
+            wallet.adminkey, data)
          .then(function (response) {
            self.Charge = _.reject(self.Charge, function (obj) {
              return obj.id === data.id
@ -654,8 +649,8 @@
        }
        }, 5000);
        getCharges()
-
-
+        var updateCountdowns = this.updateCountdowns
+        updateCountdowns()
    }
  })
 </script>
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@ -10,6 +10,7 @@ from lnbits.decorators import api_check_wallet_key, api_validate_post_request
 from lnbits.extensions.satspay import satspay_ext
 from .crud import (
    create_charge,
+    update_charge,
    get_charge,
    get_charges,
    delete_charge,
@ -38,7 +39,7 @@ async def api_charge_create_or_update(charge_id=None):
        charge = await create_charge(user=g.wallet.user, **g.data)
        return jsonify(charge._asdict()), HTTPStatus.CREATED
    else:
-        charge = await update_charge(user=g.wallet.user, **g.data)
+        charge = await update_charge(charge_id=charge_id, **g.data)
        return jsonify(charge._asdict()), HTTPStatus.OK


@ -59,12 +60,13 @@ async def api_charges_retrieve():
@satspay_ext.route("/api/v1/charge/<charge_id>", methods=["GET"])
@api_check_wallet_key("invoice")
 async def api_charge_retrieve(charge_id):
-    charge = get_charge(charge_id)
+    charge = await get_charge(charge_id)
+    print(charge)

    if not charge:
        return jsonify({"message": "charge does not exist"}), HTTPStatus.NOT_FOUND

-    return jsonify({charge}), HTTPStatus.OK
+    return jsonify(charge._asdict()), HTTPStatus.OK


@satspay_ext.route("/api/v1/charge/<charge_id>", methods=["DELETE"])