[taler-cashless2ecash] branch master updated: fix: wire gateway queries

[gnunet]

This is an automated email from the git hooks/post-receive script.

joel-haeberli pushed a commit to branch master
in repository cashless2ecash.

The following commit(s) were added to refs/heads/master by this push:
     new 055b86d  fix: wire gateway queries
055b86d is described below

commit 055b86ddb2b969167e632234a422b1f581479115
Author: Joel-Haeberli <haebu@rubigen.ch>
AuthorDate: Mon May 6 21:00:55 2024 +0200

    fix: wire gateway queries
---
 c2ec/db-postgres.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/c2ec/db-postgres.go b/c2ec/db-postgres.go
index b4bea64..6b410d2 100644
--- a/c2ec/db-postgres.go
+++ b/c2ec/db-postgres.go
@@ -107,13 +107,15 @@ const PS_CONFIRMED_TRANSACTIONS_ASC_MAX = "SELECT * FROM 
" + WITHDRAWAL_TABLE_NA
        " WHERE " + WITHDRAWAL_FIELD_NAME_STATUS + "='" + string(CONFIRMED) + 
"'" +
        " ORDER BY " + WITHDRAWAL_FIELD_NAME_ID + " ASC" +
        " LIMIT $1" +
-       " OFFSET ((SELECT COUNT(*) FROM " + WITHDRAWAL_TABLE_NAME + ")-2)"
+       " OFFSET ((SELECT COUNT(*) FROM " + WITHDRAWAL_TABLE_NAME +
+       " WHERE " + WITHDRAWAL_FIELD_NAME_STATUS + "=" + string(CONFIRMED) + 
")-1)" // TODO (-time since request)
 
 const PS_CONFIRMED_TRANSACTIONS_DESC_MAX = "SELECT * FROM " + 
WITHDRAWAL_TABLE_NAME +
        " WHERE " + WITHDRAWAL_FIELD_NAME_STATUS + "='" + string(CONFIRMED) + 
"'" +
        " ORDER BY " + WITHDRAWAL_FIELD_NAME_ID + " DESC" +
        " LIMIT $1" +
-       " OFFSET ((SELECT COUNT(*) FROM " + WITHDRAWAL_TABLE_NAME + ")-2)"
+       " OFFSET ((SELECT COUNT(*) FROM " + WITHDRAWAL_TABLE_NAME +
+       " WHERE " + WITHDRAWAL_FIELD_NAME_STATUS + "=" + string(CONFIRMED) + 
")-1)" // TODO (-time since request)
 
 const PS_GET_TRANSFERS_ASC = "SELECT * FROM " + TRANSFER_TABLE_NAME +
        " ORDER BY " + TRANSFER_FIELD_NAME_ROW_ID + " ASC" +
@@ -128,16 +130,14 @@ const PS_GET_TRANSFERS_DESC = "SELECT * FROM " + 
TRANSFER_TABLE_NAME +
 const PS_GET_TRANSFERS_ASC_MAX = "SELECT * FROM " + TRANSFER_TABLE_NAME +
        " ORDER BY " + TRANSFER_FIELD_NAME_ROW_ID + " ASC" +
        " LIMIT $1" +
-       " OFFSET ((SELECT COUNT(*) FROM " + TRANSFER_TABLE_NAME + ")-2)"
+       " OFFSET ((SELECT COUNT(*) FROM " + TRANSFER_TABLE_NAME +
+       " WHERE " + TRANSFER_FIELD_NAME_STATUS + "=0)-1)" // TODO Timestamp 
based offset (-time since request)
 
 const PS_GET_TRANSFERS_DESC_MAX = "SELECT * FROM " + TRANSFER_TABLE_NAME +
        " ORDER BY " + TRANSFER_FIELD_NAME_ROW_ID + " DESC" +
        " LIMIT $1" +
-       " OFFSET ((SELECT COUNT(*) FROM " + TRANSFER_TABLE_NAME + ")-2)"
-
-const PS_WITHDRAWAL_MAX_OFFSET_QUERY = "((SELECT COUNT(*) FROM withdrawal)-1)" 
//"(SELECT ((SELECT last_value FROM 
c2ec.withdrawal_withdrawal_row_id_seq)-(((SELECT last_value FROM 
c2ec.withdrawal_withdrawal_row_id_seq)-(SELECT COUNT(*) FROM 
c2ec.withdrawal))))-1)"
-
-const PS_TRANSFER_MAX_OFFSET_QUERY = "(SELECT ((SELECT last_value FROM 
c2ec.transfer_row_id_seq)-(((SELECT last_value FROM 
c2ec.transfer_row_id_seq)-(SELECT COUNT(*) FROM c2ec.transfer))))-1)"
+       " OFFSET ((SELECT COUNT(*) FROM " + TRANSFER_TABLE_NAME +
+       " WHERE " + TRANSFER_FIELD_NAME_STATUS + "=0)-1)" // TODO Timestamp 
based offset (-time since request)
 
 // Postgres implementation of the C2ECDatabase
 type C2ECPostgres struct {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.