Merge branch 'develop' into feature/issue-111

secret-tech · Apr 2, 2018 · 04c02a4 · 04c02a4
2 parents 3ae991b + 47ef826
commit 04c02a4
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 118 deletions.
diff --git a/apiary.apib b/apiary.apib
@@ -622,6 +622,22 @@ Authentication attempts with not verified token will result in 401 response.
                 "status": "pending",
                 "type": "eth_transfer",
                 "direction": "in"
+            },
+            {
+                "address": '0x99eb89a5D15A6D487da3f3C1fC4fc2378eE227aa',
+                "confirmsNeeded": 0,
+                "currency": 'BTC',
+                "expiredOn": 1234567890,
+                "id": '563143b280d2387c91807933',
+                "qrcodeUrl": 'qrcode_url',
+                "receivedAmount": '0.1',
+                "receivedConfirms": '0',
+                "status": '100',
+                "statusUrl": 'status_url',
+                "totalAmount": 1,
+                "txnId": 'abc123432',
+                "type": 'gateway_transaction',
+                "timeout": 3600
             }
         ]
 
@@ -812,12 +828,12 @@ Authentication attempts with not verified token will result in 401 response.
         {
             "address": "mhocbNymvkn9sP7FRAionoif2SQqJBuibx",
             "amount": 5,
-            "confirms_needed": "0",
+            "confirmsNeeded": "0",
             "currency1": "ETH",
             "currency2": "BTC",
             "email": "[email protected]",
-            "qrcode_url": "https://www.coinpayments.net/qrgen.php?id=CPCC41OJBXM5TKQO3HNMDR3F0W&key=8877e51b87aee89e256336e7e955ec53",
-            "status_url": "https://www.coinpayments.net/index.php?cmd=status&id=CPCC41OJBXM5TKQO3HNMDR3F0W&key=8877e51b87aee89e256336e7e955ec53",
+            "qrcodeUrl": "https://www.coinpayments.net/qrgen.php?id=CPCC41OJBXM5TKQO3HNMDR3F0W&key=8877e51b87aee89e256336e7e955ec53",
+            "statusUrl": "https://www.coinpayments.net/index.php?cmd=status&id=CPCC41OJBXM5TKQO3HNMDR3F0W&key=8877e51b87aee89e256336e7e955ec53",
             "timeout": 3600,
-            "txn_id": "CPCC4YOJBXMI1VQOAHNMDR330W"
+            "txnId": "CPCC4YOJBXMI1VQOAHNMDR330W"
         }
diff --git a/docs/index.html b/docs/index.html
diff --git a/src/controllers/gateway.controller.ts b/src/controllers/gateway.controller.ts
@@ -10,6 +10,8 @@ import config from '../config';
 import { getConnection } from 'typeorm';
 import { PaymentGateTransaction } from '../entities/payment.gate.transaction';
 
+import { Logger } from '../logger';
+
 const IPN_RESPONSE_STATUS_COMPLETE = 100;
 const IPN_RESPONSE_STATUS_QUEUED_PAYOUT = 2;
 
