sort responses

fundingrate · Oct 3, 2019 · 70b239e · 70b239e
1 parent b5477eb
commit 70b239e
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 7 deletions.
diff --git a/libs/actions.js b/libs/actions.js
@@ -26,7 +26,7 @@ module.exports = ({ events, trades, bybit, stats, traders, users, tokens }) => {
       return { user, token }
     },
     async listUsers() {
-      return users.list()
+      return users.listSorted()
     },
     async listTraders() {
       return traders.keys()
@@ -51,13 +51,13 @@ module.exports = ({ events, trades, bybit, stats, traders, users, tokens }) => {
       assert(token, 'token required')
       const { valid, userid, type } = await tokens.get(token)
       assert(valid, 'token is no longer valid')
-      return trades.getBy('userid', userid)
+      return trades.listUserSorted(userid)
     },
     async listMyEvents({ token }) {
       assert(token, 'token required')
       const { valid, userid, type } = await tokens.get(token)
       assert(valid, 'token is no longer valid')
-      return events.getBy('userid', userid)
+      return events.listUserSorted(userid)
     },
     async getMyStats({ token }) {
       assert(token, 'token required')
@@ -69,7 +69,7 @@ module.exports = ({ events, trades, bybit, stats, traders, users, tokens }) => {
     },
     async listMyTokens({ token }) {
       const { userid } = await tokens.get(token)
-      return tokens.getBy('userid', userid)
-    }
+      return tokens.listUserSorted(userid)
+    },
   }
 }
diff --git a/models/events.js b/models/events.js
@@ -18,6 +18,23 @@ module.exports = async con => {
       const query = table.table().orderBy({index: 'created'})
       return table.streamify(query)
     },
+    listSorted() {
+      const q = table
+        .table()
+        .orderBy({ index: table.r.desc('created') })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(q)
+    },
+    listUserSorted(userid) {
+      const query = table
+        .table()
+        .orderBy({ index: 'created' })
+        .filter({ userid })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(query)
+    },
     // listTopSites() {
     //   const query = table
     //     .table()

diff --git a/models/stats.js b/models/stats.js
@@ -18,6 +18,23 @@ module.exports = async con => {
       const query = table.table().orderBy({index: 'created'})
       return table.streamify(query)
     },
+    listSorted() {
+      const q = table
+        .table()
+        .orderBy({ index: table.r.desc('created') })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(q)
+    },
+    listUserSorted(userid) {
+      const query = table
+        .table()
+        .orderBy({ index: 'created' })
+        .filter({ userid })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(query)
+    },
     // listTopSites() {
     //   const query = table
     //     .table()

diff --git a/models/tickers.js b/models/tickers.js
@@ -18,5 +18,22 @@ module.exports = async con => {
       const query = table.table().orderBy({index: 'created'})
       return table.streamify(query)
     },
+    listSorted() {
+      const q = table
+        .table()
+        .orderBy({ index: table.r.desc('created') })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(q)
+    },
+    listUserSorted(userid) {
+      const query = table
+        .table()
+        .orderBy({ index: 'created' })
+        .filter({ userid })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(query)
+    },
   }
 }
diff --git a/models/tokens.js b/models/tokens.js
@@ -41,6 +41,23 @@ module.exports = async con => {
         expires: ONE_DAY_MS,
       })
     },
+    listSorted() {
+      const q = table
+        .table()
+        .orderBy({ index: table.r.desc('created') })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(q)
+    },
+    listUserSorted(userid) {
+      const query = table
+        .table()
+        .orderBy({ index: 'created' })
+        .filter({ userid })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(query)
+    },
     // listTopSites() {
     //   const query = table
     //     .table()

diff --git a/models/trades.js b/models/trades.js
@@ -4,6 +4,13 @@ module.exports = async con => {
   const schema = {
     table: 'trades',
     indices: ['created', 'type', 'provider', 'userid'],
+    compound: [
+      {
+        //Compound index
+        name: 'created_userid',
+        fields: ['created', 'userid'],
+      },
+    ],
   }
 
   const table = await Table(con, schema)
@@ -18,15 +25,23 @@ module.exports = async con => {
       const query = table.table().orderBy({ index: 'created' })
       return table.streamify(query)
     },
-    listClosed() {
+    listSorted() {
       const q = table
         .table()
         .orderBy({ index: table.r.desc('created') })
-        .filter({ done: true })
         .limit(100)
         .coerceTo('array')
       return table.run(q)
     },
+    listUserSorted(userid) {
+      const query = table
+        .table()
+        .orderBy({ index: 'created' })
+        .filter({ userid })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(query)
+    },
     // listTopSites() {
     //   const query = table
     //     .table()

diff --git a/models/users.js b/models/users.js
@@ -20,6 +20,14 @@ module.exports = async con => {
       const query = table.table().orderBy({ index: 'created' })
       return table.streamify(query)
     },
+    listSorted() {
+      const q = table
+        .table()
+        .orderBy({ index: table.r.desc('created') })
+        .limit(100)
+        .coerceTo('array')
+      return table.run(q)
+    },
     async create(username) {
       assert(username, 'username required')
       username = username.toLowerCase()