add _id to transactions results + fix typecast on paging

nitsujlangston · Sep 21, 2018 · 910ce72 · 910ce72
1 parent 823a70a
commit 910ce72
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/packages/bitcore-node/src/models/transaction.ts b/packages/bitcore-node/src/models/transaction.ts
@@ -314,12 +314,9 @@ export class Transaction extends BaseModel<ITransaction> {
   }
 
   getTransactions(params: { query: any; options: StreamingFindOptions<ITransaction> }) {
-    console.log('[transaction.ts.316:params:]',params); //TODO
     let originalQuery = params.query;
     const { query, options } = Storage.getFindOptions(this, params.options);
     const finalQuery = Object.assign({}, originalQuery, query);
-console.log('[transaction.ts.321:finalQuery:]',finalQuery); //TODO
-console.log('[transaction.ts.321:options:]',options); //TODO
     return this.collection.find(finalQuery, options).addCursorFlag('noCursorTimeout', true);
   }
 

diff --git a/packages/bitcore-node/src/providers/chain-state/internal/internal.ts b/packages/bitcore-node/src/providers/chain-state/internal/internal.ts
@@ -304,8 +304,6 @@ export class InternalStateProvider implements CSP.IChainStateService {
       //finalQuery = Object.assign({}, finalQuery, query);
       finalOptions = args;
     }
-    console.log('[internal.ts.307:finalQuery:]',finalQuery); //TODO
-console.log('[internal.ts.308:finalOptions:]',finalOptions); //TODO
     let transactionStream = TransactionModel.getTransactions({ query: finalQuery, options: finalOptions });
     let listTransactionsStream = new ListTransactionsStream(wallet);
     transactionStream.pipe(listTransactionsStream).pipe(stream);

diff --git a/packages/bitcore-node/src/providers/chain-state/internal/transforms.ts b/packages/bitcore-node/src/providers/chain-state/internal/transforms.ts
@@ -61,6 +61,7 @@ export class ListTransactionsStream extends Transform {
         if (!sendingToOurself) {
           self.push(
             JSON.stringify({
+              id: transaction._id,
               txid: transaction.txid,
               fee: transaction.fee,
               size: transaction.size,
@@ -75,6 +76,7 @@ export class ListTransactionsStream extends Transform {
         } else {
           self.push(
             JSON.stringify({
+              id: transaction._id,
               txid: transaction.txid,
               fee: transaction.fee,
               size: transaction.size,
@@ -91,6 +93,7 @@ export class ListTransactionsStream extends Transform {
       if (fee > 0) {
         self.push(
           JSON.stringify({
+            id: transaction._id,
             txid: transaction.txid,
             category: 'fee',
             satoshis: -fee,
@@ -111,6 +114,7 @@ export class ListTransactionsStream extends Transform {
         if (weReceived) {
           self.push(
             JSON.stringify({
+              id: transaction._id,
               txid: transaction.txid,
               fee: transaction.fee,
               size: transaction.size,

diff --git a/packages/bitcore-node/src/services/storage.ts b/packages/bitcore-node/src/services/storage.ts
@@ -4,6 +4,7 @@ import { TransformableModel } from '../types/TransformableModel';
 import logger from '../logger';
 import config from '../config';
 import { LoggifyClass } from '../decorators/Loggify';
+import { ObjectID } from 'bson';
 import { MongoClient, Db, Cursor } from 'mongodb';
 import { MongoBound } from '../models/base';
 import '../models';
@@ -87,6 +88,9 @@ export class StorageService {
             typecastedValue = new Date(oldValue) as any;
             break;
         }
+      // TODO: Micah check this!
+      } else if (modelKey == "_id") {
+        typecastedValue = new ObjectID(oldValue) as any;
       }
     }
     return typecastedValue;
@@ -119,27 +123,30 @@ export class StorageService {
   }
   getFindOptions<T>(model: TransformableModel<T>, originalOptions: StreamingFindOptions<T>) {
     let options: StreamingFindOptions<T> = {};
-    let query: any = {};
+    let query: any = {}, since: any;
     if ( originalOptions.paging &&
       this.validPagingProperty(model, originalOptions.paging)
     ) {
-      //if (originalOptions.since !== undefined) {
-      //  options.since = this.typecastForDb(model, originalOptions.paging, originalOptions.since);
-      //}
+
+
+      if (originalOptions.since !== undefined) {
+        since = this.typecastForDb(model, originalOptions.paging, originalOptions.since);
+      }
+
+
       if (originalOptions.direction && Number(originalOptions.direction) === 1) {
-        if (originalOptions.since !== undefined) {
-          query[originalOptions.paging] = { $gt: originalOptions.since };
+        if (since) {
+          query[originalOptions.paging] = { $gt: since };
         }
         options.sort = { [originalOptions.paging]: 1 };
       } else {
-        if (originalOptions.since !== undefined) {
-          query[originalOptions.paging] = { $lt: originalOptions.since };
+        if (since) {
+          query[originalOptions.paging] = { $lt: since };
         }
         options.sort = { [originalOptions.paging]: -1 };
       }
     }
     options.limit = Math.min(originalOptions.limit || 100, 1000);
-console.log('[storage.ts.138:options:]',options); //TODO
     return { query, options };
   }
 
@@ -152,7 +159,6 @@ console.log('[storage.ts.138:options:]',options); //TODO
   ) {
     const { query, options } = this.getFindOptions(model, originalOptions);
     const finalQuery = Object.assign({}, originalQuery, query);
-    console.log('[storage.ts.153:options:]',options); //TODO
     let cursor = model.collection.find(finalQuery, options).stream({
       transform: transform || model._apiTransform
     });