Merge pull request #18 from solana-developers/adding-transactions

updating LastTransaction endpoint

Author: notEduardo

src/db/transactions.js

@@ -11,20 +11,35 @@ const createTransaction = async (signature, ip_address, wallet_address, github_u
     return result.rows[0];
 };
 
-const getLastTransaction = async ({ wallet_address, github_username, ip_address }) => {
-    const query = `
-    SELECT * FROM faucet.transactions
-    WHERE 
-        (wallet_address = $1) OR
-        (github_username = $2) OR
-        (ip_address = $3)
-    ORDER BY timestamp DESC
-    LIMIT 1;
-  `;
+const getLastTransaction = async ({ wallet_address, github_id, ip_address, queryLimit }) => {
+    let query;
+    let values;
+
+    if (github_id) {
+        query = `
+        SELECT * FROM faucet.transactions
+        WHERE 
+            (wallet_address = $1) OR
+            (ip_address = $2) OR
+            (github_username = $3)
+        ORDER BY timestamp DESC
+        LIMIT $4;
+        `;
+        values = [wallet_address, ip_address, github_id, queryLimit];
+    } else {
+        query = `
+        SELECT * FROM faucet.transactions
+        WHERE 
+            (wallet_address = $1) OR
+            (ip_address = $2)
+        ORDER BY timestamp DESC
+        LIMIT $3;
+        `;
+        values = [wallet_address, ip_address, queryLimit];
+    }
 
-    const values = [wallet_address || null, github_username || null, ip_address || null];
     const result = await db.query(query, values);
-    return result.rows[0]; // Returns the most recent transaction found
+    return result.rows;
 };
 
 // Not currently needed, but may be used for implementing TTL

src/routes/transactionsRoute.js

@@ -22,14 +22,15 @@ router.post('/transactions', async (req, res, next) => {
 
 // GET the most recent transaction based on wallet, GitHub or IP
 router.get('/transactions/last', async (req, res, next) => {
-    const { wallet_address, github_username, ip_address } = req.query;
+    const { wallet_address, github_id, ip_address, count } = req.query;
 
-    if (!wallet_address && !github_username && !ip_address) {
-        return res.status(400).json({ message: 'At least one parameter (wallet_address, github_username, or ip_address) is required.' });
+    if (!wallet_address || !ip_address) {
+        return res.status(400).json({ message: 'At least one parameter (wallet_address, or ip_address) is required.' });
     }
+    const queryLimit = !count ? 1 : Number(count);
 
     try {
-        const lastTransaction = await transactions.getLastTransaction({ wallet_address, github_username, ip_address });
+        const lastTransaction = await transactions.getLastTransaction({ wallet_address, github_id, ip_address, queryLimit });
 
         if (lastTransaction) {
             res.status(200).json(lastTransaction);