@@ -23,6 +25,8 @@ const cpMiddleware = CoinPayments.ipn({
   '/gateway'
 )
 export class GatewayController {
+  private logger = Logger.getInstance('DASHBOARD_CONTROLLER');
+
   constructor(
     @inject(VerificationClientType) private verificationClient: VerificationClientInterface,
     @inject(CoinpaymentsClientType) private coinpaimentsClient: CoinpaymentsClientInterface,
@@ -48,6 +52,8 @@ export class GatewayController {
     'AuthMiddleware'
   )
   async createTransaction(req: AuthorizedRequest, res: Response): Promise<void> {
+    const logger = this.logger.sub({ email: req.user.email }, '[createTransaction] ');
+
     try {
       const tx = await this.paymentsService.initiateBuyEths(
         req.user,
@@ -58,6 +64,7 @@ export class GatewayController {
 
       res.json(tx.buyCoinpaymentsData);
     } catch (error) {
+      logger.exception(error);
       res.json(error);
     }
   }
@@ -80,6 +87,7 @@ export class GatewayController {
     (req, res, next) => cpMiddleware(req, {end: () => {}}, next)
   )
   async ipn(req: Request, res: Response, next): Promise<void> {
+    const logger = this.logger.sub({ ipnId: req.body.ipn_id }, '[IPN Handler] ');
     try {
       if (req.body.status >= IPN_RESPONSE_STATUS_COMPLETE) {
         // complete
@@ -94,6 +102,7 @@ export class GatewayController {
 
       res.end('IPN OK');
     } catch (error) {
+      logger.exception(error);
       res.end('IPN Error: ' + error);
     }
   }

diff --git a/src/controllers/specs/dashboard.controller.spec.ts b/src/controllers/specs/dashboard.controller.spec.ts
@@ -244,9 +244,25 @@ describe('Dashboard', () => {
             qrcodeUrl: 'qrcode_url',
             receivedAmount: '0.1',
             receivedConfirms: '0',
+            status: '100',
             statusUrl: 'status_url',
             totalAmount: 1,
             txnId: 'abc123432',
+            type: 'gateway_transaction',
+            timeout: 3600
+          },
+          {
+            address: '0x99eb89a5D15A6D487da3f3C1fC4fc2378eE227aa',
+            confirmsNeeded: 0,
+            currency: 'BTC',
+            expiredOn: 1234567890,
+            id: '563143b280d2387c91807f00',
+            qrcodeUrl: 'qrcode_url',
+            status: '-1',
+            statusUrl: 'status_url',
+            timeout: 3600,
+            totalAmount: 1,
+            txnId: 'abc124',
             type: 'gateway_transaction'
           }
         ]);

diff --git a/src/entities/ipn.response.ts b/src/entities/ipn.response.ts
@@ -31,7 +31,7 @@ export class IPNResponse {
 
   // API fields
   @Column()
-  staus: number; // see: https://www.coinpayments.net/merchant-tools-ipn#statuses
+  status: number; // see: https://www.coinpayments.net/merchant-tools-ipn#statuses
 
   @Column()
   statusText: string;
@@ -98,6 +98,7 @@ export class IPNResponse {
     ipnResponse.receivedAmount = data.received_amount;
     ipnResponse.receivedConfirms = data.received_amount;
     ipnResponse.statusText = data.status_text;
+    ipnResponse.status = data.status;
     ipnResponse.timestamp = data.timestamp;
     ipnResponse.txnId = data.txn_id;
 

diff --git a/src/entities/payment.gate.transaction.ts b/src/entities/payment.gate.transaction.ts
@@ -39,9 +39,6 @@ export class PaymentGateTransaction {
   @Column()
   buyIpns: Array<IPNResponse>;
 
-  @Column()
-  convertIpns: Array<any>;
-
   @Column()
   timestamp: number;
 }
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -374,7 +374,6 @@ declare interface PaymentGateTransactionInterface {
   buyCoinpaymentsData: any;
   convertCoinpaymentsData: null;
   buyIpns: Array<any>;
-  convertIpns: Array<any>;
 }
 
 declare interface PaymentsServiceInterface {
@@ -403,6 +402,7 @@ declare interface PaymentGateTransactionView {
   qrcodeUrl: string;
   address: string;
   timestamp: number;
+  timeout: number;
   expiredOn: number;
   txnId: string;
   statusUrl: string;

diff --git a/src/services/ipn.service.ts b/src/services/ipn.service.ts
@@ -5,16 +5,23 @@ import { IPNResponse } from '../entities/ipn.response';
 import { CoinpaymentsClient, CoinpaymentsClientType } from './coinpayments/coinpayments.client';
 import config from '../config';
 import { Investor } from '../entities/investor';
+import { Logger } from '../logger';
 
 @injectable()
 export class IPNService implements IPNServiceInterface {
+  private logger = Logger.getInstance('IPN_SERVICE');
 
   constructor(
     @inject(CoinpaymentsClientType) private cpClient: CoinpaymentsClientInterface
   ) { }
 
-  async processFail(data: any): Promise<PaymentGateTransactionInterface> {
+  async processFail(data: IPNApiTypeResponse): Promise<PaymentGateTransactionInterface> {
+    const logger = this.logger.sub({ ipn_id: data.ipn_id }, '[processFail] ');
+
     const txRepository = getConnection().mongoManager.getMongoRepository(PaymentGateTransaction);
+
+    logger.debug('Find transaction', { txId: data.txn_id } );
+
     const tx: PaymentGateTransaction = await txRepository.findOne({where: {
       'buyCoinpaymentsData.txnId': data.txn_id
     }});
@@ -32,15 +39,18 @@ export class IPNService implements IPNServiceInterface {
     tx.status = PAYMENT_GATE_TRANSACTION_STATUS_FAILED;
     if (tx.type === PAYMENT_GATE_TRANSACTION_TYPE_BUY) {
       tx.buyIpns.push({...ipnResponse});
-    } else {
-      tx.convertIpns.push({...ipnResponse});
     }
 
     return getConnection().mongoManager.save(tx);
   }
 
-  async processPending(data: any): Promise<PaymentGateTransactionInterface> {
+  async processPending(data: IPNApiTypeResponse): Promise<PaymentGateTransactionInterface> {
+    const logger = this.logger.sub({ ipn_id: data.ipn_id }, '[processPending] ');
+
     const txRepository = getConnection().mongoManager.getMongoRepository(PaymentGateTransaction);
+
+    logger.debug('Find transaction', { txn_id: data.txn_id });
+
     const tx: PaymentGateTransaction = await txRepository.findOne({where: {
       'buyCoinpaymentsData.txnId': data.txn_id
     }});
@@ -58,17 +68,19 @@ export class IPNService implements IPNServiceInterface {
     tx.status = PAYMENT_GATE_TRANSACTION_STATUS_PENDING;
     if (tx.type === PAYMENT_GATE_TRANSACTION_TYPE_BUY) {
       tx.buyIpns.push({...ipnResponse});
-    } else {
-      tx.convertIpns.push({...ipnResponse});
     }
 
     return getConnection().mongoManager.save(tx);
   }
 
   async processComplete(data: IPNApiTypeResponse): Promise<PaymentGateTransactionInterface> {
+    const logger = this.logger.sub({ ipnId: data.ipn_id }, '[processComplete] ');
+
     const txRepository = getConnection().mongoManager.getMongoRepository(PaymentGateTransaction);
     const investorRepository = getConnection().mongoManager.getMongoRepository(Investor);
 
+    logger.debug('Find transaction', { txn_id: data.txn_id });
+
     const tx: PaymentGateTransaction = await txRepository.findOne({where: {
       'buyCoinpaymentsData.txnId': data.txn_id
     }});
@@ -87,6 +99,7 @@ export class IPNService implements IPNServiceInterface {
     const investor = await investorRepository.findOne({where: {email: tx.userEmail}});
 
     try {
+      logger.debug('Convert Coins');
       tx.convertCoinpaymentsData = await this.cpClient.convertCoinsTransaction({
         amount: data.net,
         from: tx.buyCoinpaymentsData.currency2,

diff --git a/src/services/payments.service.ts b/src/services/payments.service.ts
@@ -20,7 +20,6 @@ export class PaymentsService implements PaymentsServiceInterface {
     const tx = new PaymentGateTransaction();
     tx.buyCoinpaymentsData = txCoinpaymentsData;
     tx.buyIpns = [];
-    tx.convertIpns = [];
     tx.convertCoinpaymentsData = null;
     tx.expiredOn = txCoinpaymentsData.timeout + Date.now();
     tx.status = PAYMENT_GATE_TRANSACTION_STATUS_STARTED;

diff --git a/src/services/specs/ipn.service.spec.ts b/src/services/specs/ipn.service.spec.ts
@@ -102,7 +102,6 @@ describe('IPN Service', () => {
 
       expect(tx.type).to.eq(PAYMENT_GATE_TRANSACTION_TYPE_CONVERT);
       expect(tx.status).to.eq(PAYMENT_GATE_TRANSACTION_STATUS_STARTED);
-      expect(tx.convertIpns.length).to.eq(0);
       expect(tx.buyIpns.length).to.eq(1);
       expect(tx.convertCoinpaymentsData).to.contain(converResult);
       expect(tx.buyIpns[0]).to.contain(ipnResponse);

diff --git a/src/services/transaction.service.ts b/src/services/transaction.service.ts
@@ -75,63 +75,45 @@ export class TransactionService implements TransactionServiceInterface {
   async getTransactionsOfUser(user: Investor): Promise<GenericTransaction[]> {
     const data: Array<GenericTransaction> = [];
 
-    const txs = await getMongoManager().createEntityCursor(Transaction, {
-      '$and': [
-        {
-          '$or': [
-            {
-              'from': user.ethWallet.address
-            },
-            {
-              'to': user.ethWallet.address
-            }
-          ]
-        },
-        {
-          'type': {
-            '$ne': REFERRAL_TRANSFER
-          }
-        }
-      ]
-    }).toArray() as ExtendedTransaction[];
+    data.push(...await this.getExtendedTransactions(user));
+    data.push(...await this.getPaymentGateTransactions(user));
 
-    for (let transaction of txs) {
-      if (transaction.from === user.ethWallet.address) {
-        transaction.direction = DIRECTION_OUT;
-      } else {
-        transaction.direction = DIRECTION_IN;
-      }
-    }
-
-    data.push(...txs);
+    return data;
+  }
 
-    // coinpayments transaction
+  private async getPaymentGateTransactions(user: Investor): Promise<Array<GenericTransaction>> {
+    const data: Array<GenericTransaction> = [];
     const paymentGateTransactionRepository = getConnection().mongoManager.getMongoRepository(PaymentGateTransaction);
-    const cpTxs = await paymentGateTransactionRepository.find({
+    const txs = await paymentGateTransactionRepository.find({
       where: {userEmail: user.email}
     });
 
-    cpTxs.forEach(item => {
+    txs.forEach(item => {
       if (item.buyIpns.length > 0) {
         let tx = {} as PaymentGateTransactionView;
 
         // get latest actual ipn response.
-        let latestIPN = item.buyIpns[item.buyIpns.length - 1];
+        item.buyIpns.sort((a, b) => {
+          return a.status - b.status;
+        });
+
+        const actualIPN = item.buyIpns[0].status < 0 ? item.buyIpns[0] : item.buyIpns[item.buyIpns.length - 1];
 
         tx.address = item.buyCoinpaymentsData.address;
         tx.confirmsNeeded = item.buyCoinpaymentsData.confirmsNeeded;
         tx.currency = item.buyCoinpaymentsData.currency2;
         tx.expiredOn = item.expiredOn;
         tx.id = item.id.toHexString();
         tx.qrcodeUrl = item.buyCoinpaymentsData.qrcodeUrl;
-        tx.receivedAmount = latestIPN.receivedAmount;
-        tx.receivedConfirms = latestIPN.receivedConfirms;
-        tx.status = latestIPN.staus;
+        tx.receivedAmount = actualIPN.receivedAmount;
+        tx.receivedConfirms = actualIPN.receivedConfirms;
+        tx.status = actualIPN.status;
         tx.statusUrl = item.buyCoinpaymentsData.statusUrl;
         tx.totalAmount = item.buyCoinpaymentsData.amount;
         tx.txnId = item.buyCoinpaymentsData.txnId;
         tx.type = 'gateway_transaction';
         tx.timestamp = item.timestamp;
+        tx.timeout = item.buyCoinpaymentsData.timeout;
 
         data.push(tx);
       }
@@ -140,6 +122,38 @@ export class TransactionService implements TransactionServiceInterface {
     return data;
   }
 
+  private async getExtendedTransactions(user: Investor): Promise<Array<GenericTransaction>> {
+    const txs = await getMongoManager().createEntityCursor(Transaction, {
+      '$and': [
+        {
+          '$or': [
+            {
+              'from': user.ethWallet.address
+            },
+            {
+              'to': user.ethWallet.address
+            }
+          ]
+        },
+        {
+          'type': {
+            '$ne': REFERRAL_TRANSFER
+          }
+        }
+      ]
+    }).toArray() as ExtendedTransaction[];
+
+    for (let transaction of txs) {
+      if (transaction.from === user.ethWallet.address) {
+        transaction.direction = DIRECTION_OUT;
+      } else {
+        transaction.direction = DIRECTION_IN;
+      }
+    }
+
+    return txs;
+  }
+
   async getReferralIncome(user: Investor): Promise<ReferralResult> {
     const referrals = await getMongoManager().createEntityCursor(Investor, {
       referral: user.email

diff --git a/test/dump/ico-dashboard-test/payment_gate_transaction/563143b280d2387c91807f00.bson b/test/dump/ico-dashboard-test/payment_gate_transaction/563143b280d2387c91807f00.bson