From aaadb000fd4dc2fb9758ba92d1ea3d15871c096f Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sun, 24 Aug 2014 21:46:41 -0700
Subject: Transaction notes and delete function

---
 routes/transactions.js | 55 ++++++++++++++++++++++++++++++--------------------
 routes/users.js        |  3 ---
 2 files changed, 33 insertions(+), 25 deletions(-)

(limited to 'routes')

diff --git a/routes/transactions.js b/routes/transactions.js
index 83ec441f..171163bc 100644
--- a/routes/transactions.js
+++ b/routes/transactions.js
@@ -4,6 +4,19 @@
   db = require('../redis');
 
   module.exports = {
+    index: function(req, res) {
+      return res.render('transactions/index', {
+        user: req.params.user,
+        layout: 'layout',
+        navigation: true,
+        js: (function() {
+          return global.js;
+        }),
+        css: (function() {
+          return global.css;
+        })
+      });
+    },
     json: function(req, res) {
       var r, user;
       user = req.params.user;
@@ -12,26 +25,25 @@
       };
       return db.lrange("" + user + ":transactions", 0, -1, function(err, transactions) {
         var cb, i, txid;
+        txid = function() {
+          var x;
+          x = transactions[i++];
+          if (typeof x !== "number") {
+            return x;
+          }
+          return user + ":transactions:" + x;
+        };
         cb = function(err, t) {
-          var txid;
           r.transactions.push(t);
           if (i >= transactions.length) {
             res.write(JSON.stringify(r));
             return res.end();
           } else {
-            txid = transactions[i++];
-            if (parseInt(txid)) {
-              txid = user + ":transactions:" + txid;
-            }
-            return db.hgetall(txid, cb);
+            return db.hgetall(txid(), cb);
           }
         };
         i = 0;
-        txid = transactions[i++];
-        if (parseInt(txid)) {
-          txid = user + ":transactions:" + txid;
-        }
-        return db.hgetall(txid, cb);
+        return db.hgetall(txid(), cb);
       });
     },
     create: function(req, res) {
@@ -56,17 +68,16 @@
         });
       });
     },
-    index: function(req, res) {
-      return res.render('transactions/index', {
-        user: req.params.user,
-        layout: 'layout',
-        navigation: true,
-        js: (function() {
-          return global.js;
-        }),
-        css: (function() {
-          return global.css;
-        })
+    update: function(req, res) {
+      return db.hset(req.params.txid, 'notes', req.body.notes, function() {
+        return res.end();
+      });
+    },
+    "delete": function(req, res) {
+      return db.del(req.params.txid, function() {
+        return db.lrem(req.params.user + ":transactions", 0, req.params.txid, function() {
+          return res.end();
+        });
       });
     }
   };
diff --git a/routes/users.js b/routes/users.js
index 8065e4f1..2b4a31ef 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -115,9 +115,6 @@
         });
       },
       update: function(req, res) {
-        if (!(req.params.user === req.user.username || req.user.username === 'admin')) {
-          return;
-        }
         if (req.body.password === '') {
           delete req.body.password;
         }
-- 
cgit v1.2.3